aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* merge masterLoek Le Blansch43 hours
|\
| * make formatWBoerenkamps44 hours
| * button now using channelWBoerenkamps44 hours
* | Make formatmax-00144 hours
* | pull 3bda25f from demomax-00144 hours
* | Fixed collision layersmax-00144 hours
* | Fix merge issuesmax-00144 hours
* | Merge remote-tracking branch 'origin/master' into max/gamemax-00144 hours
|\|
| * nitpick #91Loek Le Blansch45 hours
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch45 hours
| |\
| | * make formatWBoerenkamps2 days
| | * added constWBoerenkamps2 days
| | * merge with masterWBoerenkamps3 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps3 days
| | * | removed empty if statementWBoerenkamps3 days
| | * | make formatWBoerenkamps4 days
| | * | camera space workingWBoerenkamps4 days
| * | | merge loek/scriptsLoek Le Blansch45 hours
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch3 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch4 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch4 days
| | * | | | `make format`Loek Le Blansch4 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch4 days
| * | | | | merge masterloek/replayLoek Le Blansch45 hours
| |\ \ \ \ \
| | * | | | | fixesJAROWMR46 hours
| | * | | | | quick changesWBoerenkamps47 hours
| | * | | | | make formatJAROWMR2 days
| | * | | | | nan test fixJAROWMR2 days
| | * | | | | updated nanJAROWMR2 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR3 days
| | * | | | | | is_nan fixJAROWMR2 days
| | * | | | | | removed collision testJAROWMR3 days
| | |/ / / / /
| | * | | | | added doxygenJAROWMR3 days
| | * | | | | merge masterJAROWMR3 days
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon213 days
| | | * | | | | removed coutheavydemon213 days
| | | * | | | | make formatheavydemon213 days
| | | * | | | | fixed ( placedmentheavydemon213 days
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon213 days
| | | * | | | | checkout jaro collision handlening branchheavydemon213 days
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon213 days
| | | * | | | | make formatheavydemon213 days
| | | * | | | | fix merge conflictheavydemon213 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon213 days
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch3 days
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon214 days
| | | | * | | | | make formatheavydemon214 days
| | | | * | | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon214 days
| | | | | |_|_|/ | | | | |/| | |
| | | * | | | | removed absolute position because jaro is adjusting thatheavydemon213 days
| | | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon214 days