aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* removed pWBoerenkamps4 days
* queue addedWBoerenkamps4 days
* added camera stop boss fightheavydemon215 days
* added boss fight, did not workheavydemon215 days
* Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon215 days
|\
| * start of extra features and restored player functionsWBoerenkamps5 days
| * removed iostreamWBoerenkamps5 days
| * make formatWBoerenkamps5 days
| * pooling fixWBoerenkamps5 days
| * removed unwanted / removed linesWBoerenkamps5 days
| * random better implementedWBoerenkamps5 days
| * battlescript battle won workingWBoerenkamps5 days
| * enemy sequence workingWBoerenkamps5 days
| * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\
| * | enemy death workingWBoerenkamps5 days
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\ \
| * \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\ \ \
| * | | | player bullet workingWBoerenkamps5 days
| * | | | enemy spawn working + enemy shootingWBoerenkamps5 days
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \
| * | | | | enemy poolingWBoerenkamps7 days
| * | | | | start of enemypool and creationWBoerenkamps7 days
* | | | | | Merge branch 'master' into niels/gameheavydemon215 days
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #112 from lonkaars/max/game2Jaro5 days
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Background blackMax-0015 days
| | * | | | | Added bubblesMax-0015 days
| | * | | | | Added coin animationMax-0015 days
| | * | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0015 days
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Added coin pickup soundMax-0015 days
* | | | | | | working zapper, missilies with schedulerheavydemon215 days
* | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon215 days
|\ \ \ \ \ \ \
| * | | | | | | WIPLoek Le Blansch5 days
| * | | | | | | WIPLoek Le Blansch5 days
| * | | | | | | pooling workingLoek Le Blansch5 days
| * | | | | | | WIPLoek Le Blansch5 days
| * | | | | | | another merge + WIPLoek Le Blansch6 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch6 days
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more WIP zapperpoolLoek Le Blansch6 days
| * | | | | | | | | revert signalcatchLoek Le Blansch6 days
| * | | | | | | | | `make format`Loek Le Blansch6 days
| * | | | | | | | | cleanupLoek Le Blansch6 days
| * | | | | | | | | merge masterLoek Le Blansch6 days
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | more revertLoek Le Blansch6 days
| * | | | | | | | | partially revert engineLoek Le Blansch6 days
| * | | | | | | | | `make format`Loek Le Blansch6 days
| * | | | | | | | | add collider to zapperLoek Le Blansch6 days
| * | | | | | | | | roll back player controllerLoek Le Blansch6 days
| * | | | | | | | | place zapper methodLoek Le Blansch7 days
| * | | | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | | | revert AnimatorLoek Le Blansch7 days