Alexander Bock 1ddde4b6e1 Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management ...

# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/abell/abell.mod
#	data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
#	data/scene/digitaluniverse/constellations/constellations.mod
#	data/scene/digitaluniverse/grids/grids.mod
#	data/scene/digitaluniverse/quasars/quasars.mod
#	data/scene/digitaluniverse/sloandss/sloandss.mod
#	data/scene/digitaluniverse/tully/tully.data
#	data/scene/digitaluniverse/tully/tully.mod
#	data/scene/earth/earth.mod
#	data/scene/grids/grids.mod
#	data/scene/mars/mars.mod
#	data/scene/milkyway/digitaluniverse/digitaluniverse.mod
#	data/scene/moon/moon.mod
#	data/scene/satellites/tle/geo.txt
#	data/scene/satellites/tle/gps-ops.txt
#	data/scene/satellites/tle/stations.txt
#	modules/imgui/src/renderproperties.cpp
#	modules/sync/ext/libtorrent
#	openspace.cfg
#	src/rendering/renderengine.cpp

2017-12-27 19:39:40 +01:00

..

assets

Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management

2017-12-27 19:39:40 +01:00

fonts

Fix for mission visualization

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

scene

Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management

2017-12-27 19:39:40 +01:00

tasks

Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder

2017-12-26 20:13:23 +01:00

web

Add SceneLicense information to the Scene

2017-10-23 18:11:09 -07: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

Fix size of the logo on the loading screen

2017-12-26 17:20:06 +01:00

placeholder.png

Support loading of .asset and .scene files

2017-12-23 08:08:12 +01: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