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

Conflicts:
	src/engine/openspaceengine.cpp

2015-02-16 08:33:01 +01:00

..

abuffer

Windows fix after memory leak fixes

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

engine

Added a delta time member variable to openspace engine and changed how dt is calculated.

2015-02-09 13:52:00 +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-16 08:33:01 +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

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

2015-02-16 08:33:01 +01:00

scenegraph

commit to be able to merge

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

scripting

Fix memory leaks and proper deinitialization

2014-12-11 10:13:10 +01:00

tests

intermediate commit

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

util

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

2015-02-16 08:33:01 +01:00