Wojtek Figat eab7794e3b Merge remote-tracking branch 'origin/master' into 1.12 ...

# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	global.json

2026-03-26 23:44:33 +01:00

..

AssetHeader.h

Remove copyright year from source files and update to 2025

2025-04-07 19:22:21 +02:00

ContentStorageManager.cpp

Add UnusedStorageLifetime for asset file TTL

2026-03-25 21:30:07 +01:00

ContentStorageManager.h

Add UnusedStorageLifetime for asset file TTL

2026-03-25 21:30:07 +01:00

FlaxChunk.h

Minor fix for Web no threads

2026-03-06 11:10:13 +01:00

FlaxFile.h

Remove copyright year from source files and update to 2025

2025-04-07 19:22:21 +02:00

FlaxPackage.h

Remove copyright year from source files and update to 2025

2025-04-07 19:22:21 +02:00

FlaxStorage.cpp

Merge remote-tracking branch 'origin/master' into 1.12

2026-03-26 23:44:33 +01:00

FlaxStorage.h

Add various fixes

2026-02-16 16:11:00 +01:00

FlaxStorageReference.h

Fix crash on Android when loading mesh with SDF data

2025-10-07 18:09:18 +02:00

JsonStorageProxy.cpp

Fix duplicating json assets to properly remap object IDs

2025-06-04 23:49:19 +02:00

JsonStorageProxy.h

Remove copyright year from source files and update to 2025

2025-04-07 19:22:21 +02:00