Jonathas Costa 25cd3fdc0b Merged master again.

2020-08-24 13:44:26 -04:00

..

documentation

Update the copyright header to 2020

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

engine

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

interaction

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04: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

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

scene

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

scripting

Merge pull request #1063 from OpenSpace/bug/macosbuild

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

util

Merged master again.

2020-08-24 13:44:26 -04:00

json.h

Update the copyright header to 2020

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