aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Fixed collision layersmax-00110 days
* Fix merge issuesmax-00110 days
* Merge remote-tracking branch 'origin/master' into max/gamemax-00110 days
|\
| * nitpick #91Loek Le Blansch10 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch10 days
| |\
| | * make formatWBoerenkamps11 days
| | * added constWBoerenkamps11 days
| | * merge with masterWBoerenkamps11 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps12 days
| | * | removed empty if statementWBoerenkamps12 days
| | * | make formatWBoerenkamps12 days
| | * | camera space workingWBoerenkamps12 days
| * | | merge loek/scriptsLoek Le Blansch10 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch11 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch12 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch12 days
| | * | | | `make format`Loek Le Blansch12 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch12 days
| * | | | | merge masterloek/replayLoek Le Blansch10 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR10 days
| | * | | | | quick changesWBoerenkamps10 days
| | * | | | | make formatJAROWMR11 days
| | * | | | | nan test fixJAROWMR11 days
| | * | | | | updated nanJAROWMR11 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR11 days
| | * | | | | | is_nan fixJAROWMR11 days
| | * | | | | | removed collision testJAROWMR11 days
| | |/ / / / /
| | * | | | | added doxygenJAROWMR11 days
| | * | | | | merge masterJAROWMR11 days
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon2111 days
| | | * | | | | removed coutheavydemon2111 days
| | | * | | | | make formatheavydemon2111 days
| | | * | | | | fixed ( placedmentheavydemon2111 days
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon2111 days
| | | * | | | | checkout jaro collision handlening branchheavydemon2111 days
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon2111 days
| | | * | | | | make formatheavydemon2111 days
| | | * | | | | fix merge conflictheavydemon2111 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon2111 days
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch11 days
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon2112 days
| | | | * | | | | make formatheavydemon2112 days
| | | | * | | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon2112 days
| | | | | |_|_|/ | | | | |/| | |
| | | * | | | | removed absolute position because jaro is adjusting thatheavydemon2111 days
| | | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon2112 days
| | | * | | | | added transform scale and rotation in the drawing text componentheavydemon2112 days
| | | * | | | | implemented feedbackheavydemon2113 days
| | | * | | | | merged masterheavydemon2113 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon2113 days
| | | |\| | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon2113 days
| | | |\ \ \ \ \