aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Deleted iostream includeMax-0015 days
* Added more to Config.hMax-0015 days
* Added commentsMax-0015 days
* Added Config.hMax-0015 days
* Merge remote-tracking branch 'origin/master' into max/gameMax-0015 days
|\
| * `make format`Loek Le Blansch6 days
* | Moved file to sub directoryMax-0015 days
|/
* finish moving gameLoek Le Blansch6 days
* move game filesLoek Le Blansch6 days
* merge masterLoek Le Blansch6 days
|\
| * make formatWBoerenkamps6 days
| * button now using channelWBoerenkamps6 days
* | Make formatmax-0016 days
* | pull 3bda25f from demomax-0016 days
* | Fixed collision layersmax-0016 days
* | Fix merge issuesmax-0016 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0016 days
|\|
| * add game folderLoek Le Blansch6 days
| * nitpick #91Loek Le Blansch6 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch6 days
| |\
| | * make formatWBoerenkamps6 days
| | * added constWBoerenkamps6 days
| | * merge with masterWBoerenkamps7 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps7 days
| | * | removed empty if statementWBoerenkamps7 days
| | * | make formatWBoerenkamps8 days
| | * | camera space workingWBoerenkamps8 days
| * | | merge loek/scriptsLoek Le Blansch6 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch7 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch8 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch8 days
| | * | | | `make format`Loek Le Blansch8 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch8 days
| * | | | | merge masterloek/replayLoek Le Blansch6 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR6 days
| | * | | | | quick changesWBoerenkamps6 days
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0016 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR6 days
| | | * | | | | nan test fixJAROWMR6 days
| | | * | | | | updated nanJAROWMR6 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR6 days
| | | * | | | | | is_nan fixJAROWMR6 days
| | | * | | | | | removed collision testJAROWMR6 days
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR7 days
| | | * | | | | merge masterJAROWMR7 days
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR7 days
| | | * | | | | | updated coments and reverted test cmakeJAROWMR7 days
| | | * | | | | | added some commentsJAROWMR7 days
| | | * | | | | | improved doxygen commentsJAROWMR7 days
| | | * | | | | | improved doxygenJAROWMR7 days