Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing

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

..

engine

Make OpenSpaceModule a properties::PropertyOwner so that it can own properties

2016-07-31 19:26:55 +02: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

Include fixes for performance measurements

2016-07-18 16:25:55 +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

Move the LuaLibrary definition into its own file

2016-07-18 12:40:29 +02: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