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

Basis for changing characters based on actions. #187

Merged
merged 8 commits into from
Dec 22, 2014
Merged

Basis for changing characters based on actions. #187

merged 8 commits into from
Dec 22, 2014

Commits on Dec 20, 2014

  1. created basic character changing based on killing character

    @projectdelphai
    projectdelphai committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    33f6c88 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into charchange

    @projectdelphai
    projectdelphai committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    a8caba4 View commit details
    Browse the repository at this point in the history

  3. fixed bug, expanded transitions, added better error checking

    @projectdelphai
    projectdelphai committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    0e964bd View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2014

  1. you can now attack npcs

    @projectdelphai
    projectdelphai committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    cc7ef12 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into charchange 

    Conflicts:
	src/main/java/com/jadventure/game/entities/NPC.java
	src/main/java/com/jadventure/game/menus/BattleMenu.java
    @projectdelphai
    projectdelphai committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    f8e2916 View commit details
    Browse the repository at this point in the history

  3. fleshed out conversations for npcs and fixed some bugs

    @projectdelphai
    projectdelphai committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    8e46bd1 View commit details
    Browse the repository at this point in the history

  4. disabled stdout warnings so they don't mess with the player's ingame … 

    …experience
    @projectdelphai
    projectdelphai committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    ef19e6b View commit details
    Browse the repository at this point in the history

  5. fix for monster naming bug

    @projectdelphai
    projectdelphai committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    128e5f5 View commit details
    Browse the repository at this point in the history