Michal Marcinkowski 44e02465a1 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp

2015-01-22 10:31:40 -05:00

..

bind_keys.lua

Added camera offset support

2015-01-06 12:43:16 +01:00

default_keybinding.lua

More work in preparing for lua-based keyboard controller

2014-10-14 00:08:26 +02:00

default_startup.lua

Image sequencing improvements and optimization of projection.

2015-01-21 11:28:38 -05:00