Alexander Bock 67f0fb3c08 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp

2014-10-06 22:22:30 +02:00

..

abuffer

PowerScaling modifications

2014-10-03 17:02:31 +02:00

engine

Using new ghoul ProgramObject functionality

2014-10-01 15:30:39 +02:00

flare

Removing Jenkins warnings

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

interaction

Removing Jenkins warnings

2014-09-26 17:53:18 +02: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' into solarsystem2

2014-10-06 22:22:30 +02:00

scenegraph

Using new ghoul ProgramObject functionality

2014-10-01 15:30:39 +02:00

scripting

Cleaned up script functionality in SceneGraph

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

tests

Fix SpiceManager test

2014-10-06 01:43:33 +02:00

util

Merge branch 'develop' into solarsystem2

2014-10-06 22:22:30 +02:00