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

Feature/npc #120

Merged
merged 14 commits into from
Mar 19, 2013
Merged

Feature/npc #120

merged 14 commits into from
Mar 19, 2013

Commits on Jan 19, 2013

  1. merged from pre-dda mod

    @benjamg
    benjamg committed Jan 19, 2013
    Configuration menu
    Copy the full SHA
    f4db104 View commit details
    Browse the repository at this point in the history

  2. finally stopped npcs leaping to their death in a quest for some rando… 

    …m cookie
    @benjamg
    benjamg committed Jan 19, 2013
    Configuration menu
    Copy the full SHA
    5cd5b06 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2013

  1. Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm… 

    …-DDA into feature/npc
    @benjamg
    benjamg committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    ad458cc View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2013

  1. reload if in vehicles over using melee

    @benjamg
    benjamg committed Jan 21, 2013
    Configuration menu
    Copy the full SHA
    ff73307 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2013

  1. Merge branch 'master' into feature/npc

    @benjamg
    benjamg committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    381cd94 View commit details
    Browse the repository at this point in the history

  2. why I should at least complile code before I checkin

    @benjamg
    benjamg committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    c6938f1 View commit details
    Browse the repository at this point in the history

  3. allow use of silenced firearms, added combat option for player to toggle

    @benjamg
    benjamg committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    8735b72 View commit details
    Browse the repository at this point in the history

  4. npcs detection for incoming cars

    @benjamg
    benjamg committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    da15dc3 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2013

  1. merge conflicts fixed

    @benjamg
    benjamg committed Feb 26, 2013
    Configuration menu
    Copy the full SHA
    3670e2f View commit details
    Browse the repository at this point in the history

  2. undo new avoidance system because I didn't think how it was going to … 

    …work, and it doesn't
    @benjamg
    benjamg committed Feb 26, 2013
    Configuration menu
    Copy the full SHA
    f421f8d View commit details
    Browse the repository at this point in the history

  3. added basecamp, tied into bulletin boards

    @benjamg
    benjamg committed Feb 26, 2013
    Configuration menu
    Copy the full SHA
    3e91b80 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2013

  1. allowed npcs to wait at basecamp

    @benjamg
    benjamg committed Feb 27, 2013
    Configuration menu
    Copy the full SHA
    eea320f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/npc

    @benjamg
    benjamg committed Feb 27, 2013
    Configuration menu
    Copy the full SHA
    a4f0094 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2013

  1. Merge branch 'master' into feature/npc

    @benjamg
    benjamg committed Mar 10, 2013
    Configuration menu
    Copy the full SHA
    575ea54 View commit details
    Browse the repository at this point in the history