aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* `make format`Loek Le Blansch12 hours
* fix EventManager memory leakLoek Le Blansch12 hours
* move game filesLoek Le Blansch18 hours
* merge masterLoek Le Blansch18 hours
|\
| * make formatWBoerenkamps18 hours
| * button now using channelWBoerenkamps18 hours
* | Make formatmax-00118 hours
* | pull 3bda25f from demomax-00118 hours
* | Fixed collision layersmax-00118 hours
* | Fix merge issuesmax-00118 hours
* | Merge remote-tracking branch 'origin/master' into max/gamemax-00118 hours
|\|
| * nitpick #91Loek Le Blansch19 hours
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch19 hours
| |\
| | * make formatWBoerenkamps33 hours
| | * added constWBoerenkamps33 hours
| | * merge with masterWBoerenkamps45 hours
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps2 days
| | * | removed empty if statementWBoerenkamps2 days
| | * | make formatWBoerenkamps3 days
| | * | camera space workingWBoerenkamps3 days
| * | | merge loek/scriptsLoek Le Blansch19 hours
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch45 hours
| | |\ \ \
| | * | | | feedbackLoek Le Blansch3 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch3 days
| | * | | | `make format`Loek Le Blansch3 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch3 days
| * | | | | merge masterloek/replayLoek Le Blansch19 hours
| |\ \ \ \ \
| | * | | | | fixesJAROWMR21 hours
| | * | | | | quick changesWBoerenkamps21 hours
| | * | | | | make formatJAROWMR34 hours
| | * | | | | nan test fixJAROWMR34 hours
| | * | | | | updated nanJAROWMR34 hours
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR35 hours
| | * | | | | | is_nan fixJAROWMR34 hours
| | * | | | | | removed collision testJAROWMR34 hours
| | |/ / / / /
| | * | | | | added doxygenJAROWMR35 hours
| | * | | | | merge masterJAROWMR35 hours
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon2138 hours
| | | * | | | | removed coutheavydemon2138 hours
| | | * | | | | make formatheavydemon2139 hours
| | | * | | | | fixed ( placedmentheavydemon2139 hours
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon2139 hours
| | | * | | | | checkout jaro collision handlening branchheavydemon2139 hours
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon2140 hours
| | | * | | | | make formatheavydemon2140 hours
| | | * | | | | fix merge conflictheavydemon2140 hours
| | | * | | | | Merge branch 'master' into niels/UIheavydemon2140 hours
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch41 hours
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon213 days
| | | | * | | | | make formatheavydemon213 days