aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'max/game' of github.com:lonkaars/crepeLoek Le Blansch36 hours
|\
| * Added Config.hMax-0013 days
| * `make format`Loek Le Blansch3 days
* | `make format`Loek Le Blansch3 days
* | fix EventManager memory leakLoek Le Blansch3 days
|/
* move game filesLoek Le Blansch3 days
* merge masterLoek Le Blansch3 days
|\
| * make formatWBoerenkamps3 days
| * button now using channelWBoerenkamps3 days
* | Make formatmax-0013 days
* | pull 3bda25f from demomax-0013 days
* | Fixed collision layersmax-0013 days
* | Fix merge issuesmax-0013 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0013 days
|\|
| * nitpick #91Loek Le Blansch4 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\
| | * make formatWBoerenkamps4 days
| | * added constWBoerenkamps4 days
| | * merge with masterWBoerenkamps5 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps5 days
| | * | removed empty if statementWBoerenkamps5 days
| | * | make formatWBoerenkamps5 days
| | * | camera space workingWBoerenkamps5 days
| * | | merge loek/scriptsLoek Le Blansch4 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch5 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch5 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch5 days
| | * | | | `make format`Loek Le Blansch5 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch5 days
| * | | | | merge masterloek/replayLoek Le Blansch4 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR4 days
| | * | | | | quick changesWBoerenkamps4 days
| | * | | | | make formatJAROWMR4 days
| | * | | | | nan test fixJAROWMR4 days
| | * | | | | updated nanJAROWMR4 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR4 days
| | * | | | | | is_nan fixJAROWMR4 days
| | * | | | | | removed collision testJAROWMR4 days
| | |/ / / / /
| | * | | | | added doxygenJAROWMR4 days
| | * | | | | merge masterJAROWMR4 days
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon214 days
| | | * | | | | removed coutheavydemon214 days
| | | * | | | | make formatheavydemon214 days
| | | * | | | | fixed ( placedmentheavydemon214 days
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon214 days
| | | * | | | | checkout jaro collision handlening branchheavydemon214 days
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon214 days
| | | * | | | | make formatheavydemon214 days
| | | * | | | | fix merge conflictheavydemon214 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon214 days
| | | |\ \ \ \ \