Merge branch 'DA-Test'

This commit is contained in:
Lu 2025-04-09 22:18:56 +02:00
commit c5e4ab3dce
49 changed files with 207 additions and 90 deletions

View File

@ -12,9 +12,9 @@
{
"MajorVersion": 5,
"MinorVersion": 5,
"PatchVersion": 1,
"Changelist": 38445549,
"CompatibleChangelist": 37670630,
"PatchVersion": 0,
"Changelist": 37670630,
"CompatibleChangelist": 0,
"IsLicenseeVersion": 0,
"IsPromotedBuild": 0,
"BranchName": "++UE5+Release-5.5",
@ -2833,6 +2833,50 @@
"Path": "$(EngineDir)/Plugins/Animation/LiveLink/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicDeveloper.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLib.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLibTest.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicModule.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/Binaries/Win64/UnrealEditor-CameraShakePreviewer.dll",
"Type": "DynamicLibrary"
@ -3665,6 +3709,18 @@
"Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKRuntime.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/Binaries/Win64/UnrealEditor-NFORDenoise.dll",
"Type": "DynamicLibrary"
@ -3889,66 +3945,6 @@
"Path": "$(EngineDir)/Plugins/Interchange/Runtime/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Media/AndroidMedia/Binaries/Win64/UnrealEditor-AndroidMediaEditor.dll",
"Type": "DynamicLibrary"
@ -29871,6 +29867,14 @@
"Path": "$(EngineDir)/Plugins/Animation/LiveLink/LiveLink.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Animation/RigLogic/RigLogic.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Bridge/Bridge.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/CameraShakePreviewer.uplugin",
"Type": "UFS"
@ -30211,6 +30215,10 @@
"Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/MeshModelingToolsetExp.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/MetaHumanSDK.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/NFORDenoise.uplugin",
"Type": "UFS"
@ -30271,10 +30279,6 @@
"Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/RiderLink.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/AndroidMedia/AndroidMedia.uplugin",
"Type": "UFS"
@ -30621,6 +30625,7 @@
"BaseCharacterFXEditor",
"BlendSpaceMotionAnalysis",
"BlueprintHeaderView",
"Bridge",
"CLionSourceCodeAccess",
"CableComponent",
"CameraShakePreviewer",
@ -30711,6 +30716,7 @@
"MeshModelingToolset",
"MeshModelingToolsetExp",
"MeshPainting",
"MetaHumanSDK",
"Metasound",
"MobileLauncherProfileWizard",
"MobilePatchingUtils",
@ -30749,8 +30755,8 @@
"RenderDocPlugin",
"RenderGraphInsights",
"ResonanceAudio",
"RiderLink",
"RiderSourceCodeAccess",
"RigLogic",
"RigVM",
"SQLiteCore",
"SequencerAnimTools",

BIN
Binaries/Win64/UnrealEditor-LegumeMix.exp (Stored with Git LFS)

Binary file not shown.

BIN
Binaries/Win64/UnrealEditor-LegumeMix.pdb (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Materials/MF_Celshadding.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Materials/Post_Process2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Plante/Chouxfleur.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Plante/Herbe.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Plante/Tomate.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Arche_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Mur2m_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Pente_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Pillier_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Rembard_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Roche_01_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Roche_02_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Roche_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/Sol_rect_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Legumix/Assets/Props/Decors/Roche/pavé_LP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Legumix/Levels/LVL_TEST_003.umap (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.