aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'master' into loek/scriptsLoek Le Blansch21 hours
|\
| * Adjusted test according to changes in Scene and SceneManagermax-00121 hours
| * Merge remote-tracking branch 'origin/master' into max/doxygenmax-00121 hours
| |\
| * | Improved examplemax-00121 hours
| * | Added constmax-00121 hours
| * | Added Doxygenmax-00121 hours
| * | Added SceneManger to LoopManagermax-00122 hours
| * | Deleted commamax-00122 hours
| * | Changed commentmax-00122 hours
| * | Added TODOmax-00122 hours
| * | Replaced Scene's name variable with get_name() methodmax-00122 hours
| * | Added Doxygen comments/explanation for GameObjects and Scenesmax-00143 hours
* | | pull script/event changes from `loek/collision-system`Loek Le Blansch21 hours
* | | add Script::subscribeLoek Le Blansch32 hours
* | | Merge branch 'master' into loek/scriptsLoek Le Blansch33 hours
|\ \ \ | | |/ | |/|
| * | fix doxygen comments on keycodesLoek Le Blansch33 hours
| * | nitpick #34Loek Le Blansch33 hours
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/eventsWBoerenkamps34 hours
| |\ \
| | * | nitpick #31Loek Le Blansch34 hours
| | * | merge #31Loek Le Blansch35 hours
| | |\ \
| | | * | make formatheavydemon2135 hours
| | | * | fixed compile warning and tested the prerequisite that user needs to set expl...heavydemon2135 hours
| | | * | Merge branch 'master' into niels/RenderingParticleheavydemon2135 hours
| | | |\ \
| | | * | | implemented feedbackheavydemon2135 hours
| | | * | | Merge branch 'master' into niels/RenderingParticleheavydemon2139 hours
| | | |\ \ \
| | | * | | | fixed the reference bug in render particle, it was in the example problemheavydemon2139 hours
| | | * | | | rendering system bugheavydemon2140 hours
| | | * | | | Merge branch 'master' into niels/RenderingParticleheavydemon2140 hours
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' into niels/RenderingParticleheavydemon2140 hours
| | | |\ \ \ \ \
| | | * | | | | | fixxed bug with particleemiiter and sprite in single componentheavydemon2140 hours
| | | * | | | | | implemented feedbackheavydemon2141 hours
| | | * | | | | | implementing feedbackheavydemon2141 hours
| | | * | | | | | updated adjsuted rendering based on feedbackheavydemon2143 hours
| | | * | | | | | adjusted so that all gets are autoheavydemon213 days
| | | * | | | | | merged masterheavydemon214 days
| | | * | | | | | Merge remote-tracking branch 'origin/master' into niels/RenderingParticleheavydemon214 days
| | | |\ \ \ \ \ \
| | | * | | | | | | exampleheavydemon217 days
| | | * | | | | | | adjusted based on feedback of PR#31heavydemon217 days
| | | * | | | | | | forget a doxygen docs on a functionheavydemon218 days
| | | * | | | | | | Merge branch 'master' into niels/RenderingParticleheavydemon218 days
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into niels/RenderingParticleheavydemon219 days
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | makefileheavydemon219 days
| | | * | | | | | | | | Adjusted rendering so that now a gameobject can have multiple sprites with pa...heavydemon219 days
| | | * | | | | | | | | adjusted renderingsystemheavydemon2110 days
| | | * | | | | | | | | adjusted rendering and exampleheavydemon2110 days
| | | * | | | | | | | | rendering particleheavydemon2110 days
| | | * | | | | | | | | Merge branch 'jaro/particle-system-master' into niels/RenderingParticleheavydemon2110 days
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | adjusted render a little and added a error img of the chosen img did not load...heavydemon2110 days
| | * | | | | | | | | | | Merge branch 'loek/unit-test' of github.com:lonkaars/crepeLoek Le Blansch35 hours
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | * | | | | | | | | | convert more examples to unit testsLoek Le Blansch38 hours