sylvass 0e548b4a1b Merge branch 'master' into thesis/2021/skybrowser ...

# Conflicts:
#	data/assets/util/webgui.asset
#	modules/webbrowser/src/screenspacebrowser.cpp
#	src/rendering/renderengine.cpp

2021-11-30 10:47:46 -05:00

..

actions

Event System (#1741)

2021-10-11 21:53:00 +02:00

customization

Make OpenSpace use the GUI without using the developers GUI

2021-06-09 16:36:49 +02:00

dashboard

Merge master into jwst branch

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

events

Event System (#1741)

2021-10-11 21:53:00 +02:00

examples

Feature/tileinterpolation (#1769)

2021-11-01 09:24:40 +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

Move reparent script

2021-10-25 11:05:31 +02: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

Merge branch 'master' into thesis/2021/skybrowser

2021-11-30 10:47:46 -05: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

circle.png

Add a circle which shows where on the sky an image points at

2021-04-21 13:41:41 +02:00

hoverCircle.asset

Make hover circle more general by loading it in relation to asset folder

2021-05-24 14:15:09 +02:00

renderableBrowser.asset

Update the structure of the renderable sky browser to inherit fronm renderable plane and wwtcommuicator

2021-11-23 09:48:07 -05:00

skyBrowserTargetPair.asset

Update asset file to new structure

2021-11-23 15:51:29 -05:00