michal 08a97d9e68 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp

2014-10-23 11:45:24 -04:00

..

abuffer

Added ABuffer reinitialization

2014-10-17 14:50:40 +02:00

engine

Added SyncBuffer class

2014-10-22 16:37:54 +02:00

flare

Removing Jenkins warnings

2014-09-26 17:53:18 +02:00

interaction

Moved the lua command input to separete class

2014-10-22 13:04:55 +02:00

interface

Compile fixes of SpiceManager for Mac

2014-08-19 12:14:34 +02:00

properties

Load common module automatically without the need to declare it in the scenefile

2014-10-11 14:45:34 +02:00

query

More work towards a unified interface for accessing properties

2014-08-30 10:01:11 +02:00

rendering

Merge branch 'develop' into solarsystem2

2014-10-23 11:45:24 -04:00

scenegraph

Cleaned up code

2014-10-11 13:40:52 +02:00

scripting

Cleaned up script functionality in SceneGraph

2014-09-14 18:36:33 +02:00

tests

Fix OpenSpaceTest

2014-10-07 22:27:06 +02:00

util

Merge branch 'develop' into solarsystem2

2014-10-23 11:45:24 -04:00