aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into max/gamemax-0013 days
|\
| * nitpick #91Loek Le Blansch3 days
| |
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch3 days
| |\
| | * make formatWBoerenkamps3 days
| | |
| | * added constWBoerenkamps3 days
| | |
| | * merge with masterWBoerenkamps4 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps4 days
| | | |
| | * | removed empty if statementWBoerenkamps4 days
| | | |
| | * | make formatWBoerenkamps5 days
| | | |
| | * | camera space workingWBoerenkamps5 days
| | | |
| * | | merge loek/scriptsLoek Le Blansch3 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch4 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 Blansch3 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR3 days
| | | | | | |
| | * | | | | quick changesWBoerenkamps3 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
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch4 days
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon215 days
| | | | | | | | |
| | | | * | | | | make formatheavydemon215 days
| | | | | | | | |
| | | | * | | | | added particle begin lifespan rendering, added world_space to sprite so that ↵heavydemon215 days
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | coordinates are in camera_space or world_sapce
| | | * | | | | removed absolute position because jaro is adjusting thatheavydemon214 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 componentheavydemon215 days
| | | | | | | |
| | | * | | | | implemented feedbackheavydemon215 days
| | | | | | | |
| | | * | | | | merged masterheavydemon216 days
| | | | | | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\| | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\ \ \ \ \
| | | * | | | | | make formatheavydemon216 days
| | | | | | | | |
| | | * | | | | | config will be checout with master once PR#77 is merged, and sdlcontext ↵heavydemon216 days
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adjustemetns for merging