aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Fix merge issuesmax-0014 days
|
* Merge remote-tracking branch 'origin/master' into max/gamemax-0014 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 formatWBoerenkamps6 days
| | | |
| | * | camera space workingWBoerenkamps6 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 Blansch6 days
| | | | | |
| | * | | | `make format`Loek Le Blansch6 days
| | | | | |
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch6 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 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 commentsheavydemon215 days
| | | | | | | |
| | | * | | | | make formatheavydemon215 days
| | | | | | | |
| | | * | | | | fix merge conflictheavydemon215 days
| | | | | | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon215 days
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch5 days
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon216 days
| | | | | | | | |
| | | | * | | | | make formatheavydemon216 days
| | | | | | | | |
| | | | * | | | | added particle begin lifespan rendering, added world_space to sprite so that ↵heavydemon216 days
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | coordinates are in camera_space or world_sapce
| | | * | | | | removed absolute position because jaro is adjusting thatheavydemon215 days
| | | | | | | |
| | | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan ↵heavydemon215 days
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | het overleggen dus er die werkt niet goed
| | | * | | | | added transform scale and rotation in the drawing text componentheavydemon216 days
| | | | | | | |
| | | * | | | | implemented feedbackheavydemon216 days
| | | | | | | |
| | | * | | | | merged masterheavydemon217 days
| | | | | | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon217 days
| | | |\| | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon217 days
| | | |\ \ \ \ \
| | | * | | | | | make formatheavydemon217 days
| | | | | | | | |