aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* reset BehaviorScript to masterLoek Le Blansch2 days
* fix Player prefabLoek Le Blansch2 days
* big WIPLoek Le Blansch2 days
* update clang-format optionsHEADmasterLoek Le Blansch2 days
* `make format`Loek Le Blansch2 days
* Merge branch 'max/game' of github.com:lonkaars/crepeLoek Le Blansch2 days
|\
| * Added Config.hMax-0013 days
| * `make format`Loek Le Blansch4 days
* | `make format`Loek Le Blansch4 days
* | fix EventManager memory leakLoek Le Blansch4 days
|/
* move game filesLoek Le Blansch4 days
* merge masterLoek Le Blansch4 days
|\
| * make formatWBoerenkamps4 days
| * button now using channelWBoerenkamps4 days
* | Make formatmax-0014 days
* | pull 3bda25f from demomax-0014 days
* | Fixed collision layersmax-0014 days
* | Fix merge issuesmax-0014 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0014 days
|\|
| * nitpick #91Loek Le Blansch4 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\
| | * make formatWBoerenkamps5 days
| | * added constWBoerenkamps5 days
| | * merge with masterWBoerenkamps5 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps6 days
| | * | removed empty if statementWBoerenkamps6 days
| | * | make formatWBoerenkamps6 days
| | * | camera space workingWBoerenkamps6 days
| * | | merge loek/scriptsLoek Le Blansch4 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch5 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch6 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch6 days
| | * | | | `make format`Loek Le Blansch6 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch6 days
| * | | | | merge masterloek/replayLoek Le Blansch4 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR4 days
| | * | | | | quick changesWBoerenkamps4 days
| | * | | | | make formatJAROWMR5 days
| | * | | | | nan test fixJAROWMR5 days
| | * | | | | updated nanJAROWMR5 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR5 days
| | * | | | | | is_nan fixJAROWMR5 days
| | * | | | | | removed collision testJAROWMR5 days
| | |/ / / / /
| | * | | | | added doxygenJAROWMR5 days
| | * | | | | merge masterJAROWMR5 days
| | |\ \ \ \ \
| | | * | | | | removed adding extra offsetheavydemon215 days
| | | * | | | | removed coutheavydemon215 days
| | | * | | | | make formatheavydemon215 days
| | | * | | | | fixed ( placedmentheavydemon215 days
| | | * | | | | removed absoluut position because file name, renamed functions in sdlcontextheavydemon215 days