Auto stash before merge of "main" and "origin/main"

This commit is contained in:
benroshio 2025-02-04 17:26:56 -05:00
parent f46716de6b
commit 2cb52e12d0
400 changed files with 23596 additions and 5990 deletions

View File

@ -74,25 +74,9 @@
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Binaries/Win64/Android/UnrealEditor-AndroidDeviceDetection.dll",
"Path": "$(EngineDir)/Binaries/Win64/EOSSDK-Win64-Shipping.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/Android/UnrealEditor-AndroidPlatformEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/Android/UnrealEditor-AndroidRuntimeSettings.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/Android/UnrealEditor-AndroidTargetPlatform.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/Android/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Binaries/Win64/OpenColorIO_2_2.dll",
"Type": "DynamicLibrary"
@ -1533,18 +1517,10 @@
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-TextureFormat.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-TextureFormatASTC.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-TextureFormatDXT.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-TextureFormatETC2.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Binaries/Win64/UnrealEditor-TextureFormatIntelISPCTexComp.dll",
"Type": "DynamicLibrary"
@ -2745,6 +2721,18 @@
"Path": "$(EngineDir)/Plugins/FX/Niagara/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Fab/Binaries/Win64/UnrealEditor-Fab.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Fab/Binaries/Win64/UnrealEditor-Fab.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(EngineDir)/Plugins/Fab/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/FastBuildController/Binaries/Win64/UnrealEditor-FastBuildController.dll",
"Type": "DynamicLibrary"
@ -3013,6 +3001,14 @@
"Path": "$(EngineDir)/Plugins/MovieScene/TemplateSequence/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Online/EOSShared/Binaries/Win64/UnrealEditor-EOSShared.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(EngineDir)/Plugins/Online/EOSShared/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(EngineDir)/Plugins/Online/OnlineBase/Binaries/Win64/UnrealEditor-OnlineBase.dll",
"Type": "DynamicLibrary"
@ -21479,6 +21475,10 @@
"Path": "$(EngineDir)/Binaries/Win64/AgentInterface.pdb",
"Type": "DebugNonUFS"
},
{
"Path": "$(EngineDir)/Binaries/Win64/EOSSDK-Win64-Shipping.dll",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/Win64/EpicWebHelper.exe",
"Type": "NonUFS"
@ -24639,6 +24639,10 @@
"Path": "$(EngineDir)/Plugins/FX/Niagara/Niagara.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Fab/Fab.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/FastBuildController/FastBuildController.uplugin",
"Type": "UFS"
@ -24719,6 +24723,10 @@
"Path": "$(EngineDir)/Plugins/Online/Android/OnlineSubsystemGooglePlay/OnlineSubsystemGooglePlay.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Online/EOSShared/EOSShared.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Online/IOS/OnlineSubsystemIOS/OnlineSubsystemIOS.uplugin",
"Type": "UFS"

Some files were not shown because too many files have changed in this diff Show More