Alexander Bock b78d1dd033 Merge branch 'master' into feature/memory-allocations ...

# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h

2020-08-05 19:06:04 +02:00

..

documentation

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

engine

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

interaction

Add the ability to render out the current recording time during a session recording

2020-07-02 16:37:11 +02:00

mission

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

network

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

properties

SGCT compile fix

2020-06-11 00:24:58 +02:00

query

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

rendering

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

scene

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

scripting

Merge pull request #1063 from OpenSpace/bug/macosbuild

2020-02-10 23:39:39 +01:00

util

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

json.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00