Added the fixes for the render target save to disk functions
More merge conflicts
This commit is contained in:
parent
91845521dd
commit
64e3d3ce20
107
.idea/.idea.Luckyrobots/.idea/workspace.xml
generated
107
.idea/.idea.Luckyrobots/.idea/workspace.xml
generated
@ -14,110 +14,11 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/Content/Blueprint/Core/BP_PickAndPlaceManager.uasset" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Content/Blueprint/Core/BP_PickAndPlaceTarget.uasset" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Content/Levels/Office/AIUE5_vol11_04/materials/MI_AI_vol11_04_dial_02.uasset" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Content/Levels/Office/AIUE5_vol11_04/mesh/NewinteractiblesOffice/Int_SM_AI_vol11_04_copier_1_1_new/LegoTest.uasset" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Private/AI/PickAndPlaceManager.cpp" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Private/AI/PickAndPlaceUser.cpp" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Private/Lib/LuckyWorldFunctions.cpp" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Public/AI/PickAndPlaceManager.h" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Public/AI/PickAndPlaceUser.h" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Public/Lib/LuckyWorldFunctions.h" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.Luckyrobots/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Luckyrobots/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Binaries/Mac/Luckyrobots-Mac-Shipping.target" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Binaries/Win64/UnrealEditor-Luckyrobots.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Binaries/Win64/UnrealEditor-Luckyrobots.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Binaries/Win64/UnrealEditor-Luckyrobots.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Binaries/Win64/UnrealEditor-Luckyrobots.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/Core/BP_3DtextHelp.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/Core/BP_3DtextHelp.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/Core/BP_RobotArmPlacementVolume.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/Core/BP_RobotArmPlacementVolume.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/Core/BP_RobotArmRandomItemsVolume.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/Core/BP_RobotArmRandomItemsVolume.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/State/ST_LuckyWorld.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/State/ST_LuckyWorld.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/robotAccessoriesSensors/BP_CameraSensor.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/robotAccessoriesSensors/BP_CameraSensor.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Developers/Bhrama/DT_LuckyStateTreeTags.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Developers/Bhrama/DT_LuckyStateTreeTags.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Developers/Wdev/Robots/BP_SoArm100robot.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Developers/Wdev/Robots/BP_SoArm100robot.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Map/Test_Level.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Map/Test_Level.umap" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/WB_GameWidget.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/WB_GameWidget.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/menu/WB_CameraList.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/menu/WB_CameraList.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Luckyrobots.sln.DotSettings.user" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/AsyncLoac1ceae7b44acV11/Binaries/Win64/UnrealEditor-AsyncLoadingScreen.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/AsyncLoac1ceae7b44acV11/Binaries/Win64/UnrealEditor-AsyncLoadingScreen.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/AsyncLoac1ceae7b44acV11/Binaries/Win64/UnrealEditor-AsyncLoadingScreen.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/AsyncLoac1ceae7b44acV11/Binaries/Win64/UnrealEditor-AsyncLoadingScreen.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor-BlueprintJson.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor-BlueprintJson.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor-BlueprintJson.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor-BlueprintJson.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathAsyncVolumeGeneration.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathAsyncVolumeGeneration.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDefines.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDefines.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDefines.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDefines.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDynamicObstacle.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDynamicObstacle.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDynamicObstacle.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathDynamicObstacle.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathFindPath.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathFindPath.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathFindPath.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathFindPath.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathNode.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathNode.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathNode.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathNode.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathOctree.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathOctree.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolume.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolume.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolume.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolume.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolumeGroundPrio.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolumeGroundPrio.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolumeGroundPrio.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathVolumeGroundPrio.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathfinding.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathfinding.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathfinding.init.gen.cpp.sarif" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/CPathfinding.init.gen.cpp.sarif" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor-FileHelper.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor-FileHelper.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor-FileHelper.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor-FileHelper.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.exp" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.exp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_0.exe" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_0.exe" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_0.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_0.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_1.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_1.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor-LuckyTextWrite.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor-LuckyTextWrite.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor-LuckyTextWrite.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor-LuckyTextWrite.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12Backend.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12Backend.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12Backend.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXD3D12Backend.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Api.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Api.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Api.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Api.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Settings.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Settings.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Settings.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Settings.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3TemporalUpscaling.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3TemporalUpscaling.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3TemporalUpscaling.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3TemporalUpscaling.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolation.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolation.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolation.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolation.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolationApi.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolationApi.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolationApi.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFrameInterpolationApi.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXOpticalFlowApi.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXOpticalFlowApi.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXOpticalFlowApi.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXOpticalFlowApi.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXRHIBackend.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXRHIBackend.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXRHIBackend.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXRHIBackend.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXShared.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXShared.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXShared.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXShared.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3MovieRenderPipeline/Binaries/Win64/UnrealEditor-FSR3MovieRenderPipeline.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3MovieRenderPipeline/Binaries/Win64/UnrealEditor-FSR3MovieRenderPipeline.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3MovieRenderPipeline/Binaries/Win64/UnrealEditor-FSR3MovieRenderPipeline.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/Marketplace/FSR3-550/FSR3MovieRenderPipeline/Binaries/Win64/UnrealEditor-FSR3MovieRenderPipeline.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-CoreUtility.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-CoreUtility.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-CoreUtility.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-CoreUtility.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJEditorPlugin.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJEditorPlugin.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJEditorPlugin.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJEditorPlugin.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJson.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJson.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJson.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJson.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOClient.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOClient.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOClient.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOClient.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOLib.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOLib.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOLib.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOLib.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRest.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRest.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRest.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRest.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRestEditor.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRestEditor.dll" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRestEditor.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRestEditor.pdb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/component/BPC_Capture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/component/BPC_Capture.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -306,7 +207,7 @@
|
||||
<workItem from="1744126161743" duration="605000" />
|
||||
<workItem from="1744127162882" duration="5232000" />
|
||||
<workItem from="1744156005223" duration="4822000" />
|
||||
<workItem from="1744222869352" duration="15217000" />
|
||||
<workItem from="1744222869352" duration="16913000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
BIN
Content/Blueprint/component/BPC_Capture.uasset
(Stored with Git LFS)
BIN
Content/Blueprint/component/BPC_Capture.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset
(Stored with Git LFS)
BIN
Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset
(Stored with Git LFS)
BIN
Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset
(Stored with Git LFS)
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user