aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* big WIPLoek Le Blansch3 days
|
* update clang-format optionsHEADmasterLoek Le Blansch3 days
|
* `make format`Loek Le Blansch3 days
|
* Merge branch 'max/game' of github.com:lonkaars/crepeLoek Le Blansch3 days
|\
| * Added collision layers to Config.hMax-0014 days
| |
| * Deleted iostream includeMax-0014 days
| |
| * Added more to Config.hMax-0014 days
| |
| * Added commentsMax-0014 days
| |
| * Added Config.hMax-0014 days
| |
| * Merge remote-tracking branch 'origin/master' into max/gameMax-0014 days
| |\
| * | Moved file to sub directoryMax-0014 days
| | |
* | | Merge branch 'master' into loek/leak-fixloek/leak-fixLoek Le Blansch5 days
|\ \ \ | | |/ | |/|
| * | `make format`Loek Le Blansch5 days
| |/
* | `make format`Loek Le Blansch5 days
| |
* | fix EventManager memory leakLoek Le Blansch5 days
|/
* finish moving gameLoek Le Blansch5 days
|
* move game filesLoek Le Blansch5 days
|
* merge masterLoek Le Blansch5 days
|\
| * make formatWBoerenkamps5 days
| |
| * button now using channelWBoerenkamps5 days
| |
* | Make formatmax-0015 days
| |
* | pull 3bda25f from demomax-0015 days
| |
* | Fixed collision layersmax-0015 days
| |
* | Fix merge issuesmax-0015 days
| |
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0015 days
|\|
| * add game folderLoek Le Blansch5 days
| |
| * nitpick #91Loek Le Blansch5 days
| |
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\
| | * make formatWBoerenkamps6 days
| | |
| | * added constWBoerenkamps6 days
| | |
| | * merge with masterWBoerenkamps6 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps7 days
| | | |
| | * | removed empty if statementWBoerenkamps7 days
| | | |
| | * | make formatWBoerenkamps7 days
| | | |
| | * | camera space workingWBoerenkamps7 days
| | | |
| * | | merge loek/scriptsLoek Le Blansch5 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch6 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch7 days
| | | | | |
| | * | | | update ScriptSystem doxygenLoek Le Blansch7 days
| | | | | |
| | * | | | `make format`Loek Le Blansch7 days
| | | | | |
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch7 days
| | | | | |
| * | | | | merge masterloek/replayLoek Le Blansch5 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR5 days
| | | | | | |
| | * | | | | quick changesWBoerenkamps5 days
| | | | | | |
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0016 days
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Jaro/collision system handeling
| | | * | | | | make formatJAROWMR6 days
| | | | | | | |
| | | * | | | | nan test fixJAROWMR6 days
| | | | | | | |
| | | * | | | | updated nanJAROWMR6 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR6 days
| | | | | | | | |
| | | * | | | | | is_nan fixJAROWMR6 days
| | | | | | | | |