Commit Graph

9 Commits

Author SHA1 Message Date
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Alexander Bock
34b1401d99 Some configuration update to 67P and key bindings 2016-09-01 09:34:08 +02:00
Alexander Bock
29d50e85fe Bind keys to disable outer planets orbits 2016-08-30 11:07:13 +02:00
Alexander Bock
5502c52b9a Adapt Rosetta and New Horizons keybindings to restructuring of ProjectionComponent 2016-07-01 15:22:21 +02:00
Alexander Bock
fde537681f Some work on fixing 67P projections for all available times 2016-05-30 15:26:47 +02:00
Alexander Bock
d3ab18ec93 Clean keybindings of Rosetta scene 2016-05-30 13:54:33 +02:00
Alexander Bock
78c0ed902f Correct displacement factor for planetary heightmap
Correctly bind F8 key for clearing rosetta projections
2016-05-30 11:41:14 +02:00
Alexander Bock
dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00