aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fix merge conflictheavydemon216 days
* Merge branch 'master' into niels/UIheavydemon216 days
|\
| * Merge branch 'master' into niels/rendering_fixesLoek Le Blansch6 days
| |\
| | * update .gitignoreLoek Le Blansch6 days
| | * Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepeLoek Le Blansch6 days
| | |\
| | | * make formatWBoerenkamps7 days
| | | * feedbackWBoerenkamps7 days
| | | * added max buttonsWBoerenkamps7 days
| | | * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps7 days
| | | |\
| | | * | added missing doxygenWBoerenkamps7 days
| | | * | removed ;WBoerenkamps7 days
| | | * | removed api/WBoerenkamps7 days
| | | * | removed metadata headerWBoerenkamps7 days
| | | * | make formatWBoerenkamps7 days
| | | * | button improvementsWBoerenkamps7 days
| | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps7 days
| | | |\ \
| | | * | | startWBoerenkamps8 days
| | | * | | Merge branch 'wouter/inputSystem' into wouter/button-improvementWBoerenkamps8 days
| | | |\ \ \
| | * | \ \ \ Merge branch 'loek/audio'Loek Le Blansch6 days
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into loek/audioloek/audioLoek Le Blansch7 days
| | | |\ \ \ \ \
| | | * | | | | | restore examplesLoek Le Blansch7 days
| | | * | | | | | add test + fix audio crashLoek Le Blansch7 days
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch7 days
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'master' into loek/savemgrloek/savemgrLoek Le Blansch7 days
| | | |\| | | |
| | | * | | | | Merge branch 'master' into loek/savemgrLoek Le Blansch8 days
| | | |\ \ \ \ \
| | | * | | | | | `make format`Loek Le Blansch11 days
| | | * | | | | | move DB fix from `loek/doxygen` to `loek/savemgr`Loek Le Blansch11 days
| | * | | | | | | fix ScriptSystem delta timeLoek Le Blansch7 days
| | * | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch7 days
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | process feedbackLoek Le Blansch7 days
| | * | | | | | | merge masterLoek Le Blansch8 days
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into loek/scriptsLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:lonkaars/crepe into loek/scriptsLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | `make format`Loek Le Blansch11 days
| | * | | | | | | | | | update testsLoek Le Blansch11 days
| | * | | | | | | | | | add timer functionality to scriptLoek Le Blansch12 days
| * | | | | | | | | | | implemented wouter feedbackheavydemon217 days
| * | | | | | | | | | | make formatheavydemon217 days
| * | | | | | | | | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon217 days
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | removed absolute position because jaro is adjusting thatheavydemon216 days
* | | | | | | | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon216 days
* | | | | | | | | | | added transform scale and rotation in the drawing text componentheavydemon217 days
* | | | | | | | | | | implemented feedbackheavydemon217 days
* | | | | | | | | | | Merge branch 'master' into niels/UIheavydemon217 days
|\| | | | | | | | | |
| * | | | | | | | | | update contributing.mdLoek Le Blansch7 days
| * | | | | | | | | | update librariesLoek Le Blansch7 days
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | merged masterheavydemon218 days
* | | | | | | | | | Merge branch 'master' into niels/UIheavydemon218 days
|\| | | | | | | | |
| * | | | | | | | | `make format`Loek Le Blansch8 days