Alexander Bock 96b775d939 Merge branch 'master' into feature/profiles ...

# Conflicts:
#	data/assets/asteroids.scene

2020-07-07 12:59:52 +02:00

..

assets

Merge branch 'master' into feature/profiles

2020-07-07 12:59:52 +02:00

fonts

…

profiles

Cleaning up the profile files

2020-06-22 18:47:28 +02:00

tasks

Initial pass of merging satellite debris into master and switching satellites to use grouped scenegraphnodes.

2019-08-13 15:39:06 -06:00

web

fix template and writer for scene license info

2020-05-12 16:55:35 -04:00

globebrowsing_servers.lua

Remove LMMP globebrowsing server to increase resilience

2018-11-01 10:25:45 -04:00

ionosphere_variables.json

…

openspace-icon.png

Add missing icon file

2019-05-17 17:29:36 -06: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

…

test3.jpg

…