Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thomasgoldstein/whip-a-wimp Loading
base: master
Choose a base ref
...
head repository: thomasgoldstein/whip-a-wimp Loading
compare: cocos39
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 29 files changed
  • 1 contributor

Commits on Jan 4, 2016

  1. Code update for Cocos2D 3.9 compatibility

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    7072e9f View commit details
    Browse the repository at this point in the history

  2. Initial merge of WAW and cocos 3.9 template code (with new loader). 

    note: you need \frameworks folder (dl cocos 3.9, run setup and create a new js project to get the folder)
    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    5301f4d View commit details
    Browse the repository at this point in the history

  3. updated keyboard listener due to c3.9

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    0024647 View commit details
    Browse the repository at this point in the history

  4. fix deprecated setZOrder -> setLocalZOrder

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    24ec96c View commit details
    Browse the repository at this point in the history

  5. fix temp solution - to make player able to finish room2room transition

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    2c1f424 View commit details
    Browse the repository at this point in the history

  6. clean debug menu code

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    b299c2f View commit details
    Browse the repository at this point in the history

  7. fix missing / invisible whip

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    f022598 View commit details
    Browse the repository at this point in the history

  8. fix deprecated ZIndex -> method setLocalZOrder

    @D0NM
    D0NM committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    f07ae98 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2016

  1. fix removed chests shadows

    @D0NM
    D0NM committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    99acaaa View commit details
    Browse the repository at this point in the history

  2. fix fixed wrong chest sprite size (cocos2d warning)

    @D0NM
    D0NM committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    b9d0389 View commit details
    Browse the repository at this point in the history

  3. fix freeze on spawning item in a chest

    @D0NM
    D0NM committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    366c333 View commit details
    Browse the repository at this point in the history

  4. new title scene with logo before the menu scene

    @D0NM
    D0NM committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    ef0ae61 View commit details
    Browse the repository at this point in the history

  5. fix returned no sprites anti-aliasing mode back

    @D0NM
    D0NM committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    559e0c4 View commit details
    Browse the repository at this point in the history
Loading