Matthew Territo 08c9862c32 Merge branch 'develop' into feature/globebrowsing

2016-08-11 21:59:38 -06:00

..

engine

Add access to deltaTime/getDt in SGCT/WindowWrapper

2016-08-11 19:19:07 -06:00

interaction

Merge with develop and solve conflicts.

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

network

Add SGCT as submodule

2016-07-20 14:31:30 +02:00

performance

Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node

2016-08-01 16:20:23 +02:00

properties

Updated URLs in code or comments

2016-08-01 11:05:50 +02:00

query

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

rendering

Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t

2016-08-11 20:56:18 -06:00

scene

Merge with develop and solve conflicts.

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

scripting

Removing more CppCheck warnings

2016-07-28 20:31:53 +02:00

util

Solve merge conflicts: develop --> globebrowsing

2016-08-02 18:50:10 -04:00

openspace.h

Updating versioning number to prerelease-9 (IPS)

2016-05-31 18:26:20 +02:00