aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon218 days
|\
| * start of extra features and restored player functionsWBoerenkamps8 days
| * removed iostreamWBoerenkamps8 days
| * make formatWBoerenkamps8 days
| * pooling fixWBoerenkamps8 days
| * removed unwanted / removed linesWBoerenkamps8 days
| * random better implementedWBoerenkamps8 days
| * battlescript battle won workingWBoerenkamps8 days
| * enemy sequence workingWBoerenkamps8 days
| * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\
| * | enemy death workingWBoerenkamps8 days
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\ \
| * \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\ \ \
| * | | | player bullet workingWBoerenkamps8 days
| * | | | enemy spawn working + enemy shootingWBoerenkamps8 days
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps10 days
| |\ \ \ \
| * | | | | enemy poolingWBoerenkamps10 days
| * | | | | start of enemypool and creationWBoerenkamps10 days
* | | | | | Merge branch 'master' into niels/gameheavydemon218 days
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #112 from lonkaars/max/game2Jaro8 days
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Background blackMax-0018 days
| | * | | | | Added bubblesMax-0018 days
| | * | | | | Added coin animationMax-0018 days
| | * | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0018 days
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Added coin pickup soundMax-0018 days
* | | | | | | working zapper, missilies with schedulerheavydemon218 days
* | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon218 days
|\ \ \ \ \ \ \
| * | | | | | | WIPLoek Le Blansch8 days
| * | | | | | | WIPLoek Le Blansch8 days
| * | | | | | | pooling workingLoek Le Blansch8 days
| * | | | | | | WIPLoek Le Blansch8 days
| * | | | | | | another merge + WIPLoek Le Blansch9 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch9 days
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more WIP zapperpoolLoek Le Blansch9 days
| * | | | | | | | | revert signalcatchLoek Le Blansch9 days
| * | | | | | | | | `make format`Loek Le Blansch9 days
| * | | | | | | | | cleanupLoek Le Blansch9 days
| * | | | | | | | | merge masterLoek Le Blansch9 days
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | more revertLoek Le Blansch9 days
| * | | | | | | | | partially revert engineLoek Le Blansch9 days
| * | | | | | | | | `make format`Loek Le Blansch9 days
| * | | | | | | | | add collider to zapperLoek Le Blansch9 days
| * | | | | | | | | roll back player controllerLoek Le Blansch9 days
| * | | | | | | | | place zapper methodLoek Le Blansch10 days
| * | | | | | | | | WIPLoek Le Blansch10 days
| * | | | | | | | | revert AnimatorLoek Le Blansch10 days
| * | | | | | | | | `make format`Loek Le Blansch2024-12-22
| * | | | | | | | | more WIP zapperLoek Le Blansch2024-12-22
| * | | | | | | | | reset BehaviorScript to masterLoek Le Blansch2024-12-22
| * | | | | | | | | fix Player prefabLoek Le Blansch2024-12-22