aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | * | Added shop itemsMax-0016 days
| | | * | Made shopMax-0016 days
* | | | | added camera stop boss fightheavydemon216 days
* | | | | added boss fight, did not workheavydemon216 days
* | | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon216 days
|\ \ \ \ \
| * | | | | start of extra features and restored player functionsWBoerenkamps6 days
| * | | | | removed iostreamWBoerenkamps6 days
| * | | | | make formatWBoerenkamps6 days
| * | | | | pooling fixWBoerenkamps6 days
| * | | | | removed unwanted / removed linesWBoerenkamps6 days
| * | | | | random better implementedWBoerenkamps6 days
| * | | | | battlescript battle won workingWBoerenkamps6 days
| * | | | | enemy sequence workingWBoerenkamps6 days
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | enemy death workingWBoerenkamps7 days
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \ \ \
| * | | | | | | player bullet workingWBoerenkamps7 days
| * | | | | | | enemy spawn working + enemy shootingWBoerenkamps7 days
| * | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\ \ \ \ \ \ \
| * | | | | | | | enemy poolingWBoerenkamps8 days
| * | | | | | | | start of enemypool and creationWBoerenkamps9 days
* | | | | | | | | Merge branch 'master' into niels/gameheavydemon216 days
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge pull request #112 from lonkaars/max/game2Jaro6 days
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Background blackMax-0016 days
| | * | | | | | Added bubblesMax-0016 days
| | * | | | | | Added coin animationMax-0016 days
| | * | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0016 days
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Added coin pickup soundMax-0016 days
* | | | | | | | working zapper, missilies with schedulerheavydemon216 days
* | | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon216 days
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | pooling workingLoek Le Blansch7 days
| * | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | another merge + WIPLoek Le Blansch7 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch7 days
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more WIP zapperpoolLoek Le Blansch7 days
| * | | | | | | | | revert signalcatchLoek Le Blansch8 days
| * | | | | | | | | `make format`Loek Le Blansch8 days
| * | | | | | | | | cleanupLoek Le Blansch8 days
| * | | | | | | | | merge masterLoek Le Blansch8 days
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | more revertLoek Le Blansch8 days
| * | | | | | | | | partially revert engineLoek Le Blansch8 days
| * | | | | | | | | `make format`Loek Le Blansch8 days
| * | | | | | | | | add collider to zapperLoek Le Blansch8 days
| * | | | | | | | | roll back player controllerLoek Le Blansch8 days
| * | | | | | | | | place zapper methodLoek Le Blansch8 days
| * | | | | | | | | WIPLoek Le Blansch9 days
| * | | | | | | | | revert AnimatorLoek Le Blansch9 days