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

..

documentation

Potential GCC compile fix

2016-09-22 07:57:34 +02:00

engine

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

2016-09-22 19:33:05 +02:00

interaction

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

2016-09-22 19:33:05 +02:00

network

synchronize time over parallel connection

2016-09-22 18:42:19 +02:00

performance

Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node

2016-08-01 16:20:23 +02:00

properties

Turn property identifier and guiName specification into prerequisites

2016-09-07 11:24:04 +02:00

query

Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)

2016-08-17 16:26:14 +02:00

rendering

Add application of blending and warping to the takeScreenshot function

2016-09-22 10:28:10 +02:00

scene

Add documentation to Ephemeris classes

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

scripting

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

2016-09-22 19:33:05 +02:00

util

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

2016-09-22 19:33:05 +02:00

openspace.h

Update the OpenSpace version for Kulturnatten

2016-09-22 10:28:24 +02:00