Jonas Strandstedt 5427dbdeb2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefieldlines.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/stars/renderablestars.cpp

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

..

abuffer

Added fixed ABuffer implementation

2014-07-08 13:29:15 -04:00

engine

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

flare

Comment out flare code

2014-09-26 13:24:09 +02:00

interaction

Working ABuffer

2014-07-23 16:06:49 -04:00

interface

Compile fixes of SpiceManager for Mac

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

properties

Fix crash when PropertyOwner's are deallocated

2014-09-26 01:01:00 +02:00

query

More work towards a unified interface for accessing properties

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

rendering

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

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

scenegraph

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

scripting

Cleaned up script functionality in SceneGraph

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

tests

Merge branch 'develop' into feature/time

2014-09-15 00:16:33 +02:00

util

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00