Alexander Bock cdac4942b6 Merge branch 'master' into feature/tileproviders ...

# Conflicts:
#	ext/ghoul
#	modules/globebrowsing/src/tileprovider.cpp
#	modules/globebrowsing/src/tileprovider.h

2022-01-01 12:34:42 +01:00

..

assets

Merge branch 'master' into feature/tileproviders

2022-01-01 12:34:42 +01: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

Feature/assets (#1784)

2021-12-19 18:04:01 +01:00

tasks

Feature/assets (#1784)

2021-12-19 18:04:01 +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

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

…

test2.jpg

…

test3.jpg

…