Malin E f490fccee6 Merge branch 'master' into feature/model-opacity ...

* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset

2023-02-01 14:52:33 +01:00

..

actions

Global pass over the code to remove trailing spaces

2022-11-22 21:06:52 +01:00

customization

Make the addSceneGraphNode call in the local bookmarks file protected (closes #1483)

2023-01-21 21:34:03 +01:00

dashboard

Cleanup of mostly asset files

2022-07-28 17:21:59 +02:00

educational/scale

Add action to reset position of eiffel tower scale object

2023-01-13 18:12:15 +01:00

events

Cleanup of mostly asset files

2022-07-28 17:21:59 +02:00

examples

Merge branch 'master' into feature/model-opacity

2023-02-01 14:52:33 +01:00

global

Make the addSceneGraphNode call in the local bookmarks file protected (closes #1483)

2023-01-21 21:34:03 +01:00

gui

Removing the asset_helper file (#1868)

2022-02-01 23:44:36 +01:00

modules

Global pass over the code to remove trailing spaces

2022-11-22 21:06:52 +01:00

scene

Merge branch 'master' into feature/model-opacity

2023-02-01 14:52:33 +01:00

spice

Global pass over the code to remove trailing spaces

2022-11-22 21:06:52 +01:00

util

Merge branch 'master' into feature/model-opacity

2023-02-01 14:52:33 +01:00

base_blank.asset

Move the module requirements from the base to base_blank

2023-01-23 21:32:39 +01:00

base.asset

Move the module requirements from the base to base_blank

2023-01-23 21:32:39 +01:00