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

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

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

..

modelgeometry.cpp

More coding style fixes

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

modelgeometry.h

Cleanup for coding style

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

multimodelgeometry.cpp

Cleanup for coding style

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

multimodelgeometry.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

renderablemodel.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderablemodel.h

Separate Renderable::initialize into initialize and initializeGL functions

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

renderableplane.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderableplane.h

Separate Renderable::initialize into initialize and initializeGL functions

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

renderablesphere.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderablesphere.h

Separate Renderable::initialize into initialize and initializeGL functions

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

renderablesphericalgrid.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderablesphericalgrid.h

Separate Renderable::initialize into initialize and initializeGL functions

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

renderabletrail.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderabletrail.h

Merge branch 'master' into feature/loadingscreen-refactor

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

renderabletrailorbit.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderabletrailorbit.h

Cleanup for coding style

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

renderabletrailtrajectory.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

renderabletrailtrajectory.h

Merge branch 'master' into feature/loadingscreen-refactor

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

screenspaceframebuffer.cpp

Merge branch 'master' into feature/loadingscreen-refactor

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

screenspaceframebuffer.h

Merge branch 'master' into feature/loadingscreen-refactor

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

screenspaceimagelocal.cpp

More coding style fixes

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

screenspaceimagelocal.h

Cleanup for coding style

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

screenspaceimageonline.cpp

More coding style fixes

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

screenspaceimageonline.h

Cleanup for coding style

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

wavefrontgeometry.cpp

More coding style fixes

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

wavefrontgeometry.h

Updated check_style_guide to test for include guards and copyright

2017-02-09 23:55:39 -05:00