Alexander Bock 88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp

2017-11-09 10:51:56 -05:00

..

rendering

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 10:51:56 -05:00

CMakeLists.txt

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

debuggingmodule.cpp

More work on documentation

2017-07-25 18:06:55 -04:00

debuggingmodule.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

include.cmake

Add debugging module with RenderableDebugPlane, closing #56

2016-05-16 14:50:48 +02:00