Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into max/game | max-001 | 21 hours |
|\ | |||
| * | merge loek/scripts | Loek Le Blansch | 22 hours |
| |\ | |||
| | * | `make format` | Loek Le Blansch | 3 days |
| * | | merge masterloek/replay | Loek Le Blansch | 22 hours |
| |\ \ | |||
| | * | | fixes | JAROWMR | 23 hours |
| | * | | make format | JAROWMR | 37 hours |
| | * | | removed adding extra offset | heavydemon21 | 41 hours |
| | * | | removed cout | heavydemon21 | 41 hours |
| | * | | make format | heavydemon21 | 41 hours |
| | * | | fixed ( placedment | heavydemon21 | 41 hours |
| | * | | removed absoluut position because file name, renamed functions in sdlcontext | heavydemon21 | 42 hours |
| | * | | Merge branch 'master' into niels/UI | heavydemon21 | 43 hours |
| | |\ \ | |||
| | | * \ | Merge branch 'master' into niels/rendering_fixes | Loek Le Blansch | 43 hours |
| | | |\ \ | |||
| | | * | | | implemented wouter feedback | heavydemon21 | 3 days |
| | | * | | | make format | heavydemon21 | 3 days |
| | | * | | | added particle begin lifespan rendering, added world_space to sprite so that ... | heavydemon21 | 3 days |
| | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan he... | heavydemon21 | 3 days |
| | * | | | | added transform scale and rotation in the drawing text component | heavydemon21 | 3 days |
| | * | | | | implemented feedback | heavydemon21 | 3 days |
| | * | | | | Merge branch 'master' into niels/UI | heavydemon21 | 4 days |
| | |\| | | | |||
| | * | | | | Merge branch 'master' into niels/UI | heavydemon21 | 4 days |
| | |\ \ \ \ | |||
| | * | | | | | make format | heavydemon21 | 4 days |
| | * | | | | | config will be checout with master once PR#77 is merged, and sdlcontext adjus... | heavydemon21 | 4 days |
| | * | | | | | Merge branch 'master' into niels/UI | heavydemon21 | 4 days |
| | |\ \ \ \ \ | |||
| | * | | | | | | finalized text rendering | heavydemon21 | 4 days |
| | * | | | | | | make format | heavydemon21 | 4 days |
| | * | | | | | | workig rending text | heavydemon21 | 4 days |
| | * | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 4 days |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | merging wouter | heavydemon21 | 4 days |
| | * | | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 4 days |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | tmp fix | heavydemon21 | 4 days |
| | * | | | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 4 days |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | idk | heavydemon21 | 4 days |
| | * | | | | | | | | | fonting | heavydemon21 | 4 days |
| * | | | | | | | | | | fix header ordering | Loek Le Blansch | 43 hours |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'master' into loek/replay | Loek Le Blansch | 3 days |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | * | | | | | | | | Merge branch 'master' into loek/savemgrloek/savemgr | Loek Le Blansch | 3 days |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||
| | * | | | | | | | | Merge branch 'master' into loek/savemgr | Loek Le Blansch | 4 days |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||
| | * | | | | | | | | `make format` | Loek Le Blansch | 7 days |
| | * | | | | | | | | move DB fix from `loek/doxygen` to `loek/savemgr` | Loek Le Blansch | 7 days |
| * | | | | | | | | | merge master | Loek Le Blansch | 3 days |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | `make format` | Loek Le Blansch | 4 days |
| | * | | | | | | | | fix tests + nitpick #77 | Loek Le Blansch | 4 days |
| | * | | | | | | | | make format | WBoerenkamps | 4 days |
| | * | | | | | | | | feedback changes | WBoerenkamps | 4 days |
| | * | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c... | WBoerenkamps | 4 days |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||
| | * | | | | | | | | small changes | WBoerenkamps | 4 days |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||
| | * | | | | | | | final changes | WBoerenkamps | 4 days |
| | * | | | | | | | last changes | WBoerenkamps | 4 days |
| | | |_|_|_|/ / | | |/| | | | | | |||
| | * | | | | | | removed iostream | WBoerenkamps | 4 days |