OLSSON 397b14c545 merging master into thesis branch

2020-02-19 10:22:47 -05:00

..

documentation

Update the copyright header to 2020

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

engine

Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0

2020-02-11 00:21:42 +01:00

interaction

Coding style cleanup

2020-02-14 19:37:06 +01: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

performance

Update the copyright header to 2020

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

properties

Update Ghoul repository

2020-02-12 00:01:24 +01:00

query

Update the copyright header to 2020

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

rendering

Update the copyright header to 2020

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

scene

Check for selfinclusion of assets (closes #1032)

2020-02-11 14:09:14 +01:00

scripting

Merge pull request #1063 from OpenSpace/bug/macosbuild

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

util

merging master into thesis branch

2020-02-19 10:22:47 -05:00

json.h

Update the copyright header to 2020

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