Kalle Bladin 541fbba322 Merge with develop and solve conflicts.

2016-07-18 17:26:30 -04:00

..

ext/imgui

Updated copyright header

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

include

Move the LuaLibrary definition into its own file

2016-07-18 12:40:29 +02:00

shaders

Add new font for the OnScreen GUI

2016-06-27 01:13:28 +02:00

src

Merge with develop and solve conflicts.

2016-07-18 17:26:30 -04: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

Updated copyright header

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

onscreenguimodule.h

Updated copyright header

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