aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR8 days
|\
| * Merge pull request #112 from lonkaars/max/game2Jaro8 days
| |\ | | | | | | Max/game2
| | * Background blackMax-0018 days
| | |
| | * Added bubblesMax-0018 days
| | |
| | * Added coin animationMax-0018 days
| | |
| | * Merge remote-tracking branch 'origin/master' into max/game2Max-0018 days
| | |\ | | |/ | |/|
| | * Added coin pickup soundMax-0018 days
| | |
* | | added credit windowJAROWMR8 days
| | |
* | | updated preview and added credits buttonJAROWMR8 days
| | |
* | | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR8 days
|\ \ \
| * | | implement sprite replayLoek Le Blansch8 days
| | | |
| * | | Revert "implement animator replay"Loek Le Blansch8 days
| | | | | | | | | | | | | | | | This reverts commit 1ef80ecfdc1a70a6ebdd43fed82d0f9d305d63dc.
* | | | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR8 days
|\| | |
| * | | implement animator replayLoek Le Blansch8 days
| |/ /
* / / added replay functionalityJAROWMR8 days
|/ /
* | Merge branch 'max/game2' of github.com:lonkaars/crepeLoek Le Blansch8 days
|\|
| * FixesMax-0018 days
| |
| * Made background forestMax-0018 days
| |
| * Made background aquarium moveMax-0018 days
| |
| * Made background move to next positionMax-0018 days
| |
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0018 days
| |\
| * | Commented out 3/4 of levelMax-0018 days
| | |
| * | Merge remote-tracking branch 'origin/master' into max/game2Max-0018 days
| |\ \
| * | | Finnished collisionMax-0018 days
| | | |
| * | | Adjusted scriptMax-0018 days
| | | |
| * | | InitMax-0018 days
| | | |
| * | | Added extra sorting layer for workersMax-0019 days
| | | |
| * | | Added the whole backgroundMax-0019 days
| | | |
* | | | Merge pull request #108 from lonkaars/loek/randomWboerenkamps8 days
|\ \ \ \ | |_|_|/ |/| | | add Random.h
| * | | add Random.hloek/randomLoek Le Blansch8 days
|/ / /
* | / `make format`Loek Le Blansch8 days
| |/ |/|
* | Merge pull request #101 from lonkaars/jaro/main-menuJaro8 days
|\ \ | |/ |/| Jaro/main menu
| * Merge branch 'jaro/main-menu' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR8 days
| |\
| | * Make formatMax-0018 days
| | |
| * | removed not used valesJAROWMR8 days
| |/
| * coin fixJAROWMR8 days
| |
| * Make formatMax-0018 days
| |
| * fixed coin spawn offsetJAROWMR9 days
| |
| * correct namingJAROWMR9 days
| |
| * fixed includesJAROWMR9 days
| |
| * saving coins avaiable in menuJAROWMR9 days
| |
| * audio stopped at end of levelJAROWMR9 days
| |
| * mergedJAROWMR9 days
| |\
| * | fixed coins and improved coinJAROWMR9 days
| | |
| * | coins use eventsJAROWMR9 days
| | |
| * | coin updateJAROWMR9 days
| | |
| * | added end gameJAROWMR9 days
| | |
| * | endgamesubscene finishedJAROWMR10 days
| | |
| * | popup windowJAROWMR10 days
| | |
| * | corrected includesJAROWMR10 days
| | |