aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Expand)AuthorAge
* Merge branch 'niels/game' of github.com:lonkaars/crepe into niels/gameheavydemon218 days
|\
| * removed pWBoerenkamps8 days
| * queue addedWBoerenkamps8 days
* | working scheduler and enemies and restheavydemon218 days
* | Merge branch 'master' into niels/gameheavydemon218 days
|\ \ | |/ |/|
| * Merge pull request #113 from lonkaars/jaro/gameheavydemon218 days
| |\
| | * `make format`jaro/gameLoek Le Blansch8 days
| | * removed enterJAROWMR8 days
| | * filled creditsJAROWMR8 days
| | * Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR8 days
| | |\
| | * | added credit windowJAROWMR8 days
| | * | updated preview and added credits buttonJAROWMR8 days
| | * | added replay functionalityJAROWMR8 days
| * | | Fixed end windowMax-0018 days
| * | | Added shop itemsMax-0018 days
| * | | Made shopMax-0018 days
| | |/ | |/|
* | | added camera stop boss fightheavydemon218 days
* | | added boss fight, did not workheavydemon218 days
* | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon218 days
|\ \ \
| * | | start of extra features and restored player functionsWBoerenkamps8 days
| * | | removed iostreamWBoerenkamps8 days
| * | | make formatWBoerenkamps8 days
| * | | pooling fixWBoerenkamps8 days
| * | | removed unwanted / removed linesWBoerenkamps8 days
| * | | random better implementedWBoerenkamps8 days
| * | | battlescript battle won workingWBoerenkamps8 days
| * | | enemy sequence workingWBoerenkamps8 days
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 days
| |\ \ \ | | | |/ | | |/|
| * | | enemy death workingWBoerenkamps8 days
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAIWBoerenkamps8 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/enemyAIWBoerenkamps10 days
| |\ \ \ \ \
| * | | | | | enemy poolingWBoerenkamps10 days
| * | | | | | start of enemypool and creationWBoerenkamps10 days
* | | | | | | Merge branch 'master' into niels/gameheavydemon218 days
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Background blackMax-0018 days
| * | | | | | Added bubblesMax-0018 days
| * | | | | | Added coin animationMax-0018 days
| * | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0018 days
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Added coin pickup soundMax-0018 days
* | | | | | | working zapper, missilies with schedulerheavydemon218 days
* | | | | | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon218 days
|\ \ \ \ \ \ \
| * | | | | | | WIPLoek Le Blansch8 days
| * | | | | | | WIPLoek Le Blansch8 days
| * | | | | | | pooling workingLoek Le Blansch8 days
| * | | | | | | WIPLoek Le Blansch8 days
| * | | | | | | another merge + WIPLoek Le Blansch9 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge + more WIPLoek Le Blansch9 days
| |\ \ \ \ \ \ \ \