Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into loek/scripts | Loek Le Blansch | 4 days |
|\ | |||
| * | make format | WBoerenkamps | 5 days |
| * | feedback changes | WBoerenkamps | 5 days |
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c... | WBoerenkamps | 5 days |
| |\ | |||
| * | | small changes | WBoerenkamps | 5 days |
| * | | readded const and used emplace instead | WBoerenkamps | 5 days |
| * | | final changes | WBoerenkamps | 5 days |
| * | | testing something | WBoerenkamps | 5 days |
| * | | text now working with optional | WBoerenkamps | 5 days |
| * | | make format | WBoerenkamps | 6 days |
| * | | segmentation fault fixed | WBoerenkamps | 6 days |
| * | | very illegal commit do not push | WBoerenkamps | 6 days |
| * | | added const | WBoerenkamps | 6 days |
| * | | retrieving font with resource manager added | WBoerenkamps | 6 days |
| * | | make format | WBoerenkamps | 6 days |
| * | | font family implemented in the text component | WBoerenkamps | 6 days |
| * | | make format | WBoerenkamps | 8 days |
| * | | feedback changes | WBoerenkamps | 8 days |
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c... | WBoerenkamps | 8 days |
| |\ \ | |||
| * | | | sdl_ttf to submodules + feedback changes | WBoerenkamps | 8 days |
| * | | | added small check to the example | WBoerenkamps | 10 days |
| * | | | make format | WBoerenkamps | 10 days |
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c... | WBoerenkamps | 10 days |
| |\ \ \ | |||
| * | | | | font working | WBoerenkamps | 10 days |
| * | | | | load font almost working | WBoerenkamps | 10 days |
| * | | | | text component pretty much finished | WBoerenkamps | 11 days |
| * | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c... | WBoerenkamps | 11 days |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c... | WBoerenkamps | 11 days |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | font progress | WBoerenkamps | 12 days |
| |\ \ \ \ \ \ | |||
| * | | | | | | | font progress | WBoerenkamps | 12 days |
* | | | | | | | | process feedback | Loek Le Blansch | 4 days |
| |_|_|_|_|_|/ |/| | | | | | | |||
* | | | | | | | Merge branch 'wouter/inputSystem' of github.com:lonkaars/crepe | Loek Le Blansch | 5 days |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | removed large comment | WBoerenkamps | 8 days |
| * | | | | | | | make format | WBoerenkamps | 8 days |
| * | | | | | | | keyboard state working | WBoerenkamps | 8 days |
| * | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS... | WBoerenkamps | 8 days |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||
| * | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS... | WBoerenkamps | 9 days |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||
| * | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS... | WBoerenkamps | 10 days |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | get_keyboard_state working | WBoerenkamps | 13 days |
* | | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe | Loek Le Blansch | 5 days |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | fixed bug with lower than one particle per second | JAROWMR | 8 days |
| * | | | | | | | | | updated test and game.cpp | JAROWMR | 8 days |
| * | | | | | | | | | fixed game example | JAROWMR | 8 days |
| * | | | | | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/particle-system-... | JAROWMR | 8 days |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||
| * | | | | | | | | | make format | JAROWMR | 9 days |
| * | | | | | | | | | updated particle emitter | JAROWMR | 10 days |
| | |_|_|/ / / / / | |/| | | | | | | | |||
* | | | | | | | | | make format | JAROWMR | 8 days |
* | | | | | | | | | used add force in game.cpp | JAROWMR | 8 days |
* | | | | | | | | | updated api and game | JAROWMR | 8 days |
| |/ / / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge branch 'jaro/collision-system' of github.com:lonkaars/crepe | Loek Le Blansch | 8 days |
|\ \ \ \ \ \ \ \ |