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

rotation

Cleanup for coding style

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

shaders

Remove unused shaders

2017-10-24 03:35:41 -07:00

translation

More coding style fixes

2017-11-08 21:36:06 -06:00

CMakeLists.txt

Feature/cmake cleanup (#381)

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

include.cmake

Separate base module into base and space

2016-12-13 14:43:44 +01:00

spacemodule.cpp

More coding style fixes

2017-11-08 21:36:06 -06:00

spacemodule.h

Provide a static member variable Name for all OpenSpaceModules

2017-07-12 13:59:16 -04:00