Ylva Selling c9bbb4a533 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser ...

# Conflicts:
#	include/openspace/rendering/screenspacerenderable.h
#	src/rendering/screenspacerenderable.cpp

2022-04-08 11:46:09 -04:00

..

dashboard.h

Happy new year

2022-01-01 12:32:55 +01:00

dashboarditem.h

Happy new year

2022-01-01 12:32:55 +01:00

dashboardtextitem.h

Happy new year

2022-01-01 12:32:55 +01:00

deferredcaster.h

Happy new year

2022-01-01 12:32:55 +01:00

deferredcasterlistener.h

Happy new year

2022-01-01 12:32:55 +01:00

deferredcastermanager.h

Happy new year

2022-01-01 12:32:55 +01:00

framebufferrenderer.h

Happy new year

2022-01-01 12:32:55 +01:00

helper.h

Happy new year

2022-01-01 12:32:55 +01:00

loadingscreen.h

Happy new year

2022-01-01 12:32:55 +01:00

luaconsole.h

Happy new year

2022-01-01 12:32:55 +01:00

raycasterlistener.h

Happy new year

2022-01-01 12:32:55 +01:00

raycastermanager.h

Happy new year

2022-01-01 12:32:55 +01:00

renderable.h

Add a hidden "Fade" property that modifies the effective opacity to enable other functionality (closes #1970)

2022-04-05 23:53:33 +02:00

renderengine.h

Rename 'slave' to 'client' in the remaining code

2022-04-05 23:10:49 +02:00

screenspacerenderable.h

Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser

2022-04-08 11:46:09 -04:00

texturecomponent.h

Happy new year

2022-01-01 12:32:55 +01:00

transferfunction.h

Happy new year

2022-01-01 12:32:55 +01:00

volume.h

Happy new year

2022-01-01 12:32:55 +01:00

volumeraycaster.h

Happy new year

2022-01-01 12:32:55 +01:00