aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'loek/replay' of github.com:lonkaars/crepeLoek Le Blansch4 days
|\
| * `make format`Loek Le Blansch4 days
| * fix audio unit testLoek Le Blansch4 days
| * implement sprite replayLoek Le Blansch4 days
| * Revert "implement animator replay"Loek Le Blansch4 days
| * implement animator replayLoek Le Blansch4 days
* | Merge pull request #112 from lonkaars/max/game2Jaro4 days
|\ \ | |/ |/|
| * Background blackMax-0014 days
| * Added bubblesMax-0014 days
| * Added coin animationMax-0014 days
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0014 days
| |\ | |/ |/|
* | Merge branch 'max/game2' of github.com:lonkaars/crepeLoek Le Blansch4 days
|\ \
* \ \ Merge pull request #108 from lonkaars/loek/randomWboerenkamps4 days
|\ \ \
| * | | add Random.hloek/randomLoek Le Blansch4 days
|/ / /
| | * Added coin pickup soundMax-0014 days
| |/
| * FixesMax-0014 days
| * Made background forestMax-0014 days
| * Made background aquarium moveMax-0014 days
| * Made background move to next positionMax-0014 days
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0014 days
| |\ | |/ |/|
* | `make format`Loek Le Blansch4 days
| * Commented out 3/4 of levelMax-0014 days
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0014 days
| |\ | |/ |/|
* | Merge pull request #101 from lonkaars/jaro/main-menuJaro4 days
|\ \
| * \ Merge branch 'jaro/main-menu' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR4 days
| |\ \
| | * | Make formatMax-0014 days
| * | | removed not used valesJAROWMR4 days
| |/ /
| * | coin fixJAROWMR4 days
| * | Make formatMax-0014 days
| * | fixed coin spawn offsetJAROWMR4 days
| * | correct namingJAROWMR4 days
| * | fixed includesJAROWMR4 days
| * | saving coins avaiable in menuJAROWMR4 days
| * | audio stopped at end of levelJAROWMR5 days
| * | mergedJAROWMR5 days
| |\ \
| * | | fixed coins and improved coinJAROWMR5 days
| * | | coins use eventsJAROWMR5 days
| * | | coin updateJAROWMR5 days
| * | | added end gameJAROWMR5 days
| * | | endgamesubscene finishedJAROWMR5 days
| * | | popup windowJAROWMR5 days
| * | | corrected includesJAROWMR5 days
| * | | moved and updated filesJAROWMR5 days
| * | | added fps counterJAROWMR6 days
| * | | fps in hudJAROWMR6 days
| * | | Merge branch 'max/game' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR6 days
| |\ \ \
| * \ \ \ mergeJAROWMR6 days
| |\ \ \ \
| * | | | | updated coin configJAROWMR6 days
| * | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR6 days
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR6 days
| |\ \ \ \ \ \