Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

rendering

Merge branch 'master' into feature/NewAtmosphere

2017-10-24 15:30:22 -04:00

rotation

Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"

2017-07-27 00:22:17 -04:00

shaders

Merge branch 'master' into feature/NewAtmosphere

2017-10-24 15:30:22 -04:00

translation

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04: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 documentation work

2017-07-25 23:44:09 -04:00

spacemodule.h

Provide a static member variable Name for all OpenSpaceModules

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