aboutsummaryrefslogtreecommitdiff
path: root/game/GameScene.cpp
Commit message (Expand)AuthorAge
* alers scripts and quitscript with ESC keyheavydemon212025-01-10
* Disabled move camera manually scriptMax-0012025-01-08
* `make format`Loek Le Blansch2025-01-08
* removed debugheavydemon212025-01-08
* working scheduler and enemies and restheavydemon212025-01-08
* added boss fight, did not workheavydemon212025-01-08
* Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon212025-01-08
|\
| * removed iostreamWBoerenkamps2025-01-08
| * make formatWBoerenkamps2025-01-08
| * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps2025-01-08
| |\
| * | enemy death workingWBoerenkamps2025-01-08
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps2025-01-08
| |\ \
| * | | enemy spawn working + enemy shootingWBoerenkamps2025-01-08
* | | | Merge branch 'master' into niels/gameheavydemon212025-01-08
|\ \ \ \
| * | | | Background blackMax-0012025-01-08
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon212025-01-08
|\ \ \ \
| * | | | WIPLoek Le Blansch2025-01-08
| * | | | another merge + WIPLoek Le Blansch2025-01-07
| |\ \ \ \
| * \ \ \ \ merge + more WIPLoek Le Blansch2025-01-07
| |\ \ \ \ \
| * | | | | | more WIP zapperpoolLoek Le Blansch2025-01-07
| * | | | | | `make format`Loek Le Blansch2025-01-07
| * | | | | | cleanupLoek Le Blansch2025-01-07
| * | | | | | merge masterLoek Le Blansch2025-01-07
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | `make format`Loek Le Blansch2025-01-07
| * | | | | | roll back player controllerLoek Le Blansch2025-01-07
| * | | | | | `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 configheavydemon212025-01-08
| |_|_|_|/ / |/| | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #101 from lonkaars/jaro/main-menuJaro2025-01-08
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Make formatMax-0012025-01-08
| | * | | | correct namingJAROWMR2025-01-07
| | * | | | mergedJAROWMR2025-01-07
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | added end gameJAROWMR2025-01-07
| | * | | | endgamesubscene finishedJAROWMR2025-01-06
| | * | | | pull max charJAROWMR2025-01-06
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | improved hudJAROWMR2025-01-05
| | * | | | added hudJAROWMR2025-01-05
| | * | | | mergeJAROWMR2025-01-03
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | renamed fileJAROWMR2024-12-28
| | * | | | coins with system poolingJAROWMR2024-12-28
| | * | | | coin systemJAROWMR2024-12-28
* | | | | | Finnished collisionMax-0012025-01-08
|/ / / / /
* | | | / First setup for NPCsMax-0012025-01-07
| |_|_|/ |/| | |
* | | | Deleted loopMax-0012025-01-06
* | | | First audioMax-0012025-01-06
| |_|/ |/| |
* | | Paralax stops when player stopsMax-0012025-01-06
* | | Moved EndGameScript to PlayerMax-0012024-12-24
* | | Added EndGameScriptMax-0012024-12-24