aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* fix merge conflictheavydemon2137 hours
* Merge branch 'master' into niels/UIheavydemon2137 hours
|\
| * Merge branch 'master' into niels/rendering_fixesLoek Le Blansch37 hours
| |\
| | * Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepeLoek Le Blansch42 hours
| | |\
| | | * make formatWBoerenkamps3 days
| | | * feedbackWBoerenkamps3 days
| | | * added max buttonsWBoerenkamps3 days
| | | * added missing doxygenWBoerenkamps3 days
| | | * removed ;WBoerenkamps3 days
| | | * removed api/WBoerenkamps3 days
| | | * removed metadata headerWBoerenkamps3 days
| | | * make formatWBoerenkamps3 days
| | | * button improvementsWBoerenkamps3 days
| | | * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps3 days
| | | |\
| | | * | startWBoerenkamps4 days
| | | * | Merge branch 'wouter/inputSystem' into wouter/button-improvementWBoerenkamps4 days
| | | |\ \
| | * | \ \ Merge branch 'loek/audio'Loek Le Blansch2 days
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' into loek/audioloek/audioLoek Le Blansch3 days
| | | |\ \ \ \
| | | * | | | | restore examplesLoek Le Blansch3 days
| | | * | | | | add test + fix audio crashLoek Le Blansch3 days
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch3 days
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch 'master' into loek/savemgrloek/savemgrLoek Le Blansch3 days
| | | |\| | |
| | | * | | | Merge branch 'master' into loek/savemgrLoek Le Blansch3 days
| | | |\ \ \ \
| | | * | | | | `make format`Loek Le Blansch6 days
| | | * | | | | move DB fix from `loek/doxygen` to `loek/savemgr`Loek Le Blansch6 days
| | * | | | | | fix ScriptSystem delta timeLoek Le Blansch3 days
| | * | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch3 days
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | process feedbackLoek Le Blansch3 days
| | * | | | | | merge masterLoek Le Blansch4 days
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into loek/scriptsLoek Le Blansch7 days
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch7 days
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:lonkaars/crepe into loek/scriptsLoek Le Blansch7 days
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | `make format`Loek Le Blansch7 days
| | * | | | | | | | | update testsLoek Le Blansch7 days
| | * | | | | | | | | add timer functionality to scriptLoek Le Blansch7 days
| * | | | | | | | | | 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 thatheavydemon2142 hours
* | | | | | | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon212 days
* | | | | | | | | | added transform scale and rotation in the drawing text componentheavydemon213 days
* | | | | | | | | | implemented feedbackheavydemon213 days
* | | | | | | | | | merged masterheavydemon213 days
* | | | | | | | | | Merge branch 'master' into niels/UIheavydemon213 days
|\| | | | | | | | |
| * | | | | | | | | `make format`Loek Le Blansch3 days
| * | | | | | | | | fix tests + nitpick #77Loek Le Blansch3 days
| * | | | | | | | | make formatWBoerenkamps3 days
| * | | | | | | | | feedback changesWBoerenkamps3 days
| * | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps4 days
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | small changesWBoerenkamps4 days