Emma Broman 16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts ...

# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl

2021-07-09 15:43:17 +02:00

..

ext/imgui

Update imgui external

2021-03-01 13:24:28 +01:00

include

ListProperties and SelectionProperty (#1558)

2021-04-19 16:10:36 +02:00

shaders

Feature/cleanup (#1608)

2021-05-25 14:08:33 +02:00

src

Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts

2021-07-09 15:43:17 +02:00

CMakeLists.txt

Expose ImGui external to other modules

2021-03-02 08:48:25 +01:00

imguimodule.cpp

Move camera path code into core and refactor navigation code a bit

2021-06-23 09:12:36 +02:00

imguimodule.h

Happy new year

2021-01-02 15:26:51 +01:00

include.cmake

…