| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | * | | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe ↵ | JAROWMR | 3 days | |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling | |||
| | | | | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | max-001 | 4 days | |
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jaro/collision-system-handeling | |||
| | | | * | | | | | | | | updating collision system | JAROWMR | 3 days | |
| | | | |/ / / / / / / | ||||
| | | | * | | | | | | | pulled api change | JAROWMR | 5 days | |
| | | | |\ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | make format | JAROWMR | 5 days | |
| | | | | | | | | | | | | ||||
| | | | * | | | | | | | | updated particle | JAROWMR | 5 days | |
| | | | | | | | | | | | | ||||
| | | | * | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ↵ | JAROWMR | 5 days | |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling | |||
| | | | * | | | | | | | | | Added util for position | JAROWMR | 5 days | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | removed rigidbody offset | JAROWMR | 5 days | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | scale collider by transform | JAROWMR | 5 days | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | added dynamic bounce | JAROWMR | 5 days | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | added collision features | JAROWMR | 5 days | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | update contributing.md | Loek Le Blansch | 40 hours | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | update contributing.md | Loek Le Blansch | 40 hours | |
| | | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||
| | | * | | | | | | | | | Merge pull request #86 from lonkaars/niels/UI | heavydemon21 | 44 hours | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Text rendering | |||
| | | | * | | | | | | | | | removed adding extra offset | heavydemon21 | 44 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | removed cout | heavydemon21 | 44 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | make format | heavydemon21 | 45 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | fixed ( placedment | heavydemon21 | 45 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | removed absoluut position because file name, renamed functions in sdlcontext | heavydemon21 | 45 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | checkout jaro collision handlening branch | heavydemon21 | 45 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | adjusted tm naming --> transform and adjusted doxygen comments | heavydemon21 | 46 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | make format | heavydemon21 | 46 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | fix merge conflict | heavydemon21 | 46 hours | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Merge branch 'master' into niels/UI | heavydemon21 | 46 hours | |
| | | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||
| | | * | | | | | | | | | | Merge branch 'master' into niels/rendering_fixes | Loek Le Blansch | 47 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 | |
| | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coordinates are in camera_space or world_sapce | |||
| | | | | * | | | | | | | | removed absolute position because jaro is adjusting that | heavydemon21 | 2 days | |
| | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan ↵ | heavydemon21 | 3 days | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | het overleggen dus er die werkt niet goed | |||
| | | | | * | | | | | | | | added transform scale and rotation in the drawing text component | heavydemon21 | 3 days | |
| | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | implemented feedback | heavydemon21 | 4 days | |
| | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | Merge branch 'master' into niels/UI | heavydemon21 | 4 days | |
| | | | | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||
| | | | | * | | | | | | | | merged master | heavydemon21 | 4 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 ↵ | heavydemon21 | 4 days | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adjustemetns for merging | |||
| | | | | * | | | | | | | | | Merge branch 'master' into niels/UI | heavydemon21 | 4 days | |
| | | | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | revered to master | heavydemon21 | 4 days | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | adjusted comments | 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 | |
| | | | | | | | | | | | | | | | | | | ||||