aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon214 days
|\
| * merge w/ masterLoek Le Blansch4 days
| |\
| * | `make format`Loek Le Blansch4 days
| * | tweak zapper spawning logicLoek Le Blansch4 days
| * | merge w/ masterLoek Le Blansch4 days
| |\ \
* | \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon214 days
|\ \ \ \
| * | | | removed pWBoerenkamps4 days
| * | | | queue addedWBoerenkamps4 days
* | | | | working scheduler and enemies and restheavydemon214 days
* | | | | Merge branch 'master' into niels/gameheavydemon214 days
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #113 from lonkaars/jaro/gameheavydemon214 days
| |\ \ \
| | * | | `make format`jaro/gameLoek Le Blansch4 days
| | * | | removed enterJAROWMR4 days
| | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR4 days
| | |\ \ \ | | | | |/ | | | |/|
| | * | | filled creditsJAROWMR4 days
| | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR4 days
| | |\ \ \
| | * | | | added credit windowJAROWMR4 days
| | * | | | updated preview and added credits buttonJAROWMR4 days
| | * | | | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR4 days
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/gameJAROWMR4 days
| | |\ \ \ \ \
| | * | | | | | added replay functionalityJAROWMR4 days
| * | | | | | | Merge pull request #114 from lonkaars/max/game2Max-0014 days
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fixed end windowMax-0014 days
| | * | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0014 days
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'loek/replay' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | `make format`Loek Le Blansch4 days
| | * | | | | | fix audio unit testLoek Le Blansch4 days
| | | |_|_|/ / | | |/| | | |
| | * | | | | implement sprite replayLoek Le Blansch4 days
| | * | | | | Revert "implement animator replay"Loek Le Blansch4 days
| | | |_|/ / | | |/| | |
| | * | | | implement animator replayLoek Le Blansch4 days
| | | |/ / | | |/| |
| | | * | Added shop itemsMax-0014 days
| | | * | Made shopMax-0014 days
* | | | | added camera stop boss fightheavydemon214 days
* | | | | added boss fight, did not workheavydemon214 days
* | | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon214 days
|\ \ \ \ \
| * | | | | start of extra features and restored player functionsWBoerenkamps4 days
| * | | | | removed iostreamWBoerenkamps4 days
| * | | | | make formatWBoerenkamps4 days
| * | | | | pooling fixWBoerenkamps4 days
| * | | | | removed unwanted / removed linesWBoerenkamps4 days
| * | | | | random better implementedWBoerenkamps4 days
| * | | | | battlescript battle won workingWBoerenkamps4 days
| * | | | | enemy sequence workingWBoerenkamps4 days
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps4 days
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | enemy death workingWBoerenkamps4 days
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps4 days
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps4 days
| |\ \ \ \ \ \
| * | | | | | | player bullet workingWBoerenkamps4 days
| * | | | | | | enemy spawn working + enemy shootingWBoerenkamps4 days
| * | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps6 days
| |\ \ \ \ \ \ \