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

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

2017-11-09 10:51:56 -05: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-09 10:51:56 -05:00

renderabledebugplane.h

Separate Renderable::initialize into initialize and initializeGL functions

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