aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #133 from lonkaars/max/previewMax-00139 hours
|\
| * Merge remote-tracking branch 'origin/master' into max/previewMax-00139 hours
| |\ | |/ |/|
* | Merge branch 'niels/game' of github.com:lonkaars/crepeLoek Le Blansch40 hours
|\ \
| * | improved missile spawn locationheavydemon2141 hours
* | | fix zapper spawn rangeLoek Le Blansch40 hours
|/ /
| * Merge remote-tracking branch 'origin/master' into max/previewMax-00143 hours
| |\ | |/ |/|
* | calm down playerLoek Le Blansch43 hours
| * Merge remote-tracking branch 'origin/master' into max/previewMax-00143 hours
| |\ | |/ |/|
* | Merge pull request #132 from lonkaars/max/game2Wboerenkamps43 hours
|\ \
| | * Fix: Added audio trackMax-00143 hours
| | * Fix: removed button Q and EMax-00143 hours
| | * Fix: Made player much more responsiveMax-00144 hours
| | * Fix: Player and NPS do not collide anymoreMax-00144 hours
| | * Fix: Invert both body and head of NPC spriteMax-00144 hours
| | * Fix: Set camera background to blackMax-00144 hours
| | * Fix: Set fixed backgroundMax-00144 hours
| |/
| * Bug fix: Back button not vissibleMax-00144 hours
| * Fixed bug: Sprites less pixelyMax-00144 hours
| * Fixed bug WouterMax-00145 hours
|/
* Merge pull request #131 from lonkaars/niels/gameheavydemon212 days
|\
| * Merge remote-tracking branch 'origin/master' into niels/gameheavydemon212 days
| |\ | |/ |/|
* | Merge pull request #123 from lonkaars/wouter/game-improvementsheavydemon212 days
|\ \
| * \ Merge pull request #130 from lonkaars/max/game2Max-0013 days
| |\ \
| | * | Spawn more enemies when game is furtherMax-0013 days
| | * | Merge remote-tracking branch 'origin/wouter/game-improvements' into max/game2Max-0013 days
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/game-i...WBoerenkamps3 days
| |\ \ \
| * | | | balance changesWBoerenkamps3 days
| * | | | make formatWBoerenkamps3 days
| * | | | removed iostreamWBoerenkamps3 days
| * | | | animation working + removed bullet colliding with dead enemiesWBoerenkamps3 days
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/game-i...WBoerenkamps3 days
| |\ \ \ \
| * | | | | added to config enemy_pool_maxWBoerenkamps3 days
| * | | | | balance changesWBoerenkamps3 days
| * | | | | changed bullet colorWBoerenkamps4 days
| * | | | | decreased bulletWBoerenkamps4 days
| * | | | | make formatWBoerenkamps4 days
| * | | | | cleanupWBoerenkamps4 days
| * | | | | enemy death workingWBoerenkamps4 days
| * | | | | make formatWBoerenkamps4 days
| * | | | | fixed some player featuresWBoerenkamps4 days
| * | | | | removed player spawn battleWBoerenkamps4 days
| * | | | | removed iostreamWBoerenkamps4 days
| * | | | | removed unnecesary config optionWBoerenkamps4 days
| * | | | | workers during normal sequence workingWBoerenkamps4 days
| | | | | * make formatheavydemon212 days
| | | | | * tiny adjustments for preview sceneheavydemon212 days
| | | | | * Merge branch 'master' into niels/gameheavydemon212 days
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #129 from lonkaars/max/game2Max-0013 days
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Bug fixesMax-0013 days
| * | | | | Implemented ShopMax-0013 days
|/ / / / /