aniisaaden 6ee0d1337f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration ...

# Conflicts:
#	data/assets/base.asset

2020-10-15 15:18:51 +02:00

..

assets

Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration

2020-10-15 15:18:51 +02:00

colors

added orion nebula asset from DU, updated licence template to better support whitespace

2020-09-10 17:46:48 -04:00

fonts

Fix for mission visualization

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

profiles

adding back default times to profiles

2020-10-13 22:03:26 -04:00

tasks

Resolve merge conflict

2020-10-12 09:30:51 +02:00

web

du asset meta update

2020-10-01 17:56:12 -04:00

globebrowsing_servers.lua

Remove LMMP globebrowsing server to increase resilience

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

ionosphere_variables.json

…

openspace-horiz-logo.png

Initial working launcher without profile code access yet

2020-08-28 12:00:57 -06:00

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

…