Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing ...

# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h

2016-12-03 01:32:23 +01:00

..

ext/imgui

Updated ImGUI version to 1.49

2016-10-19 15:42:45 +02:00

include

Split up scalar, vector, and matrix properties into their own files for improved compile times

2016-11-27 01:17:38 +01:00

shaders

Updated ImGUI version to 1.49

2016-10-19 15:42:45 +02:00

src

Merge branch 'develop' into feature/globebrowsing

2016-12-03 01:32:23 +01:00

CMakeLists.txt

Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers

2016-07-18 20:12:24 +02:00

include.cmake

Moving onscreen gui into its own module

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

onscreenguimodule.cpp

Replace explicit Lua commands to toggle onscreen gui with a global property

2016-11-22 09:49:22 +01:00

onscreenguimodule.h

Updated copyright header

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