aboutsummaryrefslogtreecommitdiff
path: root/game/CMakeLists.txt
Commit message (Expand)AuthorAge
* adjsuted includes so that it has <> and notheavydemon214 days
* Merge branch 'master' into niels/gameheavydemon214 days
|\
| * added shop functionalityJAROWMR5 days
| * replay in preview sceneJAROWMR6 days
* | alers scripts and quitscript with ESC keyheavydemon214 days
|/
* Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon216 days
|\
| * merge w/ masterLoek Le Blansch6 days
| |\
| * \ merge w/ masterLoek Le Blansch6 days
| |\ \
* | \ \ Merge branch 'master' into niels/gameheavydemon216 days
|\ \ \ \ | | |_|/ | |/| |
| * | | added credit windowJAROWMR6 days
| * | | added replay functionalityJAROWMR6 days
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon216 days
|\ \ \
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps6 days
| |\| |
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps6 days
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps6 days
| |\ \ \ \
| * | | | | enemy spawn working + enemy shootingWBoerenkamps6 days
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\ \ \ \ \
| * | | | | | start of enemypool and creationWBoerenkamps8 days
* | | | | | | working zapper, missilies with schedulerheavydemon216 days
* | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon216 days
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | WIPLoek Le Blansch6 days
| * | | | | | another merge + WIPLoek Le Blansch7 days
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge + more WIPLoek Le Blansch7 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge masterLoek Le Blansch7 days
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | roll back player controllerLoek Le Blansch7 days
| * | | | | | | | big WIPLoek Le Blansch2024-12-22
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | made my code work by adding it to the gamescene,main and configheavydemon216 days
* | | | | | | | missile/preview/schedular/PreviewSceneheavydemon216 days
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'max/game2' of github.com:lonkaars/crepeLoek Le Blansch6 days
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Made background aquarium moveMax-0016 days
| * | | | | | Made background move to next positionMax-0016 days
| * | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0016 days
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Finnished collisionMax-0016 days
| | |_|_|_|/ | |/| | | |
* | | | | | add Random.hloek/randomLoek Le Blansch6 days
| |/ / / / |/| | | |
* | | | | Merge pull request #101 from lonkaars/jaro/main-menuJaro6 days
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | correct namingJAROWMR7 days
| * | | | saving coins avaiable in menuJAROWMR7 days
| * | | | mergedJAROWMR7 days
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | added end gameJAROWMR7 days
| * | | | endgamesubscene finishedJAROWMR8 days
| * | | | popup windowJAROWMR8 days
| * | | | moved and updated filesJAROWMR8 days
| * | | | pull max charJAROWMR8 days
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | improved hudJAROWMR9 days
| * | | | added hudJAROWMR9 days
| * | | | mergeJAROWMR11 days
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | added coins random and menu banner updateJAROWMR11 days
| * | | | back buttonJAROWMR2024-12-29
| * | | | added presetsJAROWMR2024-12-28
| * | | | coin systemJAROWMR2024-12-28