Joakim Kilby f096d9d9e3 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome ...

Conflicts:
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/luaconsole.cpp
	src/rendering/renderengine.cpp

2015-02-17 12:18:14 +01:00

..

abuffer

Windows fix after memory leak fixes

2014-12-11 14:12:01 +01:00

engine

Making most includes in openspaceengine into forward declarations

2015-02-17 10:36:18 +01:00

gui

Added Vec4Property to imgui

2015-01-21 15:12:54 +01:00

interaction

Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT

2015-02-17 08:25:09 +01:00

interface

Compile fixes of SpiceManager for Mac

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

properties

Add stepping value into Property description

2014-12-18 13:46:18 +01:00

query

Enable querying for Renderables in query.h

2014-12-03 17:19:18 +01:00

rendering

Making most includes in openspaceengine into forward declarations

2015-02-17 10:36:18 +01:00

scenegraph

commit to be able to merge

2015-02-12 14:58:40 +01:00

scripting

added serialize, deserialize, post sync and pre sync functions for script engine

2015-02-17 11:58:03 +01:00

tests

intermediate commit

2014-11-26 12:12:03 -05:00

util

added synced versions of shared variables and modified set/get methods to adress the right versions of variables

2015-02-17 11:58:57 +01:00