Alexander Bock b78d1dd033 Merge branch 'master' into feature/memory-allocations ...

# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h

2020-08-05 19:06:04 +02:00

..

ext/gdal

Feature/globe speedup (#862)

2019-05-17 18:24:14 +02:00

gdal_data

Feature/globe speedup (#862)

2019-05-17 18:24:14 +02:00

scripts

Add checks for missing node name and directory parameters to the openspace.globebrowsing.addBlendingLayersFromDirectory function (closes #1101)

2020-06-22 22:03:29 +02:00

shaders

Rename 'transparency' to 'colorFilter' in the ring classes

2020-07-10 11:25:18 +02:00

src

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

CMakeLists.txt

Remove unused globebrowsing instrumentation

2020-06-12 21:50:05 +02:00

globebrowsingmodule_lua.inl

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

globebrowsingmodule.cpp

Remove unused globebrowsing instrumentation

2020-06-12 21:50:05 +02:00

globebrowsingmodule.h

Remove unused globebrowsing instrumentation

2020-06-12 21:50:05 +02:00

include.cmake

Feature/cef speedup (#806)

2019-04-24 10:53:46 +02:00