Alexander Bock d6bdc2519e Merge remote-tracking branch 'origin/master' into feature/RingShadows ...

# Conflicts:
#	data/assets/scene/solarsystem/planets/saturn/saturn.asset

2019-12-16 11:09:47 +01:00

..

customization

Feature/gui for touch (#967)

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

examples

Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes

2019-08-13 09:56:51 -06:00

gui

Feature/gui for touch (#967)

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

scene

Merge remote-tracking branch 'origin/master' into feature/RingShadows

2019-12-16 11:09:47 +01:00

spice

Fix size of the logo on the loading screen

2017-12-26 17:20:06 +01:00

sync

Move VRT specification into separate customization asset

2017-12-31 22:13:55 -05:00

util

Update frontend hash

2019-12-09 18:01:59 +01:00

apollo8.scene

Merging Master

2019-07-22 16:47:58 -04:00

apollo_sites.scene

updated rotation values for a11 lem

2019-09-17 14:33:01 -04:00

base_profile.asset

added lua function for saving change to profile; added empty base for profile; updated frontend hash;

2019-09-05 14:57:01 -04:00

base.asset

Make a defaut keybind for toggling the labels

2019-12-16 10:38:10 +01:00

dawn.scene

Merging Master

2019-07-22 16:47:58 -04:00

default_full.scene

Various updates and fixes to scene and assets

2017-12-31 17:26:46 -05:00

default.scene

Merge remote-tracking branch 'origin/master' into feature/RingShadows

2019-12-16 11:09:47 +01:00

gaia.scene

Merging Master

2019-07-22 16:47:58 -04:00

insight.scene

Merging Master

2019-07-22 16:47:58 -04:00

juno.scene

Merging Master

2019-07-22 16:47:58 -04:00

messenger.scene

Merging Master

2019-07-22 16:47:58 -04:00

newhorizons.scene

Merging Master

2019-07-22 16:47:58 -04:00

osirisrex.scene

Merging Master

2019-07-22 16:47:58 -04:00

rosetta.scene

Merging Master

2019-07-22 16:47:58 -04:00

touch.scene

Feature/gui for touch (#967)

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

voyager.scene

Merging Master

2019-07-22 16:47:58 -04:00