aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Collapse)AuthorAge
* make formatheavydemon213 days
|
* added preset with nothingheavydemon213 days
|
* Merge branch 'master' into niels/gameheavydemon213 days
|\
| * `make format`Loek Le Blansch3 days
| |
| * disable time changeJAROWMR3 days
| |
| * Replaced ENTER by SPACEMax-0013 days
| |
* | removed debugheavydemon213 days
| |
* | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon213 days
|\ \
| * | merge w/ masterLoek Le Blansch3 days
| |\|
| * | `make format`Loek Le Blansch3 days
| | |
| * | tweak zapper spawning logicLoek Le Blansch3 days
| | |
| * | merge w/ masterLoek Le Blansch3 days
| |\ \
* | \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon213 days
|\ \ \ \
| * | | | removed pWBoerenkamps3 days
| | | | |
| * | | | queue addedWBoerenkamps3 days
| | | | |
* | | | | working scheduler and enemies and restheavydemon213 days
| | | | |
* | | | | Merge branch 'master' into niels/gameheavydemon213 days
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #113 from lonkaars/jaro/gameheavydemon213 days
| |\ \ \ | | | | | | | | | | Jaro/game
| | * | | `make format`jaro/gameLoek Le Blansch3 days
| | | | |
| | * | | removed enterJAROWMR3 days
| | | | |
| | * | | filled creditsJAROWMR3 days
| | | | |
| | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR3 days
| | |\ \ \ | | | | |/ | | | |/|
| | * | | added credit windowJAROWMR3 days
| | | | |
| | * | | updated preview and added credits buttonJAROWMR3 days
| | | | |
| | * | | added replay functionalityJAROWMR3 days
| | | | |
| * | | | Fixed end windowMax-0013 days
| | | | |
| * | | | Added shop itemsMax-0013 days
| | | | |
| * | | | Made shopMax-0013 days
| | |/ / | |/| |
* | | | added camera stop boss fightheavydemon213 days
| | | |
* | | | added boss fight, did not workheavydemon213 days
| | | |
* | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon213 days
|\ \ \ \
| * | | | start of extra features and restored player functionsWBoerenkamps3 days
| | | | |
| * | | | removed iostreamWBoerenkamps3 days
| | | | |
| * | | | make formatWBoerenkamps3 days
| | | | |
| * | | | pooling fixWBoerenkamps3 days
| | | | |
| * | | | removed unwanted / removed linesWBoerenkamps3 days
| | | | |
| * | | | random better implementedWBoerenkamps3 days
| | | | |
| * | | | battlescript battle won workingWBoerenkamps3 days
| | | | |
| * | | | enemy sequence workingWBoerenkamps3 days
| | | | |
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps3 days
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | enemy death workingWBoerenkamps3 days
| | | | |
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps3 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps3 days
| |\ \ \ \ \
| * | | | | | player bullet workingWBoerenkamps3 days
| | | | | | |
| * | | | | | enemy spawn working + enemy shootingWBoerenkamps3 days
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps5 days
| |\ \ \ \ \ \
| * | | | | | | enemy poolingWBoerenkamps5 days
| | | | | | | |
| * | | | | | | start of enemypool and creationWBoerenkamps5 days
| | | | | | | |
* | | | | | | | Merge branch 'master' into niels/gameheavydemon213 days
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Background blackMax-0013 days
| | | | | | | |