Alexander Bock aa3ac0e3f2 Merge branch 'master' into feature/FXAA ...

# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp

2019-08-20 14:47:01 +02:00

..

documentation

Adding documentation to RenderableGlobe and layers (closes #651)

2019-07-30 17:48:43 +02:00

engine

Feature/websocketnavigation (#882)

2019-07-31 11:07:25 +02:00

interaction

Cancel follow anchor node rotation interpolation when the anchor is changed

2019-08-13 18:35:22 +02:00

mission

Feature/jenkins fix (#816)

2019-03-24 11:19:39 +01:00

network

Feature/documentation topic (#822)

2019-04-03 10:30:28 +02:00

performance

Feature/jenkins fix (#816)

2019-03-24 11:19:39 +01:00

properties

Add the ability to query and rearrange globebrowsing layers at runtime

2019-07-30 14:28:23 +02:00

query

Feature/jenkins fix (#816)

2019-03-24 11:19:39 +01:00

rendering

Merge branch 'master' into feature/FXAA

2019-08-20 14:47:01 +02:00

scene

resurrecting consolidated documentation (#897)

2019-06-03 06:19:45 -06:00

scripting

Feature/cleanup (#837)

2019-05-03 13:27:43 +02:00

util

Added a check to prevent buffer sync buffer overflow, and expand buff… (#937)

2019-08-12 13:25:56 -06:00

json.h

Feature/jenkins fix (#816)

2019-03-24 11:19:39 +01:00