aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jaro/game' of github.com:lonkaars/crepe into jaro/gameJAROWMR6 days
|\
| * added endgame dataJAROWMR6 days
* | endgame show scoreJAROWMR6 days
|/
* added color to buttonJAROWMR6 days
* replay in preview sceneJAROWMR6 days
* Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR6 days
|\
| * fixed angular dtWBoerenkamps6 days
| * Merge branch 'niels/game' of github.com:lonkaars/crepeLoek Le Blansch6 days
| |\
| | * make formatheavydemon216 days
| | * added preset with nothingheavydemon216 days
| * | `make format`Loek Le Blansch6 days
| |/
| * Merge branch 'master' into niels/gameheavydemon216 days
| |\
| | * `make format`Loek Le Blansch6 days
| * | removed debugheavydemon216 days
| * | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon216 days
| |\ \
| | * \ merge w/ masterLoek Le Blansch6 days
| | |\ \
| | * | | `make format`Loek Le Blansch6 days
| | * | | tweak zapper spawning logicLoek Le Blansch6 days
| | * | | merge w/ masterLoek Le Blansch6 days
| | |\ \ \
| * | \ \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon216 days
| |\ \ \ \ \
| | * | | | | removed pWBoerenkamps6 days
| | * | | | | queue addedWBoerenkamps6 days
| * | | | | | working scheduler and enemies and restheavydemon216 days
| * | | | | | Merge branch 'master' into niels/gameheavydemon216 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/enemyAIWBoerenkamps6 days
| | |\ \ \ \ \
| | * | | | | | enemy death workingWBoerenkamps6 days
| | * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps6 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
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | working zapper, missilies with schedulerheavydemon216 days
| * | | | | | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon216 days
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | WIPLoek Le Blansch6 days
| | * | | | | | | | | | WIPLoek Le Blansch6 days
| | * | | | | | | | | | pooling workingLoek Le Blansch7 days