Alexander Bock af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache ...

# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp

2020-09-04 14:02:17 +02:00

..

ext/imgui

Update the copyright header to 2020

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

include

Adding a new ImGui component for explicitly adding GIBS layer

2020-09-01 02:27:08 +02:00

shaders

Update the copyright header to 2020

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

src

Merge remote-tracking branch 'origin/master' into feature/openglstatecache

2020-09-04 14:02:17 +02:00

CMakeLists.txt

Adding a new ImGui component for explicitly adding GIBS layer

2020-09-01 02:27:08 +02:00

imguimodule.cpp

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

imguimodule.h

Cleaning up window delegate

2020-05-10 15:17:51 +02:00

include.cmake

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00