aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR6 days
|\
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0017 days
| |\
| * | Increased missile soundMax-0017 days
| * | Disabled move camera manually scriptMax-0017 days
| * | Added check to not walk if velocity is 0Max-0017 days
| * | Do not move player if x velocity is 0Max-0017 days
| * | Background paralax fix at boss fightMax-0017 days
* | | added shop functionalityJAROWMR6 days
* | | endgame show scoreJAROWMR7 days
* | | added color to buttonJAROWMR7 days
* | | replay in preview sceneJAROWMR7 days
* | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/gameJAROWMR7 days
|\ \ \ | | |/ | |/|
| * | fixed angular dtWBoerenkamps7 days
| |/
| * make formatheavydemon217 days
| * added preset with nothingheavydemon217 days
| * Merge branch 'master' into niels/gameheavydemon217 days
| |\
| | * `make format`Loek Le Blansch7 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| * | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | working zapper, missilies with schedulerheavydemon217 days