sylvass 0e548b4a1b Merge branch 'master' into thesis/2021/skybrowser ...

# Conflicts:
#	data/assets/util/webgui.asset
#	modules/webbrowser/src/screenspacebrowser.cpp
#	src/rendering/renderengine.cpp

2021-11-30 10:47:46 -05:00

..

assets

Merge branch 'master' into thesis/2021/skybrowser

2021-11-30 10:47:46 -05:00

colors

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

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

fonts

…

profiles

Merge branch 'master' into feature/animation-fixes

2021-10-25 10:51:13 +02:00

tasks

Add script to download the expolanets dataset for the dataprep task

2021-11-15 13:44:57 +01:00

web

Fix broken referencing links in documentation

2021-06-02 11:26:19 +02:00

globebrowsing_servers.lua

Merge master into jwst branch

2021-05-03 10:03:50 +02:00

ionosphere_variables.json

…

openspace-horiz-logo-crop.png

Add a cropped version of the OpenSpace logo

2021-07-19 14:01:14 +02:00

openspace-horiz-logo.png

Initial working launcher without profile code access yet

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

openspace-icon.png

…

openspace-logo.png

…

placeholder.png

…

test2.jpg

…

test3.jpg

…