Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dynamic factions #609

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Dynamic factions #609

wants to merge 14 commits into from

Commits on May 1, 2014

  1. wip, fixing master

    @gersseba
    gersseba committed May 1, 2014
    Configuration menu
    Copy the full SHA
    7261c62 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2014

  1. basic hit based dynamics working

    @gersseba
    gersseba committed May 2, 2014
    Configuration menu
    Copy the full SHA
    7263a18 View commit details
    Browse the repository at this point in the history

  2. on death hooks 

    individual, and squad relation dynamics
    @gersseba
    gersseba committed May 2, 2014
    Configuration menu
    Copy the full SHA
    c3b654e View commit details
    Browse the repository at this point in the history

Commits on May 4, 2014

  1. add ai warnings

    @gersseba
    gersseba committed May 4, 2014
    Configuration menu
    Copy the full SHA
    4d0389b View commit details
    Browse the repository at this point in the history

Commits on May 5, 2014

  1. Update character.cpp 

    damn case sensitive unix
    @gersseba
    gersseba committed May 5, 2014
    Configuration menu
    Copy the full SHA
    eb0f7f1 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2014

  1. formating on documentation

    @gersseba
    gersseba committed May 18, 2014
    Configuration menu
    Copy the full SHA
    32b1d0a View commit details
    Browse the repository at this point in the history

Commits on May 19, 2014

  1. personal relations to multiple worldobjects

    @gersseba
    gersseba committed May 19, 2014
    Configuration menu
    Copy the full SHA
    02b7a1d View commit details
    Browse the repository at this point in the history

  2. added == and hash for handles based on pointer

    @gersseba
    gersseba committed May 19, 2014
    Configuration menu
    Copy the full SHA
    9ef153f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2014

  1. fix linux build

    @gersseba
    gersseba committed May 24, 2014
    Configuration menu
    Copy the full SHA
    4aa682b View commit details
    Browse the repository at this point in the history

Commits on May 29, 2014

  1. merge with master

    mrzzzrm committed May 29, 2014
    Configuration menu
    Copy the full SHA
    8a5643f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2014

  1. reenabled warning messages

    @gersseba
    gersseba committed May 31, 2014
    Configuration menu
    Copy the full SHA
    e439d6d View commit details
    Browse the repository at this point in the history

  2. warning message only by non hostile WOs

    @gersseba
    gersseba committed May 31, 2014
    Configuration menu
    Copy the full SHA
    43160c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2014

  1. Merge branch 'master' of https://github.com/voxelinc/voxellancer into… 

    … dynamic_factions

Conflicts:
	src/ai/squad.cpp
    @gersseba
    gersseba committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    18da046 View commit details
    Browse the repository at this point in the history

  2. fixed faulty merge 8a5643f 

    added a delay before friendliness is slowly resettet to default
    @gersseba
    gersseba committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    f087c27 View commit details
    Browse the repository at this point in the history