aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | `make format`Loek Le Blansch8 days
| * | | | tweak zapper spawning logicLoek Le Blansch8 days
| * | | | merge w/ masterLoek Le Blansch8 days
| |\ \ \ \
* | \ \ \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon218 days
|\ \ \ \ \ \
| * | | | | | removed pWBoerenkamps8 days
| * | | | | | queue addedWBoerenkamps8 days
* | | | | | | working scheduler and enemies and restheavydemon218 days
* | | | | | | Merge branch 'master' into niels/gameheavydemon218 days
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | added camera stop boss fightheavydemon218 days
* | | | | | added boss fight, did not workheavydemon218 days
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | 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