Alexander Bock f307dfb64a Merge branch 'master' into feature/shadows ...

# Conflicts:
#	modules/base/rendering/renderablemodel.h
#	modules/globebrowsing/src/renderableglobe.cpp
#	modules/globebrowsing/src/renderableglobe.h
#	src/rendering/renderengine.cpp

2025-12-18 16:19:33 +01:00

..

camera

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

data

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

documentation

Explicitly specify namespaces and MacOS fixes (#3860)

2025-12-17 12:03:34 +01:00

engine

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

events

Merge branch 'master' into feature/shadows

2025-12-18 16:19:33 +01:00

interaction

Remove correct codegen tool. Update Ghoul

2025-12-17 11:36:39 +01:00

mission

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

navigation

Remove unused keyframe time reference modes

2025-12-16 15:47:08 +01:00

network

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

properties

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

query

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

rendering

Merge branch 'master' into feature/shadows

2025-12-18 16:19:33 +01:00

scene

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

scripting

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

util

Fixing more includes and forward declarations (#3876)

2025-12-16 13:40:19 +01:00

json.h

Update nlohmann repository (#3609)

2025-04-16 14:13:20 +02:00