Malin Ejdbo bc9fc63719 Merge branch 'master' into feature/model-animation ...

* Resolve conflicts

2021-03-25 13:54:51 +01:00

..

documentation

Merge branch 'master' into feature/model-animation

2021-03-25 13:54:51 +01:00

engine

Feature/configuration codegen (#1544)

2021-03-23 15:22:29 +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

Split DashboardTextItem from DashboardItem

2021-03-24 17:46:13 +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

Split DashboardTextItem from DashboardItem

2021-03-24 17:46:13 +01:00

openspace.cpp

Happy new year

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