michal d3f66c4a7c Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2 ...

Conflicts:
	src/util/spicemanager.cpp

2014-10-08 16:27:51 -04: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

…

properties

Fix crash when PropertyOwner's are deallocated

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

query

…

rendering

added renderablepath and made changes to renderabletrail

2014-10-08 16:15:37 -04: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 OpenSpaceTest

2014-10-07 22:27:06 +02:00

util

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

2014-10-08 16:27:51 -04:00