Malin Ejdbo 16bd1d3265 Merge branch 'master' into feature/model-animation ...

* Resolve conflicts

* Master has error with changing focus

2021-04-21 10:23:10 +02:00

..

customization

fixed globebrowsing customiztion asset

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

dashboard

Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items

2021-03-24 09:57:27 +01:00

examples

Fix an issue that prevented the spheres from being rendered

2021-04-16 17:24:41 +02: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/model-animation

2021-04-21 10:23:10 +02: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

Feature/strict lua (#1556)

2021-04-15 13:01:00 +02:00

base_blank.asset

Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items

2021-03-24 09:57:27 +01:00

base.asset

Merge pull request #1468 from OpenSpace/issue/1438

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