aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'niels/game' of github.com:lonkaars/crepeLoek Le Blansch17 hours
|\
| * improved missile spawn locationheavydemon2118 hours
| |
* | fix zapper spawn rangeLoek Le Blansch17 hours
|/
* calm down playerLoek Le Blansch20 hours
|
* Merge pull request #132 from lonkaars/max/game2Wboerenkamps21 hours
|\ | | | | Bug fixes
| * Bug fix: Back button not vissibleMax-00122 hours
| |
| * Fixed bug: Sprites less pixelyMax-00122 hours
| |
| * Fixed bug WouterMax-00122 hours
|/
* Merge pull request #131 from lonkaars/niels/gameheavydemon2137 hours
|\ | | | | Niels/game
| * Merge remote-tracking branch 'origin/master' into niels/gameheavydemon2137 hours
| |\ | |/ |/|
* | Merge pull request #123 from lonkaars/wouter/game-improvementsheavydemon2137 hours
|\ \ | | | | | | some extra features
| * \ Merge pull request #130 from lonkaars/max/game2Max-00138 hours
| |\ \ | | | | | | | | Max/game2
| | * | Spawn more enemies when game is furtherMax-00139 hours
| | | |
| | * | Merge remote-tracking branch 'origin/wouter/game-improvements' into max/game2Max-00140 hours
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into ↵WBoerenkamps42 hours
| |\ \ \ | | | | | | | | | | | | | | | wouter/game-improvements
| * | | | balance changesWBoerenkamps43 hours
| | | | |
| * | | | make formatWBoerenkamps46 hours
| | | | |
| * | | | removed iostreamWBoerenkamps46 hours
| | | | |
| * | | | animation working + removed bullet colliding with dead enemiesWBoerenkamps46 hours
| | | | |
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into ↵WBoerenkamps46 hours
| |\ \ \ \ | | | | | | | | | | | | | | | | | | wouter/game-improvements
| * | | | | added to config enemy_pool_maxWBoerenkamps46 hours
| | | | | |
| * | | | | balance changesWBoerenkamps47 hours
| | | | | |
| * | | | | changed bullet colorWBoerenkamps3 days
| | | | | |
| * | | | | decreased bulletWBoerenkamps3 days
| | | | | |
| * | | | | make formatWBoerenkamps3 days
| | | | | |
| * | | | | cleanupWBoerenkamps3 days
| | | | | |
| * | | | | enemy death workingWBoerenkamps3 days
| | | | | |
| * | | | | make formatWBoerenkamps3 days
| | | | | |
| * | | | | fixed some player featuresWBoerenkamps3 days
| | | | | |
| * | | | | removed player spawn battleWBoerenkamps3 days
| | | | | |
| * | | | | removed iostreamWBoerenkamps3 days
| | | | | |
| * | | | | removed unnecesary config optionWBoerenkamps3 days
| | | | | |
| * | | | | workers during normal sequence workingWBoerenkamps3 days
| | | | | |
| | | | | * make formatheavydemon2137 hours
| | | | | |
| | | | | * tiny adjustments for preview sceneheavydemon2137 hours
| | | | | |
| | | | | * Merge branch 'master' into niels/gameheavydemon2137 hours
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #129 from lonkaars/max/game2Max-00139 hours
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | Implemented Shop
| * | | | | Bug fixesMax-00140 hours
| | | | | |
| * | | | | Implemented ShopMax-00141 hours
|/ / / / /
* | | | | Merge pull request #127 from lonkaars/max/game2Wboerenkamps41 hours
|\ \ \ \ \ | |_|_|/ / |/| | | | Fixed Paralax
| * | | | Merge remote-tracking branch 'origin/master' into max/game2Max-00141 hours
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed ParalaxMax-00141 hours
| | | | |
| | | | * added boundaries to preview sceneheavydemon2137 hours
| | | | |
| | | | * moved if statementheavydemon2140 hours
| | | | |
| | | | * missile solution, cannot find @max issueheavydemon2140 hours
| |_|_|/ |/| | |
* | | | Merge pull request #126 from lonkaars/max/game2heavydemon2142 hours
|\| | | | | | | | | | | Bug fix + make format
| * | | Merge remote-tracking branch 'origin/master' into max/game2Max-00142 hours
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #125 from lonkaars/niels/gameheavydemon2142 hours
|\ \ \ \ | | | | | | | | | | missile alerts
| * | | | make formatheavydemon2142 hours
| | | | |
| * | | | adjsuted includes so that it has <> and notheavydemon2142 hours
| | | | |