aboutsummaryrefslogtreecommitdiff
path: root/game/GameScene.cpp
Commit message (Expand)AuthorAge
* `make format`Loek Le Blansch4 days
* removed debugheavydemon214 days
* working scheduler and enemies and restheavydemon214 days
* added boss fight, did not workheavydemon214 days
* Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon214 days
|\
| * removed iostreamWBoerenkamps4 days
| * make formatWBoerenkamps4 days
| * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps4 days
| |\
| * | enemy death workingWBoerenkamps4 days
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps4 days
| |\ \
| * | | enemy spawn working + enemy shootingWBoerenkamps4 days
* | | | Merge branch 'master' into niels/gameheavydemon214 days
|\ \ \ \
| * | | | Background blackMax-0014 days
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon214 days
|\ \ \ \
| * | | | WIPLoek Le Blansch4 days
| * | | | another merge + WIPLoek Le Blansch5 days
| |\ \ \ \
| * \ \ \ \ merge + more WIPLoek Le Blansch5 days
| |\ \ \ \ \
| * | | | | | more WIP zapperpoolLoek Le Blansch5 days
| * | | | | | `make format`Loek Le Blansch5 days
| * | | | | | cleanupLoek Le Blansch5 days
| * | | | | | merge masterLoek Le Blansch5 days
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | `make format`Loek Le Blansch5 days
| * | | | | | roll back player controllerLoek Le Blansch5 days
| * | | | | | `make format`Loek Le Blansch2024-12-22
| * | | | | | more WIP zapperLoek Le Blansch2024-12-22
| * | | | | | big WIPLoek Le Blansch2024-12-22
* | | | | | | made my code work by adding it to the gamescene,main and configheavydemon214 days
| |_|_|_|/ / |/| | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0014 days
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #101 from lonkaars/jaro/main-menuJaro4 days
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Make formatMax-0014 days
| | * | | | correct namingJAROWMR5 days
| | * | | | mergedJAROWMR5 days
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | added end gameJAROWMR5 days
| | * | | | endgamesubscene finishedJAROWMR6 days
| | * | | | pull max charJAROWMR6 days
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | improved hudJAROWMR7 days
| | * | | | added hudJAROWMR7 days
| | * | | | mergeJAROWMR9 days
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | renamed fileJAROWMR2024-12-28
| | * | | | coins with system poolingJAROWMR2024-12-28
| | * | | | coin systemJAROWMR2024-12-28
* | | | | | Finnished collisionMax-0014 days
|/ / / / /
* | | | / First setup for NPCsMax-0015 days
| |_|_|/ |/| | |
* | | | Deleted loopMax-0016 days
* | | | First audioMax-0016 days
| |_|/ |/| |
* | | Paralax stops when player stopsMax-0016 days
* | | Moved EndGameScript to PlayerMax-0012024-12-24
* | | Added EndGameScriptMax-0012024-12-24
* | | Added collision animationsMax-0012024-12-24
* | | Moved Player files to seperate folderMax-0012024-12-24
| |/ |/|