Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing ...

* Resolve conflicts

2021-03-02 15:49:39 +01:00

..

customization

fixed globebrowsing customiztion asset

2021-01-25 15:30:11 -05:00

examples

Fix forgotten rename from 'Size' to 'Radius'

2021-02-23 10:50:35 +01:00

global

update start dates for modis earth layers; fix bookmarks asset

2020-02-11 18:54:16 -05:00

gui

Feature/gui for touch (#967)

2019-09-18 23:49:51 +02:00

scene

Merge branch 'master' into feature/multitexturing

2021-03-02 15:49:39 +01:00

spice

Some more cleanup of empty lines

2020-10-10 12:50:38 +02:00

sync

Replace request and requestAll with require and requireAll

2020-08-18 00:19:01 +02:00

util

Merge branch 'master' into feature/multitexturing

2021-03-02 15:49:39 +01:00

base_blank.asset

fix for globebrowing order, adding new mars hirise layer

2020-10-13 21:53:49 -04:00

base.asset

Merge pull request #1468 from OpenSpace/issue/1438

2021-02-03 08:39:12 +01:00