aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Collapse)AuthorAge
* `make format`Loek Le Blansch7 days
|
* Merge branch 'master' into niels/gameheavydemon217 days
|\
| * `make format`Loek Le Blansch7 days
| |
| * disable time changeJAROWMR7 days
| |
| * Replaced ENTER by SPACEMax-0017 days
| |
* | removed debugheavydemon217 days
| |
* | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon217 days
|\ \
| * | merge w/ masterLoek Le Blansch7 days
| |\|
| * | `make format`Loek Le Blansch7 days
| | |
| * | tweak zapper spawning logicLoek Le Blansch7 days
| | |
| * | merge w/ masterLoek Le Blansch7 days
| |\ \
* | \ \ Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon217 days
|\ \ \ \
| * | | | removed pWBoerenkamps7 days
| | | | |
| * | | | queue addedWBoerenkamps7 days
| | | | |
* | | | | working scheduler and enemies and restheavydemon217 days
| | | | |
* | | | | Merge branch 'master' into niels/gameheavydemon217 days
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #113 from lonkaars/jaro/gameheavydemon217 days
| |\ \ \ | | | | | | | | | | Jaro/game
| | * | | `make format`jaro/gameLoek Le Blansch7 days
| | | | |
| | * | | removed enterJAROWMR7 days
| | | | |
| | * | | filled creditsJAROWMR7 days
| | | | |
| | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR7 days
| | |\ \ \ | | | | |/ | | | |/|
| | * | | added credit windowJAROWMR7 days
| | | | |
| | * | | updated preview and added credits buttonJAROWMR7 days
| | | | |
| | * | | added replay functionalityJAROWMR7 days
| | | | |
| * | | | Fixed end windowMax-0017 days
| | | | |
| * | | | Added shop itemsMax-0017 days
| | | | |
| * | | | Made shopMax-0017 days
| | |/ / | |/| |
* | | | added camera stop boss fightheavydemon217 days
| | | |
* | | | added boss fight, did not workheavydemon217 days
| | | |
* | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon217 days
|\ \ \ \
| * | | | start of extra features and restored player functionsWBoerenkamps7 days
| | | | |
| * | | | removed iostreamWBoerenkamps7 days
| | | | |
| * | | | make formatWBoerenkamps7 days
| | | | |
| * | | | pooling fixWBoerenkamps7 days
| | | | |
| * | | | removed unwanted / removed linesWBoerenkamps7 days
| | | | |
| * | | | random better implementedWBoerenkamps7 days
| | | | |
| * | | | battlescript battle won workingWBoerenkamps7 days
| | | | |
| * | | | enemy sequence workingWBoerenkamps7 days
| | | | |
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | enemy death workingWBoerenkamps7 days
| | | | |
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps7 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\ \ \ \ \
| * | | | | | player bullet workingWBoerenkamps8 days
| | | | | | |
| * | | | | | enemy spawn working + enemy shootingWBoerenkamps8 days
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps9 days
| |\ \ \ \ \ \
| * | | | | | | enemy poolingWBoerenkamps9 days
| | | | | | | |
| * | | | | | | start of enemypool and creationWBoerenkamps10 days
| | | | | | | |
* | | | | | | | Merge branch 'master' into niels/gameheavydemon217 days
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Background blackMax-0017 days
| | | | | | | |
| * | | | | | | Added bubblesMax-0017 days
| | | | | | | |