Joakim Kilby 3d04af03a3 Merge branch 'develop' into plutoViz ...

Conflicts:
	include/openspace/rendering/planets/simplespheregeometry.h
	include/openspace/util/powerscaledsphere.h
	openspace.cfg
	shaders/pscstandard_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp

2015-02-18 15:52:35 +01:00

..

bind_keys.lua

Merge branch 'develop' into plutoViz

2015-02-18 15:52:35 +01:00

default_settings.lua

Enable the ability to run setting scripts that are executed after the scene has been loaded

2015-02-17 20:10:50 +01:00

default_startup.lua

Added comments to default startup script with recommended dt and times of observations

2015-02-11 18:55:07 -05:00