Emil Axelsson 5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management ...

Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp

2017-07-18 10:54:41 +02:00

..

documentation

Code cleanup

2017-05-11 18:51:42 -04:00

engine

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-07-18 10:54:41 +02:00

interaction

Interaction Updates (#353)

2017-07-14 17:17:17 +02:00

mission

Clean up interdace of Mission class

2017-05-09 11:17:14 +01:00

network

Remove warnings

2017-06-08 00:07:51 -04:00

performance

Alex's recommended changes in pull #357. Add check for log directory existence

2017-07-13 20:16:01 -06:00

properties

Enable Property to have multiple callbacks

2017-07-11 14:23:17 -04:00

query

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

rendering

Interaction Updates (#353)

2017-07-14 17:17:17 +02:00

scene

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-07-18 10:54:41 +02:00

scripting

Add support for c closures in lua

2017-07-06 22:30:57 +02:00

util

Interaction Updates (#353)

2017-07-14 17:17:17 +02:00