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

Implemented player phase modal, as well as some bug fixes #81

Merged
merged 12 commits into from
Jan 11, 2015
Merged

Implemented player phase modal, as well as some bug fixes #81

merged 12 commits into from
Jan 11, 2015

Commits on Jan 9, 2015

  1. Intermediate work on player phase modal

    @DrkSephy
    DrkSephy committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    b8a1ee3 View commit details
    Browse the repository at this point in the history

  2. Menu is no longer locked if player clicks an enemy

    @DrkSephy
    DrkSephy committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    2642897 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. Commenting out work in progress code

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    5d855d2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into dev

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    71f316d View commit details
    Browse the repository at this point in the history

  3. Fixing bug with units stacking on top of each other

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    e95b468 View commit details
    Browse the repository at this point in the history

  4. main.js: Implemented player phase modal

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    bccb945 View commit details
    Browse the repository at this point in the history

  5. main.js: Adding comments for handling player phase modal

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    ce81bbe View commit details
    Browse the repository at this point in the history

  6. base_player.js: Only displaying movement tiles after the player phase… 

    … modal has finished displaying
    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    7c09ad9 View commit details
    Browse the repository at this point in the history

  7. base_player.js: Only allowing the units to move once the player phase… 

    … modal has finished displaying
    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    6d003f0 View commit details
    Browse the repository at this point in the history

  8. main.js: Removing unnecessary console logs

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    e6e99f8 View commit details
    Browse the repository at this point in the history

  9. Updating property names for governing player turn modal display

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    08d0ffa View commit details
    Browse the repository at this point in the history

  10. Displaying enemy phase modal, but not for the desired time

    @DrkSephy
    DrkSephy committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    b9ec2bf View commit details
    Browse the repository at this point in the history