Alexander Bock 84e3fb94e9 Merge branch 'master' into feature/disabled-updates

2020-08-10 16:16:46 +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

Update Ghoul and SGCT

2020-08-09 20:11:40 +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

Some more work on this

2020-08-09 11:21:25 +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