Alexander Bock f457eb6cc2 Merge branch 'master' into feature/gui-cleanup

2016-06-25 18:26:18 +02:00

..

ext/imgui

Updated copyright header

2016-02-05 17:43:21 +01:00

include

Working on global settings integrated in gui but no functionality yet

2016-06-15 14:46:19 +02:00

shaders

Updated copyright header

2016-02-05 22:47:37 +01:00

src

Merge branch 'master' into feature/gui-cleanup

2016-06-25 18:26:18 +02:00

CMakeLists.txt

Moved renderproperties functions

2016-05-18 09:33:32 -04:00

include.cmake

Moving onscreen gui into its own module

2015-05-26 22:52:12 +02:00

onscreenguimodule.cpp

Updated copyright header

2016-02-05 17:43:21 +01:00

onscreenguimodule.h

Updated copyright header

2016-02-05 17:43:21 +01:00