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

Undo support (reopen of #53) #54

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

Undo support (reopen of #53) #54

wants to merge 9 commits into from

Commits on May 9, 2015

  1. It compiles!

    Shai Ayal committed May 9, 2015
    Configuration menu
    Copy the full SHA
    5ed9340 View commit details
    Browse the repository at this point in the history

  2. Not quite working yet ....

    Shai Ayal committed May 9, 2015
    Configuration menu
    Copy the full SHA
    3fe0f49 View commit details
    Browse the repository at this point in the history

  3. Not quite working yet ....

    Shai Ayal committed May 9, 2015
    Configuration menu
    Copy the full SHA
    ebd224b View commit details
    Browse the repository at this point in the history

  4. Working undo

    Shai Ayal committed May 9, 2015
    Configuration menu
    Copy the full SHA
    fb74381 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. Lazy init of undo buffers, fixes NPE on game load

    Shai Ayal committed May 11, 2015
    Configuration menu
    Copy the full SHA
    3815ee9 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Now ascending after undo after dying won't crash game!

    Shai Ayal committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    0810c48 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. Merge branch 'master' into undone 

    # Conflicts:
#	src/com/watabou/pixeldungeon/Dungeon.java
#	src/com/watabou/pixeldungeon/scenes/InterlevelScene.java
    Shai Ayal committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    058d6f7 View commit details
    Browse the repository at this point in the history

  2. Merged from upstream 1.9.1

    Shai Ayal committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    b6f56b4 View commit details
    Browse the repository at this point in the history

  3. One leftover from 1.9.1 merge

    Shai Ayal committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    32f91b3 View commit details
    Browse the repository at this point in the history