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

..

base

Add documentation to Ephemeris classes

2016-09-20 19:24:14 +02:00

debugging

Remove extra includes

2016-09-15 09:19:46 +02:00

fieldlines

Update other modules to work with the new interaction mode and camera class.

2016-06-07 19:51:37 -04:00

galaxy

Disable default module setting for galaxy, globebrowsing, and multiresvolume

2016-06-24 10:55:49 +02:00

globebrowsing

Merge branch 'develop' into feature/globebrowsing

2016-09-20 15:52:01 +02:00

iswa

Remove local, shared, synced versions of Time. Keep one source of true

2016-09-03 19:45:58 -04:00

kameleon

only get selected datavalues from file

2016-06-13 17:59:36 -04:00

multiresvolume

Convert tabs to spaces.

2016-08-17 00:30:53 -04:00

newhorizons

Fix imaging for osiris rex

2016-09-20 20:02:47 +02:00

onscreengui

distinguish between local and remote scripting

2016-09-16 14:53:20 +02:00

toyvolume

Add documentation to the documentation and verifier classes

2016-09-18 20:47:41 +02:00

volume

fix compile errors for osx

2016-05-20 00:39:29 +02:00