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

Browse Source

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

...

This commit is contained in:

Wojciech Figat

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

parent b347cd2f54 a48ce78733

commit eab7794e3b

96 changed files with 1094 additions and 280 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCharacterKinematic_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCommon_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCooking_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXExtensions_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXPvdSDK_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysX_static_64.a

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb

LFS Vendored

BIN

Binary file not shown.

Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb

LFS Vendored

BIN

Binary file not shown.