aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into max/gamemax-0015 days
|\
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\
| | * make formatWBoerenkamps6 days
| | * merge with masterWBoerenkamps6 days
| | |\
| | * | camera space workingWBoerenkamps7 days
| * | | merge loek/scriptsLoek Le Blansch5 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch6 days
| | |\ \ \
| | * | | | `make format`Loek Le Blansch7 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch7 days
| * | | | | merge masterloek/replayLoek Le Blansch5 days
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | make formatJAROWMR6 days
| | * | | | updated nanJAROWMR6 days
| | |\ \ \ \
| | | * | | | make formatJAROWMR6 days
| | * | | | | is_nan fixJAROWMR6 days
| | |/ / / /
| | * | | | merge masterJAROWMR6 days
| | |\ \ \ \
| | | * | | | make formatheavydemon216 days
| | | * | | | Merge branch 'master' into niels/UIheavydemon216 days
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' into niels/rendering_fixesLoek Le Blansch6 days
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | * | | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon217 days
| | | | | |_|/ | | | | |/| |
| | | * | | | implemented feedbackheavydemon218 days
| | | * | | | merged masterheavydemon218 days
| | | * | | | Merge branch 'master' into niels/UIheavydemon218 days
| | | |\| | |
| | | * | | | config will be checout with master once PR#77 is merged, and sdlcontext adjus...heavydemon218 days
| | | * | | | Merge branch 'master' into niels/UIheavydemon218 days
| | | |\ \ \ \
| | | * | | | | revered to masterheavydemon218 days
| | | * | | | | Merge branch 'master' into niels/UIheavydemon218 days
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | idkheavydemon218 days
| | | * | | | | | | | | fontingheavydemon219 days
| | * | | | | | | | | | updated coments and reverted test cmakeJAROWMR6 days
| | * | | | | | | | | | improved doxygenJAROWMR6 days
| | * | | | | | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe i...JAROWMR7 days
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into jaro/collision-system-hande...max-0018 days
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | * | / | | | | | | | | updating collision systemJAROWMR7 days
| | |/ / / / / / / / / /
| | * | | | | | | | | | pulled api changeJAROWMR9 days
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ...JAROWMR9 days
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | removed rigidbody offsetJAROWMR9 days
| | * | | | | | | | | | | | added collision featuresJAROWMR9 days
| * | | | | | | | | | | | | merge masterLoek Le Blansch6 days
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepeLoek Le Blansch6 days
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | feedbackWBoerenkamps8 days
| | | * | | | | | | | | | | added max buttonsWBoerenkamps8 days
| | | * | | | | | | | | | | removed api/WBoerenkamps8 days
| | | * | | | | | | | | | | removed metadata headerWBoerenkamps8 days
| | | * | | | | | | | | | | make formatWBoerenkamps8 days
| | | * | | | | | | | | | | button improvementsWBoerenkamps8 days
| | | * | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps8 days
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | startWBoerenkamps8 days