Alexander Bock 4b26305340 Merge branch 'master' into feature/profile-gui ...

# Conflicts:
#	openspace.cfg

2020-10-11 11:18:45 +02:00

..

documentation

Update the copyright header to 2020

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

engine

Added configuration file bypass launcher key option

2020-10-02 15:49:27 -06:00

interaction

Some small code cleanups

2020-10-09 22:27:28 +02:00

mission

Update the copyright header to 2020

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

network

Merge branch 'master' into feature/session-recording-improvements

2020-10-09 22:10:40 +02:00

properties

Making the documentation generation a bit more performant

2020-08-21 14:10:33 +02:00

query

Update the copyright header to 2020

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

rendering

Merge remote-tracking branch 'origin/master' into feature/openglstatecache

2020-09-04 14:02:17 +02:00

scene

Merge branch 'master' into feature/profile-gui

2020-10-11 11:18:45 +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/profile-gui

2020-10-09 19:40:46 -04:00

json.h

Update the copyright header to 2020

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