aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Added Config.hMax-0014 days
* `make format`Loek Le Blansch4 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
|\|
| * nitpick #91Loek Le Blansch5 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\
| | * make formatWBoerenkamps5 days
| | * added constWBoerenkamps5 days
| | * merge with masterWBoerenkamps6 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps6 days
| | * | removed empty if statementWBoerenkamps6 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 Blansch6 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
| | * | | | | 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 adding extra offsetheavydemon215 days
| | | * | | | | removed coutheavydemon215 days
| | | * | | | | make formatheavydemon215 days
| | | * | | | | fixed ( placedmentheavydemon215 days
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon215 days
| | | * | | | | checkout jaro collision handlening branchheavydemon215 days
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon216 days
| | | * | | | | make formatheavydemon216 days
| | | * | | | | fix merge conflictheavydemon216 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch6 days
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon217 days
| | | | * | | | | make formatheavydemon217 days