aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'max/game' of github.com:lonkaars/crepeLoek Le Blansch4 days
|\
| * Added Config.hMax-0015 days
| * `make format`Loek Le Blansch6 days
* | `make format`Loek Le Blansch6 days
* | fix EventManager memory leakLoek 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
|\|
| * nitpick #91Loek Le Blansch6 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch6 days
| |\
| | * make formatWBoerenkamps7 days
| | * added constWBoerenkamps7 days
| | * merge with masterWBoerenkamps7 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps8 days
| | * | removed empty if statementWBoerenkamps8 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
| | * | | | | make formatJAROWMR7 days
| | * | | | | nan test fixJAROWMR7 days
| | * | | | | updated nanJAROWMR7 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR7 days
| | * | | | | | is_nan fixJAROWMR7 days
| | * | | | | | removed collision testJAROWMR7 days
| | |/ / / / /
| | * | | | | added doxygenJAROWMR7 days
| | * | | | | merge masterJAROWMR7 days
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon217 days
| | | * | | | | removed coutheavydemon217 days
| | | * | | | | make formatheavydemon217 days
| | | * | | | | fixed ( placedmentheavydemon217 days
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon217 days
| | | * | | | | checkout jaro collision handlening branchheavydemon217 days
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon217 days
| | | * | | | | make formatheavydemon217 days
| | | * | | | | fix merge conflictheavydemon217 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon217 days
| | | |\ \ \ \ \