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

..

customization

fix for globebrowing order, adding new mars hirise layer

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

examples

Expanded the module to include luminosity and velocity data

2020-10-13 11:41:13 +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

fix Kerberos trail name

2020-10-13 22:04:54 -04: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

launcher label and profile fixes

2020-10-13 12:42:10 -04:00

base_blank.asset

fix for globebrowing order, adding new mars hirise layer

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

base.asset

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

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