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

# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h

2017-11-08 19:10:59 -06:00

..

debugrenderer.cpp

Cleanup for coding style

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

debugrenderer.h

Cleanup for coding style

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

debugshader_fs.glsl

Cleanup copyright information in shaders

2017-07-18 16:24:57 -04:00

debugshader_vs.glsl

Cleanup copyright information in shaders

2017-07-18 16:24:57 -04:00

renderabledebugplane.cpp

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

renderabledebugplane.h

Separate Renderable::initialize into initialize and initializeGL functions

2017-11-02 14:27:35 -04:00