aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
Commit message (Expand)AuthorAge
* `make format`HEADmasterLoek Le Blansch14 hours
* merge masterLoek Le Blansch20 hours
|\
| * make formatWBoerenkamps20 hours
| * button now using channelWBoerenkamps20 hours
* | Make formatmax-00120 hours
* | pull 3bda25f from demomax-00120 hours
* | Merge remote-tracking branch 'origin/master' into max/gamemax-00121 hours
|\|
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch22 hours
| |\
| | * make formatWBoerenkamps35 hours
| | * added constWBoerenkamps35 hours
| | * merge with masterWBoerenkamps47 hours
| | |\
| | * | removed empty if statementWBoerenkamps2 days
| | * | make formatWBoerenkamps3 days
| | * | camera space workingWBoerenkamps3 days
| * | | merge loek/scriptsLoek Le Blansch22 hours
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch47 hours
| | |\ \ \
| | * | | | feedbackLoek Le Blansch3 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch3 days
| | * | | | `make format`Loek Le Blansch3 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch3 days
| * | | | | merge masterloek/replayLoek Le Blansch22 hours
| |\ \ \ \ \
| | * | | | | fixesJAROWMR23 hours
| | * | | | | make formatJAROWMR36 hours
| | * | | | | nan test fixJAROWMR36 hours
| | * | | | | updated nanJAROWMR36 hours
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR37 hours
| | * | | | | | is_nan fixJAROWMR36 hours
| | |/ / / / /
| | * | | | | added doxygenJAROWMR38 hours
| | * | | | | merge masterJAROWMR38 hours
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon2141 hours
| | | * | | | | removed coutheavydemon2141 hours
| | | * | | | | make formatheavydemon2141 hours
| | | * | | | | fixed ( placedmentheavydemon2141 hours
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon2142 hours
| | | * | | | | checkout jaro collision handlening branchheavydemon2142 hours
| | | * | | | | adjusted tm naming --> transform and adjusted doxygen commentsheavydemon2143 hours
| | | * | | | | make formatheavydemon2143 hours
| | | * | | | | fix merge conflictheavydemon2143 hours
| | | * | | | | Merge branch 'master' into niels/UIheavydemon2143 hours
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch43 hours
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | implemented wouter feedbackheavydemon213 days
| | | | * | | | | make formatheavydemon213 days
| | | | * | | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon213 days
| | | | | |_|_|/ | | | | |/| | |
| | | * | | | | removed absolute position because jaro is adjusting thatheavydemon2148 hours
| | | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon213 days
| | | * | | | | added transform scale and rotation in the drawing text componentheavydemon213 days
| | | * | | | | implemented feedbackheavydemon213 days
| | | * | | | | merged masterheavydemon214 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon214 days
| | | |\| | | |
| | | * | | | | Merge branch 'master' into niels/UIheavydemon214 days
| | | |\ \ \ \ \