Alexander Bock 6b40cb18fb Merge branch 'feature/interactionhandler' into develop ...

Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp

2014-11-18 15:46:26 +01:00

..

abuffer

Added support for pixelData for ABuffer

2014-11-13 15:41:10 +01:00

engine

Merge branch 'feature/interactionhandler' into develop

2014-11-18 15:46:26 +01:00

interaction

Merge branch 'feature/interactionhandler' into develop

2014-11-18 15:46:26 +01:00

interface

Compile fixes of SpiceManager for Mac

2014-08-19 12:14:34 +02:00

properties

Load common module automatically without the need to declare it in the scenefile

2014-10-11 14:45:34 +02:00

query

More work towards a unified interface for accessing properties

2014-08-30 10:01:11 +02:00

rendering

Added support for pixelData for ABuffer

2014-11-13 15:41:10 +01:00

scenegraph

Cleaned up code

2014-10-11 13:40:52 +02:00

scripting

More work in preparing for lua-based keyboard controller

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

tests

Fix OpenSpaceTest

2014-10-07 22:27:06 +02:00

util

Cleanup for KameleonWrapper

2014-11-11 13:43:38 +01:00