aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Collapse)AuthorAge
...
| * Merge branch 'master' into niels/gameheavydemon219 days
| |\
| | * `make format`Loek Le Blansch9 days
| | |
| * | removed debugheavydemon219 days
| | |
| * | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon219 days
| |\ \
| | * \ merge w/ masterLoek Le Blansch9 days
| | |\ \
| | * | | `make format`Loek Le Blansch9 days
| | | | |
| | * | | tweak zapper spawning logicLoek Le Blansch9 days
| | | | |
| | * | | merge w/ masterLoek Le Blansch9 days
| | |\ \ \
| * | \ \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon219 days
| |\ \ \ \ \
| | * | | | | removed pWBoerenkamps9 days
| | | | | | |
| | * | | | | queue addedWBoerenkamps9 days
| | | | | | |
| * | | | | | working scheduler and enemies and restheavydemon219 days
| | | | | | |
| * | | | | | Merge branch 'master' into niels/gameheavydemon219 days
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| * | | | | added camera stop boss fightheavydemon219 days
| | | | | |
| * | | | | added boss fight, did not workheavydemon219 days
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon219 days
| |\ \ \ \ \
| | * | | | | start of extra features and restored player functionsWBoerenkamps9 days
| | | | | | |
| | * | | | | removed iostreamWBoerenkamps9 days
| | | | | | |
| | * | | | | make formatWBoerenkamps9 days
| | | | | | |
| | * | | | | pooling fixWBoerenkamps9 days
| | | | | | |
| | * | | | | removed unwanted / removed linesWBoerenkamps9 days
| | | | | | |
| | * | | | | random better implementedWBoerenkamps9 days
| | | | | | |
| | * | | | | battlescript battle won workingWBoerenkamps9 days
| | | | | | |
| | * | | | | enemy sequence workingWBoerenkamps9 days
| | | | | | |
| | * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps9 days
| | |\ \ \ \ \
| | * | | | | | enemy death workingWBoerenkamps9 days
| | | | | | | |
| | * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps9 days
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps9 days
| | |\ \ \ \ \ \ \
| | * | | | | | | | player bullet workingWBoerenkamps9 days
| | | | | | | | | |
| | * | | | | | | | enemy spawn working + enemy shootingWBoerenkamps9 days
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps11 days
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | enemy poolingWBoerenkamps11 days
| | | | | | | | | | |
| | * | | | | | | | | start of enemypool and creationWBoerenkamps11 days
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into niels/gameheavydemon219 days
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | working zapper, missilies with schedulerheavydemon219 days
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon219 days
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | WIPLoek Le Blansch9 days
| | | | | | | | | | |
| | * | | | | | | | | WIPLoek Le Blansch9 days
| | | | | | | | | | |
| | * | | | | | | | | pooling workingLoek Le Blansch9 days
| | | | | | | | | | |
| | * | | | | | | | | WIPLoek Le Blansch9 days
| | | | | | | | | | |
| | * | | | | | | | | another merge + WIPLoek Le Blansch10 days
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch10 days
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | more WIP zapperpoolLoek Le Blansch10 days
| | | | | | | | | | | | |
| | * | | | | | | | | | | `make format`Loek Le Blansch10 days
| | | | | | | | | | | | |
| | * | | | | | | | | | | cleanupLoek Le Blansch10 days
| | | | | | | | | | | | |
| | * | | | | | | | | | | merge masterLoek Le Blansch10 days
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | `make format`Loek Le Blansch10 days
| | | | | | | | | | | | |
| | * | | | | | | | | | | add collider to zapperLoek Le Blansch10 days
| | | | | | | | | | | | |
| | * | | | | | | | | | | roll back player controllerLoek Le Blansch10 days
| | | | | | | | | | | | |
| | * | | | | | | | | | | place zapper methodLoek Le Blansch11 days
| | | | | | | | | | | | |