Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into niels/game | heavydemon21 | 3 days |
|\ | |||
| * | Merge pull request #113 from lonkaars/jaro/game | heavydemon21 | 3 days |
| |\ | | | | | | | Jaro/game | ||
| | * | `make format`jaro/game | Loek Le Blansch | 3 days |
| | | | |||
| | * | removed enter | JAROWMR | 3 days |
| | | | |||
| | * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/game | JAROWMR | 3 days |
| | |\ | |||
| | * | | filled credits | JAROWMR | 3 days |
| | | | | |||
| | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/game | JAROWMR | 3 days |
| | |\ \ | |||
| | * | | | added credit window | JAROWMR | 3 days |
| | | | | | |||
| | * | | | updated preview and added credits button | JAROWMR | 3 days |
| | | | | | |||
| | * | | | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/game | JAROWMR | 3 days |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'loek/replay' of github.com:lonkaars/crepe into jaro/game | JAROWMR | 3 days |
| | |\ \ \ \ | |||
| | * | | | | | added replay functionality | JAROWMR | 3 days |
| | | | | | | | |||
| * | | | | | | Merge pull request #114 from lonkaars/max/game2 | Max-001 | 3 days |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Max/game2 | ||
| | * | | | | | Fixed end window | Max-001 | 3 days |
| | | | | | | | |||
| | * | | | | | Merge remote-tracking branch 'origin/master' into max/game2 | Max-001 | 3 days |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge branch 'loek/replay' of github.com:lonkaars/crepe | Loek Le Blansch | 3 days |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | `make format` | Loek Le Blansch | 3 days |
| | | | | | | | |||
| | * | | | | | fix audio unit test | Loek Le Blansch | 3 days |
| | | |_|_|/ | | |/| | | | |||
| | * | | | | implement sprite replay | Loek Le Blansch | 3 days |
| | | | | | | |||
| | * | | | | Revert "implement animator replay" | Loek Le Blansch | 3 days |
| | | |_|/ | | |/| | | | | | | | | | | | | This reverts commit 1ef80ecfdc1a70a6ebdd43fed82d0f9d305d63dc. | ||
| | * | | | implement animator replay | Loek Le Blansch | 3 days |
| | | |/ | | |/| | |||
| | | * | Added shop items | Max-001 | 3 days |
| | | | | |||
| | | * | Made shop | Max-001 | 3 days |
| | | | | |||
* | | | | added camera stop boss fight | heavydemon21 | 3 days |
| | | | | |||
* | | | | added boss fight, did not work | heavydemon21 | 3 days |
| | | | | |||
* | | | | Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/game | heavydemon21 | 3 days |
|\ \ \ \ | |||
| * | | | | start of extra features and restored player functions | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | removed iostream | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | make format | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | pooling fix | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | removed unwanted / removed lines | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | random better implemented | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | battlescript battle won working | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | enemy sequence working | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAI | WBoerenkamps | 3 days |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| * | | | | enemy death working | WBoerenkamps | 3 days |
| | | | | | |||
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAI | WBoerenkamps | 3 days |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAI | WBoerenkamps | 3 days |
| |\ \ \ \ \ | |||
| * | | | | | | player bullet working | WBoerenkamps | 3 days |
| | | | | | | | |||
| * | | | | | | enemy spawn working + enemy shooting | WBoerenkamps | 3 days |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/enemyAI | WBoerenkamps | 5 days |
| |\ \ \ \ \ \ | |||
| * | | | | | | | enemy pooling | WBoerenkamps | 5 days |
| | | | | | | | | |||
| * | | | | | | | start of enemypool and creation | WBoerenkamps | 5 days |
| | | | | | | | | |||
* | | | | | | | | Merge branch 'master' into niels/game | heavydemon21 | 3 days |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #112 from lonkaars/max/game2 | Jaro | 3 days |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | Max/game2 | ||
| | * | | | | | Background black | Max-001 | 3 days |
| | | | | | | | |||
| | * | | | | | Added bubbles | Max-001 | 3 days |
| | | | | | | | |||
| | * | | | | | Added coin animation | Max-001 | 3 days |
| | | | | | | | |||
| | * | | | | | Merge remote-tracking branch 'origin/master' into max/game2 | Max-001 | 3 days |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | Added coin pickup sound | Max-001 | 3 days |
| | | | | | | |