aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Expand)AuthorAge
* added preset with nothingheavydemon212025-01-08
* Merge branch 'master' into niels/gameheavydemon212025-01-08
|\
| * `make format`Loek Le Blansch2025-01-08
| * disable time changeJAROWMR2025-01-08
| * Replaced ENTER by SPACEMax-0012025-01-08
* | removed debugheavydemon212025-01-08
* | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon212025-01-08
|\ \
| * | merge w/ masterLoek Le Blansch2025-01-08
| |\|
| * | `make format`Loek Le Blansch2025-01-08
| * | tweak zapper spawning logicLoek Le Blansch2025-01-08
| * | merge w/ masterLoek Le Blansch2025-01-08
| |\ \
* | \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon212025-01-08
|\ \ \ \
| * | | | removed pWBoerenkamps2025-01-08
| * | | | queue addedWBoerenkamps2025-01-08
* | | | | working scheduler and enemies and restheavydemon212025-01-08
* | | | | Merge branch 'master' into niels/gameheavydemon212025-01-08
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #113 from lonkaars/jaro/gameheavydemon212025-01-08
| |\ \ \
| | * | | `make format`jaro/gameLoek Le Blansch2025-01-08
| | * | | removed enterJAROWMR2025-01-08
| | * | | filled creditsJAROWMR2025-01-08
| | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR2025-01-08
| | |\ \ \ | | | | |/ | | | |/|
| | * | | added credit windowJAROWMR2025-01-08
| | * | | updated preview and added credits buttonJAROWMR2025-01-08
| | * | | added replay functionalityJAROWMR2025-01-08
| * | | | Fixed end windowMax-0012025-01-08
| * | | | Added shop itemsMax-0012025-01-08
| * | | | Made shopMax-0012025-01-08
| | |/ / | |/| |
* | | | added camera stop boss fightheavydemon212025-01-08
* | | | added boss fight, did not workheavydemon212025-01-08
* | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon212025-01-08
|\ \ \ \
| * | | | start of extra features and restored player functionsWBoerenkamps2025-01-08
| * | | | removed iostreamWBoerenkamps2025-01-08
| * | | | make formatWBoerenkamps2025-01-08
| * | | | pooling fixWBoerenkamps2025-01-08
| * | | | removed unwanted / removed linesWBoerenkamps2025-01-08
| * | | | random better implementedWBoerenkamps2025-01-08
| * | | | battlescript battle won workingWBoerenkamps2025-01-08
| * | | | enemy sequence workingWBoerenkamps2025-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
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps2025-01-08
| |\ \ \ \ \
| * | | | | | player bullet workingWBoerenkamps2025-01-08
| * | | | | | enemy spawn working + enemy shootingWBoerenkamps2025-01-08
| * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps2025-01-06
| |\ \ \ \ \ \
| * | | | | | | enemy poolingWBoerenkamps2025-01-06
| * | | | | | | start of enemypool and creationWBoerenkamps2025-01-06
* | | | | | | | Merge branch 'master' into niels/gameheavydemon212025-01-08
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Background blackMax-0012025-01-08
| * | | | | | | Added bubblesMax-0012025-01-08