Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars ...

Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp

2014-09-24 15:39:22 +02:00

..

abuffer

Added fixed ABuffer implementation

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

engine

Cleaned up main.cpp

2014-09-17 01:10:52 +02:00

flare

Fix for Flare

2014-05-22 12:57:54 -04: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 a bug in TemplateProperty preventing new bool values to be set

2014-09-18 08:46:46 +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 stars

2014-09-24 15:39:22 +02:00

scenegraph

Remove renderableToggle as it has been replaced with a property

2014-09-18 20:39:30 +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

Merge branch 'develop' into stars

2014-09-24 15:39:22 +02:00