aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR2025-01-08
|\
| * implement animator replayLoek Le Blansch2025-01-08
* | added replay functionalityJAROWMR2025-01-08
|/
* Merge branch 'max/game2' of github.com:lonkaars/crepeLoek Le Blansch2025-01-08
|\
| * FixesMax-0012025-01-08
| * Made background forestMax-0012025-01-08
| * Made background aquarium moveMax-0012025-01-08
| * Made background move to next positionMax-0012025-01-08
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
| |\
| * | Commented out 3/4 of levelMax-0012025-01-08
| * | Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
| |\ \
| * | | Finnished collisionMax-0012025-01-08
| * | | Adjusted scriptMax-0012025-01-08
| * | | InitMax-0012025-01-08
| * | | Added extra sorting layer for workersMax-0012025-01-07
| * | | Added the whole backgroundMax-0012025-01-07
* | | | Merge pull request #108 from lonkaars/loek/randomWboerenkamps2025-01-08
|\ \ \ \ | |_|_|/ |/| | |
| * | | add Random.hloek/randomLoek Le Blansch2025-01-08
|/ / /
* | / `make format`Loek Le Blansch2025-01-08
| |/ |/|
* | Merge pull request #101 from lonkaars/jaro/main-menuJaro2025-01-08
|\ \ | |/ |/|
| * Merge branch 'jaro/main-menu' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-08
| |\
| | * Make formatMax-0012025-01-08
| * | removed not used valesJAROWMR2025-01-08
| |/
| * coin fixJAROWMR2025-01-08
| * Make formatMax-0012025-01-08
| * fixed coin spawn offsetJAROWMR2025-01-07
| * correct namingJAROWMR2025-01-07
| * fixed includesJAROWMR2025-01-07
| * saving coins avaiable in menuJAROWMR2025-01-07
| * audio stopped at end of levelJAROWMR2025-01-07
| * mergedJAROWMR2025-01-07
| |\
| * | fixed coins and improved coinJAROWMR2025-01-07
| * | coins use eventsJAROWMR2025-01-07
| * | coin updateJAROWMR2025-01-07
| * | added end gameJAROWMR2025-01-07
| * | endgamesubscene finishedJAROWMR2025-01-06
| * | popup windowJAROWMR2025-01-06
| * | corrected includesJAROWMR2025-01-06
| * | moved and updated filesJAROWMR2025-01-06
| * | added fps counterJAROWMR2025-01-06
| * | fps in hudJAROWMR2025-01-06
| * | Merge branch 'max/game' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-06
| |\ \
| * \ \ mergeJAROWMR2025-01-06
| |\ \ \
| * | | | updated coin configJAROWMR2025-01-06
| * | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-06
| |\ \ \ \
| * \ \ \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-06
| |\ \ \ \ \
| * \ \ \ \ \ pull max charJAROWMR2025-01-06
| |\ \ \ \ \ \
| * \ \ \ \ \ \ script speed fixJAROWMR2025-01-06
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'wouter/buttonScale' of github.com:lonkaars/crepe into jaro/main...JAROWMR2025-01-06
| |\ \ \ \ \ \ \ \
| * | | | | | | | | changed game cameraJAROWMR2025-01-06