aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch2 days
|\
| * make formatWBoerenkamps3 days
| * added constWBoerenkamps3 days
| * merge with masterWBoerenkamps3 days
| |\
| * | made test better by seperating x and y valuesWBoerenkamps4 days
| * | removed empty if statementWBoerenkamps4 days
| * | make formatWBoerenkamps4 days
| * | camera space workingWBoerenkamps4 days
* | | merge loek/scriptsLoek Le Blansch2 days
|\ \ \
| * \ \ 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 Blansch2 days
|\ \ \ \ \
| * | | | | fixesJAROWMR2 days
| * | | | | quick changesWBoerenkamps2 days
| * | | | | make formatJAROWMR3 days
| * | | | | nan test fixJAROWMR3 days
| * | | | | updated nanJAROWMR3 days
| |\ \ \ \ \
| | * | | | | make formatJAROWMR3 days
| * | | | | | is_nan fixJAROWMR3 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
| | * | | | | added transform scale and rotation in the drawing text componentheavydemon214 days
| | * | | | | implemented feedbackheavydemon215 days
| | * | | | | merged masterheavydemon215 days
| | * | | | | Merge branch 'master' into niels/UIheavydemon215 days
| | |\| | | |
| | * | | | | Merge branch 'master' into niels/UIheavydemon215 days
| | |\ \ \ \ \
| | * | | | | | make formatheavydemon215 days
| | * | | | | | config will be checout with master once PR#77 is merged, and sdlcontext adjus...heavydemon215 days
| | * | | | | | Merge branch 'master' into niels/UIheavydemon215 days
| | |\ \ \ \ \ \
| | * | | | | | | revered to masterheavydemon215 days