aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch7 days
|\
| * make formatWBoerenkamps7 days
| * added constWBoerenkamps7 days
| * merge with masterWBoerenkamps8 days
| |\
| * | made test better by seperating x and y valuesWBoerenkamps8 days
| * | removed empty if statementWBoerenkamps8 days
| * | make formatWBoerenkamps9 days
| * | camera space workingWBoerenkamps9 days
* | | merge loek/scriptsLoek Le Blansch7 days
|\ \ \
| * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch8 days
| |\ \ \
| * | | | feedbackLoek Le Blansch8 days
| * | | | update ScriptSystem doxygenLoek Le Blansch9 days
| * | | | `make format`Loek Le Blansch9 days
| * | | | add fixed/frame update functions to scriptLoek Le Blansch9 days
* | | | | merge masterloek/replayLoek Le Blansch7 days
|\ \ \ \ \
| * | | | | fixesJAROWMR7 days
| * | | | | quick changesWBoerenkamps7 days
| * | | | | make formatJAROWMR7 days
| * | | | | nan test fixJAROWMR7 days
| * | | | | updated nanJAROWMR7 days
| |\ \ \ \ \
| | * | | | | make formatJAROWMR7 days
| * | | | | | is_nan fixJAROWMR7 days
| * | | | | | removed collision testJAROWMR7 days
| |/ / / / /
| * | | | | added doxygenJAROWMR7 days
| * | | | | merge masterJAROWMR7 days
| |\ \ \ \ \
| | * | | | | removed adding extra offsetheavydemon217 days
| | * | | | | removed coutheavydemon218 days
| | * | | | | make formatheavydemon218 days
| | * | | | | fixed ( placedmentheavydemon218 days
| | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon218 days
| | * | | | | checkout jaro collision handlening branchheavydemon218 days
| | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon218 days
| | * | | | | make formatheavydemon218 days
| | * | | | | fix merge conflictheavydemon218 days
| | * | | | | Merge branch 'master' into niels/UIheavydemon218 days
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch8 days
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | implemented wouter feedbackheavydemon219 days
| | | * | | | | make formatheavydemon219 days
| | | * | | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon219 days
| | | | |_|_|/ | | | |/| | |
| | * | | | | removed absolute position because jaro is adjusting thatheavydemon218 days
| | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon218 days
| | * | | | | added transform scale and rotation in the drawing text componentheavydemon219 days
| | * | | | | implemented feedbackheavydemon219 days
| | * | | | | merged masterheavydemon2110 days
| | * | | | | Merge branch 'master' into niels/UIheavydemon2110 days
| | |\| | | |
| | * | | | | Merge branch 'master' into niels/UIheavydemon2110 days
| | |\ \ \ \ \
| | * | | | | | make formatheavydemon2110 days
| | * | | | | | config will be checout with master once PR#77 is merged, and sdlcontext adjus...heavydemon2110 days
| | * | | | | | Merge branch 'master' into niels/UIheavydemon2110 days
| | |\ \ \ \ \ \
| | * | | | | | | revered to masterheavydemon2110 days