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

..

fonts

Fix for mission visualization

2017-10-16 16:27:32 -04:00

scene

Update Digital Universe stars

2017-11-04 09:45:10 -04:00

spice

changes from PR comments

2017-07-13 20:10:35 -06:00

tasks

Some minor cleanup

2017-03-05 20:08:24 -05:00

web

Add SceneLicense information to the Scene

2017-10-23 18:11:09 -07:00

cdflist.json

windows fix

2016-05-25 14:06:15 -04:00

cdflist.txt

Load cdf files at start up

2016-05-24 14:42:38 -04:00

globebrowsing_servers.lua

Feature/gb gui (#390)

2017-08-19 20:23:08 -04:00

ionosphere_variables.json

Ionosphere test data

2016-05-13 15:22:50 -04:00

openspace-logo.png

More work on loading screen

2017-11-03 14:06:51 -04:00

test2.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00

test3.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00