Kalle Bladin 541fbba322 Merge with develop and solve conflicts.

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

..

engine

Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117)

2016-07-18 14:54:36 +02:00

interaction

Merge with develop and solve conflicts.

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

network

Move the LuaLibrary definition into its own file

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

performance

Include fixes for performance measurements

2016-07-18 16:25:55 +02:00

properties

Group properties in the Gui based on the group identifier

2016-06-29 19:45:45 +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

Move the LuaLibrary definition into its own file

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

util

Merge with develop and solve conflicts.

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

openspace.h

Updating versioning number to prerelease-9 (IPS)

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