aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * Merge branch 'jaro/game' of github.com:lonkaars/crepe into jaro/gameJAROWMR5 days
| | |\
| | | * added endgame dataJAROWMR5 days
| | * | endgame show scoreJAROWMR5 days
| | |/
| | * added color to buttonJAROWMR5 days
| | * replay in preview sceneJAROWMR5 days
| | * Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR5 days
| | |\ | | |/ | |/|
| * | fixed angular dtWBoerenkamps5 days
|/ /
* | Merge branch 'niels/game' of github.com:lonkaars/crepeLoek Le Blansch5 days
|\ \
| * | make formatheavydemon215 days
| * | added preset with nothingheavydemon215 days
* | | `make format`Loek Le Blansch5 days
|/ /
* | Merge branch 'master' into niels/gameheavydemon215 days
|\ \
| * | `make format`Loek Le Blansch5 days
* | | removed debugheavydemon215 days
* | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon215 days
|\ \ \
| * \ \ merge w/ masterLoek Le Blansch5 days
| |\ \ \
| * | | | `make format`Loek Le Blansch5 days
| * | | | tweak zapper spawning logicLoek Le Blansch5 days
| * | | | merge w/ masterLoek Le Blansch5 days
| |\ \ \ \
* | \ \ \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon215 days
|\ \ \ \ \ \
| * | | | | | removed pWBoerenkamps5 days
| * | | | | | queue addedWBoerenkamps5 days
* | | | | | | working scheduler and enemies and restheavydemon215 days
* | | | | | | Merge branch 'master' into niels/gameheavydemon215 days
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | added camera stop boss fightheavydemon215 days
* | | | | | added boss fight, did not workheavydemon215 days
* | | | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon215 days
|\ \ \ \ \ \
| * | | | | | start of extra features and restored player functionsWBoerenkamps5 days
| * | | | | | removed iostreamWBoerenkamps5 days
| * | | | | | make formatWBoerenkamps5 days
| * | | | | | pooling fixWBoerenkamps5 days
| * | | | | | removed unwanted / removed linesWBoerenkamps5 days
| * | | | | | random better implementedWBoerenkamps5 days
| * | | | | | battlescript battle won workingWBoerenkamps5 days
| * | | | | | enemy sequence workingWBoerenkamps5 days
| * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\ \ \ \ \ \
| * | | | | | | enemy death workingWBoerenkamps5 days
| * | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\ \ \ \ \ \ \ \
| * | | | | | | | | player bullet workingWBoerenkamps5 days
| * | | | | | | | | enemy spawn working + enemy shootingWBoerenkamps5 days
| * | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | enemy poolingWBoerenkamps7 days
| * | | | | | | | | | start of enemypool and creationWBoerenkamps7 days
* | | | | | | | | | | Merge branch 'master' into niels/gameheavydemon215 days
|\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | working zapper, missilies with schedulerheavydemon215 days
* | | | | | | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon215 days
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | WIPLoek Le Blansch5 days
| * | | | | | | | | | | WIPLoek Le Blansch5 days
| * | | | | | | | | | | pooling workingLoek Le Blansch5 days