aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Added collision layers to Config.hMax-0013 days
* Deleted iostream includeMax-0013 days
* Added more to Config.hMax-0013 days
* Added commentsMax-0013 days
* Added Config.hMax-0013 days
* Merge remote-tracking branch 'origin/master' into max/gameMax-0013 days
|\
| * `make format`Loek Le Blansch4 days
* | Moved file to sub directoryMax-0013 days
|/
* finish moving gameLoek Le Blansch4 days
* move game filesLoek Le Blansch4 days
* merge masterLoek Le Blansch4 days
|\
| * make formatWBoerenkamps4 days
| * button now using channelWBoerenkamps4 days
* | Make formatmax-0014 days
* | pull 3bda25f from demomax-0014 days
* | Fixed collision layersmax-0014 days
* | Fix merge issuesmax-0014 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0014 days
|\|
| * add game folderLoek Le Blansch4 days
| * nitpick #91Loek Le Blansch4 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\
| | * make formatWBoerenkamps5 days
| | * added constWBoerenkamps5 days
| | * merge with masterWBoerenkamps5 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps6 days
| | * | removed empty if statementWBoerenkamps6 days
| | * | make formatWBoerenkamps6 days
| | * | camera space workingWBoerenkamps6 days
| * | | merge loek/scriptsLoek Le Blansch4 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch5 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch6 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch6 days
| | * | | | `make format`Loek Le Blansch6 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch6 days
| * | | | | merge masterloek/replayLoek Le Blansch4 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR4 days
| | * | | | | quick changesWBoerenkamps4 days
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0015 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR5 days
| | | * | | | | nan test fixJAROWMR5 days
| | | * | | | | updated nanJAROWMR5 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR5 days
| | | * | | | | | is_nan fixJAROWMR5 days
| | | * | | | | | removed collision testJAROWMR5 days
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR5 days
| | | * | | | | merge masterJAROWMR5 days
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR5 days
| | | * | | | | | updated coments and reverted test cmakeJAROWMR5 days
| | | * | | | | | added some commentsJAROWMR5 days
| | | * | | | | | improved doxygen commentsJAROWMR5 days