Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing ...

* Resolve conflicts

2021-03-02 15:49:39 +01:00

..

documentation

Include potential explanation when stringifying TestResult Offense

2021-02-25 12:57:46 +01:00

engine

Make use of new verifiers (Color and File) (#1510)

2021-03-02 08:11:49 +01:00

interaction

Feature/user profiles assets (#1496)

2021-03-02 01:36:32 -05:00

mission

Happy new year

2021-01-02 15:26:51 +01:00

network

Happy new year

2021-01-02 15:26:51 +01:00

properties

Fixed issue preventing the rendering of color properties

2021-02-01 13:55:53 +01:00

query

Prevent exception when querying renderable of non-existing SGN

2021-02-11 16:24:36 +01:00

rendering

Merge branch 'master' into feature/multitexturing

2021-03-02 15:49:39 +01:00

scene

Feature/user profiles assets (#1496)

2021-03-02 01:36:32 -05:00

scripting

Remove Dictionary use in script scheduling with struct

2021-01-02 23:24:15 +01:00

util

Prevent TaskRunner crashing on specification error

2021-02-25 12:46:57 +01:00

CMakeLists.txt

Feature/codegen (#1480)

2021-02-09 09:12:43 +01:00

openspace.cpp

Happy new year

2021-01-02 15:26:51 +01:00