michal 845469b15d Merge branch 'develop' into solarsystem2 ...

Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp

2014-11-26 13:42:36 -05:00

..

model

intermediate commit.

2014-11-12 12:28:16 -05:00

planets

minor changes, testing

2014-11-26 11:22:11 -05:00

stars

Some more changes to the RenderableStars class

2014-11-26 16:36:02 +01:00

renderable.h

Cleanup for KameleonWrapper

2014-11-11 13:43:38 +01:00

renderableephemeris.h

OS X now doesn't crash for volumes

2014-11-05 17:11:27 +01:00

renderablefieldlines.h

Replaced RuntimeData with separate, temporary structs that are passed around

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

renderablefov.h

some cleanup.

2014-11-13 11:35:17 -05:00

renderablepath.h

added renderablepath and made changes to renderabletrail

2014-10-08 16:15:37 -04:00

renderableplane.h

Added RenderablePlane

2014-10-10 15:18:16 +02:00

renderablesphericalgrid.h

field of view rendering. Intermediate commit.

2014-11-01 18:41:09 -04:00

renderabletrail.h

OS X now doesn't crash for volumes

2014-11-05 17:11:27 +01:00

renderablevolume.h

Cleanup for KameleonWrapper

2014-11-11 13:43:38 +01:00

renderablevolumegl.h

Cleanup for KameleonWrapper

2014-11-11 13:43:38 +01:00

renderengine.h

Added support for pixelData for ABuffer

2014-11-13 15:41:10 +01:00