aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Expand)AuthorAge
...
| * Merge branch 'master' into niels/gameheavydemon2110 days
| |\
| | * `make format`Loek Le Blansch10 days
| * | removed debugheavydemon2110 days
| * | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon2110 days
| |\ \
| | * \ merge w/ masterLoek Le Blansch10 days
| | |\ \
| | * | | `make format`Loek Le Blansch10 days
| | * | | tweak zapper spawning logicLoek Le Blansch10 days
| | * | | merge w/ masterLoek Le Blansch10 days
| | |\ \ \
| * | \ \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon2110 days
| |\ \ \ \ \
| | * | | | | removed pWBoerenkamps10 days
| | * | | | | queue addedWBoerenkamps10 days
| * | | | | | working scheduler and enemies and restheavydemon2110 days
| * | | | | | Merge branch 'master' into niels/gameheavydemon2110 days
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| * | | | | added camera stop boss fightheavydemon2110 days
| * | | | | added boss fight, did not workheavydemon2110 days
| * | | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon2110 days
| |\ \ \ \ \
| | * | | | | start of extra features and restored player functionsWBoerenkamps10 days
| | * | | | | removed iostreamWBoerenkamps10 days
| | * | | | | make formatWBoerenkamps10 days
| | * | | | | pooling fixWBoerenkamps10 days
| | * | | | | removed unwanted / removed linesWBoerenkamps10 days
| | * | | | | random better implementedWBoerenkamps10 days
| | * | | | | battlescript battle won workingWBoerenkamps10 days
| | * | | | | enemy sequence workingWBoerenkamps10 days
| | * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps10 days
| | |\ \ \ \ \
| | * | | | | | enemy death workingWBoerenkamps10 days
| | * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps10 days
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps10 days
| | |\ \ \ \ \ \ \
| | * | | | | | | | player bullet workingWBoerenkamps10 days
| | * | | | | | | | enemy spawn working + enemy shootingWBoerenkamps10 days
| | * | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps12 days
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | enemy poolingWBoerenkamps12 days
| | * | | | | | | | | start of enemypool and creationWBoerenkamps12 days
| * | | | | | | | | | Merge branch 'master' into niels/gameheavydemon2110 days
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | working zapper, missilies with schedulerheavydemon2110 days
| * | | | | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon2110 days
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | WIPLoek Le Blansch10 days
| | * | | | | | | | | WIPLoek Le Blansch10 days
| | * | | | | | | | | pooling workingLoek Le Blansch10 days
| | * | | | | | | | | WIPLoek Le Blansch10 days
| | * | | | | | | | | another merge + WIPLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | more WIP zapperpoolLoek Le Blansch11 days
| | * | | | | | | | | | | `make format`Loek Le Blansch11 days
| | * | | | | | | | | | | cleanupLoek Le Blansch11 days
| | * | | | | | | | | | | merge masterLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | `make format`Loek Le Blansch11 days
| | * | | | | | | | | | | add collider to zapperLoek Le Blansch11 days
| | * | | | | | | | | | | roll back player controllerLoek Le Blansch11 days
| | * | | | | | | | | | | place zapper methodLoek Le Blansch12 days