aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Expand)AuthorAge
* Merge branch 'master' into niels/gameheavydemon217 days
|\
| * Merge pull request #113 from lonkaars/jaro/gameheavydemon217 days
| |\
| | * `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/enemyAIWBoerenkamps7 days
| |\ \ \ \
| * | | | | player bullet workingWBoerenkamps7 days
| * | | | | enemy spawn working + enemy shootingWBoerenkamps7 days
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps9 days
| |\ \ \ \ \
| * | | | | | enemy poolingWBoerenkamps9 days
| * | | | | | start of enemypool and creationWBoerenkamps9 days
* | | | | | | Merge branch 'master' into niels/gameheavydemon217 days
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Background blackMax-0017 days
| * | | | | | Added bubblesMax-0017 days
| * | | | | | Added coin animationMax-0017 days
| * | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0017 days
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Added coin pickup soundMax-0017 days
* | | | | | | working zapper, missilies with schedulerheavydemon217 days
* | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon217 days
|\ \ \ \ \ \ \
| * | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | pooling workingLoek Le Blansch7 days
| * | | | | | | WIPLoek Le Blansch7 days
| * | | | | | | another merge + WIPLoek Le Blansch8 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch8 days
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more WIP zapperpoolLoek Le Blansch8 days
| * | | | | | | | | `make format`Loek Le Blansch8 days
| * | | | | | | | | cleanupLoek Le Blansch8 days
| * | | | | | | | | merge masterLoek Le Blansch8 days
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |