aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into max/gamemax-0013 days
|\
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch3 days
| |\
| | * make formatWBoerenkamps3 days
| | * merge with masterWBoerenkamps4 days
| | |\
| | * | camera space workingWBoerenkamps5 days
| * | | merge loek/scriptsLoek Le Blansch3 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch4 days
| | |\ \ \
| | * | | | `make format`Loek Le Blansch5 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch5 days
| * | | | | merge masterloek/replayLoek Le Blansch3 days
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | make formatJAROWMR3 days
| | * | | | updated nanJAROWMR3 days
| | |\ \ \ \
| | | * | | | make formatJAROWMR3 days
| | * | | | | is_nan fixJAROWMR3 days
| | |/ / / /
| | * | | | merge masterJAROWMR3 days
| | |\ \ \ \
| | | * | | | make formatheavydemon214 days
| | | * | | | Merge branch 'master' into niels/UIheavydemon214 days
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch4 days
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | * | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon215 days
| | | | | |_|/ | | | | |/| |
| | | * | | | implemented feedbackheavydemon215 days
| | | * | | | merged masterheavydemon216 days
| | | * | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\| | |
| | | * | | | config will be checout with master once PR#77 is merged, and sdlcontext adjus...heavydemon216 days
| | | * | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\ \ \ \
| | | * | | | | revered to masterheavydemon216 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | idkheavydemon216 days
| | | * | | | | | | | | fontingheavydemon216 days
| | * | | | | | | | | | updated coments and reverted test cmakeJAROWMR3 days
| | * | | | | | | | | | improved doxygenJAROWMR3 days
| | * | | | | | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe i...JAROWMR4 days
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into jaro/collision-system-hande...max-0016 days
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | * | / | | | | | | | | updating collision systemJAROWMR4 days
| | |/ / / / / / / / / /
| | * | | | | | | | | | pulled api changeJAROWMR6 days
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ...JAROWMR6 days
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | removed rigidbody offsetJAROWMR6 days
| | * | | | | | | | | | | | added collision featuresJAROWMR7 days
| * | | | | | | | | | | | | merge masterLoek Le Blansch4 days
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepeLoek Le Blansch4 days
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | feedbackWBoerenkamps5 days
| | | * | | | | | | | | | | added max buttonsWBoerenkamps5 days
| | | * | | | | | | | | | | removed api/WBoerenkamps5 days
| | | * | | | | | | | | | | removed metadata headerWBoerenkamps5 days
| | | * | | | | | | | | | | make formatWBoerenkamps5 days
| | | * | | | | | | | | | | button improvementsWBoerenkamps5 days
| | | * | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps5 days
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | startWBoerenkamps6 days