Alexander Bock d1cdc3d26f Merge branch 'master' into feature/PerformanceATM ...

# Conflicts:
#	data/assets/default.scene
#	data/assets/scene/solarsystem/planets/earth/earth.asset

2018-03-14 23:26:56 -04:00

..

assets

Merge branch 'master' into feature/PerformanceATM

2018-03-14 23:26:56 -04:00

fonts

Fix for mission visualization

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

tasks

Move VRT specification into separate customization asset

2017-12-31 22:13:55 -05:00

web

One Property Tree (#500)

2018-03-06 16:59:06 +01: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