Malin E de54a5c09b Merge branch 'feature/multiple-joysticks' into project/spaceship-installation ...

* Resolve conflicts in joystickcamerastates.cpp

2021-12-07 11:22:53 +01:00

..

actions

Add action to hide all globe trails when approaching a planet/moon

2021-12-06 09:06:01 +01:00

customization

Clean up the layer support; Add additional configuration option to the globebrowsing customization file

2021-05-26 18:57:06 +02:00

dashboard

Merge master into jwst branch

2021-05-03 10:03:50 +02:00

events

Add action to hide all globe trails when approaching a planet/moon

2021-12-06 09:06:01 +01:00

examples

Remove local variable in example

2021-11-30 17:22:46 +01:00

global

fix openspace bookmarks.asset

2021-05-30 19:26:27 -04:00

gui

Merge master into jwst branch

2021-05-03 10:03:50 +02:00

scene

Add Mars moon models

2021-12-01 14:28:15 +01:00

spice

Merge master into jwst branch

2021-05-03 10:03:50 +02:00

sync

Replace request and requestAll with require and requireAll

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

util

Add new joystick asset

2021-12-07 10:30:15 +01:00

base_blank.asset

Feature/keybindings (#1708)

2021-08-18 10:58:20 +02:00

base.asset

Merge master into jwst branch

2021-05-03 10:03:50 +02:00