aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR7 days
|\
| * Merge branch 'loek/replay' of github.com:lonkaars/crepeLoek Le Blansch7 days
| |\
| | * `make format`Loek Le Blansch7 days
| | * fix audio unit testLoek Le Blansch7 days
* | | filled creditsJAROWMR7 days
* | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR7 days
|\| |
| * | Merge pull request #112 from lonkaars/max/game2Jaro7 days
| |\ \
| | * | Background blackMax-0017 days
| | * | Added bubblesMax-0017 days
| | * | Added coin animationMax-0017 days
| | * | Merge remote-tracking branch 'origin/master' into max/game2Max-0017 days
| | |\ \ | | |/ / | |/| |
| | * | Added coin pickup soundMax-0017 days
* | | | added credit windowJAROWMR7 days
* | | | updated preview and added credits buttonJAROWMR7 days
* | | | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR7 days
|\ \ \ \ | | |_|/ | |/| |
| * | | implement sprite replayLoek Le Blansch7 days
| * | | Revert "implement animator replay"Loek Le Blansch7 days
* | | | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR7 days
|\| | |
| * | | implement animator replayLoek Le Blansch7 days
| |/ /
* / / added replay functionalityJAROWMR7 days
|/ /
* | Merge branch 'max/game2' of github.com:lonkaars/crepeLoek Le Blansch7 days
|\|
| * FixesMax-0017 days
| * Made background forestMax-0017 days
| * Made background aquarium moveMax-0017 days
| * Made background move to next positionMax-0017 days
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0017 days
| |\
| * | Commented out 3/4 of levelMax-0017 days
| * | Merge remote-tracking branch 'origin/master' into max/game2Max-0017 days
| |\ \
| * | | Finnished collisionMax-0017 days
| * | | Adjusted scriptMax-0017 days
| * | | InitMax-0017 days
| * | | Added extra sorting layer for workersMax-0018 days
| * | | Added the whole backgroundMax-0018 days
* | | | Merge pull request #108 from lonkaars/loek/randomWboerenkamps7 days
|\ \ \ \ | |_|_|/ |/| | |
| * | | add Random.hloek/randomLoek Le Blansch7 days
|/ / /
* | / `make format`Loek Le Blansch7 days
| |/ |/|
* | Merge pull request #101 from lonkaars/jaro/main-menuJaro7 days
|\ \ | |/ |/|
| * Merge branch 'jaro/main-menu' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR7 days
| |\
| | * Make formatMax-0017 days
| * | removed not used valesJAROWMR7 days
| |/
| * coin fixJAROWMR7 days
| * Make formatMax-0017 days
| * fixed coin spawn offsetJAROWMR8 days
| * correct namingJAROWMR8 days
| * fixed includesJAROWMR8 days
| * saving coins avaiable in menuJAROWMR8 days
| * audio stopped at end of levelJAROWMR8 days
| * mergedJAROWMR8 days
| |\
| * | fixed coins and improved coinJAROWMR8 days
| * | coins use eventsJAROWMR8 days