Alexander Bock
|
7e4bb0b2c6
|
Merge branch 'master' into feature/loadingscreen-refactor
|
2017-11-09 22:49:07 -06:00 |
|
Alexander Bock
|
afa1d6d33e
|
Add strict test for whitespace at end of line
More work on coding style
|
2017-11-09 23:47:51 -05:00 |
|
Alexander Bock
|
88cf7926ae
|
Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
# modules/galaxy/rendering/renderablegalaxy.cpp
|
2017-11-09 10:51:56 -05:00 |
|
Alexander Bock
|
8866a13ff6
|
More coding style fixes
|
2017-11-08 21:36:06 -06:00 |
|
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 |
|
Alexander Bock
|
b50b52d351
|
Cleanup for coding style
Add strict mode to check_style_guide script
|
2017-11-08 10:35:39 -06:00 |
|
Alexander Bock
|
78e3320cde
|
Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
|
2017-11-02 14:27:35 -04:00 |
|
Alexander Bock
|
f57feb01d3
|
Fix meridian shift issue on Pluto
Easier configuration of Pluto image textures from within the scene file
|
2017-08-21 13:53:05 -04:00 |
|
Alexander Bock
|
4513c4e1e2
|
Runtime fix for SpacecraftInstruments module
|
2017-08-16 09:10:03 -04:00 |
|
Alexander Bock
|
dcd1196341
|
Rename NewHorizons module to SpacecraftInstruments
|
2017-08-14 13:27:47 -04:00 |
|