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

..

camera.h

Removing Jenkins warnings

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

constants.h

Merge branch 'develop' into solarsystem2

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

factorymanager.h

Updated ghoul version; more code cleanup

2014-05-10 15:17:10 +02:00

factorymanager.inl

Created classes for PlanetGeometry

2014-05-05 17:28:46 +02:00

geometry.h

Restructuring for OpenSpace tests

2014-03-19 14:57:10 -04:00

kameleonwrapper.h

Added missing file

2014-07-18 14:00:09 -04:00

planet.h

Renamed pss to PowerScaledScalar

2014-05-11 18:34:57 +02:00

powerscaledcoordinate.h

Removing Jenkins warnings

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

powerscaledscalar.h

Removing Jenkins warnings

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

powerscaledsphere.h

WIP: intermediary commit, will attempt to run HC's code on this machine.

2014-08-25 17:37:23 -04:00

sphere.h

Restructuring for OpenSpace tests

2014-03-19 14:57:10 -04:00

spicemanager.h

Merge branch 'develop' into solarsystem2

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

time.h

Reworked how SPICE kernels are loaded

2014-09-28 00:06:53 +02:00

updatestructures.h

got renderable ephemeris working for larger deltas, problems with leap years though

2014-10-02 11:00:43 -04:00

vbo_template.h

Flare and Volumes in scenegraph

2014-04-14 16:41:57 -04:00

vbo.h

Restructuring for OpenSpace tests

2014-03-19 14:57:10 -04:00