From bdb28f8a856a1c24e6c4feb878fae485552258d3 Mon Sep 17 00:00:00 2001 From: Behron Date: Tue, 8 Apr 2025 23:30:55 -0600 Subject: [PATCH] Finished SOArm100 UI More merge conflicts. Taking main changes --- .../RobotPawnActors/BP_mujoco_SOArm100.uasset | 4 ++-- .../ChildItems/WB_CameraSetting.uasset | 4 ++-- .../WB_Stationary_ArmRobotMenu.uasset | 4 ++-- .../menu/WB_SelectGoalMenu_Camera.uasset | 4 ++-- .../Win64/UnrealEditor-CPathfinding.dll | 4 ++-- .../Win64/UnrealEditor-CPathfinding.pdb | 4 ++-- .../Inc/CPathfinding/UHT/Timestamp | 4 ++-- .../CPathfinding/LiveCodingInfo.json | 19 ++++++++++++++++++ .../UnrealEditor-CPathfinding.dll.rsp | 18 +---------------- .../UnrealEditor-CPathfinding.exp | Bin 50499 -> 50499 bytes .../UnrealEditor-CPathfinding.lib | 2 +- .../UnrealEditor-CPathfinding.lib.rsp | 18 +---------------- 12 files changed, 36 insertions(+), 49 deletions(-) diff --git a/Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset b/Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset index a0e988b5..2ff01250 100644 --- a/Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset +++ b/Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a326c5abdde908a18dfc4faa8f598974f821caba6c0749ae2d34b8d9080e372 -size 994693 +oid sha256:f9a971d8091c9aec6e52a81893de048da211742e271411e9e59114bfeb0f5d66 +size 1007323 diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset index 9efaa9d2..0541a8bd 100644 --- a/Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset +++ b/Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaf4554f0d79df26f6609dc5671074d10eb9d69cbdd26e552da9b937de06ce42 -size 446345 +oid sha256:e128878333a341ffcad2f33b69fde50fb821d849abb894b0c897ae5ff48c57e1 +size 465327 diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_Stationary_ArmRobotMenu.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_Stationary_ArmRobotMenu.uasset index d0a9c11a..2faf20c3 100644 --- a/Content/luckyBot/Luckywidget/ChildItems/WB_Stationary_ArmRobotMenu.uasset +++ b/Content/luckyBot/Luckywidget/ChildItems/WB_Stationary_ArmRobotMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0ccfab3afb7850bf4037931257a9bf7da26598fd990f08b57b6e7fd97ba79d1 -size 53106 +oid sha256:51227e78cd8ff3458d0f32e94f5f049b7f2e69d86f02e853b339aabb0402d394 +size 53244 diff --git a/Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset b/Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset index 2aa26d16..84e65472 100644 --- a/Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset +++ b/Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9eb77e0951484b96bef63eee61557f61711774adc0e0393bcc8649ac7bcb41f2 -size 786276 +oid sha256:84e93a285253ff3b84b65a5ee6eb98e87bc361f67e8b830c9e1a78d11bce710b +size 790038 diff --git a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll index eed4a067..2be4717c 100644 --- a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll +++ b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a080864134f2909352eb92a7feaf8940c7cca08f0c00f0ba25883325d9c36521 -size 280576 +oid sha256:2eac24ddf85d073a4403149b9105b2d9ed41a3a1f08470b7bf6f5a0665680f9f +size 282112 diff --git a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb index 0c553491..32e98f73 100644 --- a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb +++ b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4a9282f806b8919c9cd991b73737b92b82218ee92ff5486acbbd0e5437270ca -size 60600320 +oid sha256:d2681f83f963ea50d1eed41dab5a79e6822c7b03a97d959324f51fb16bb3870d +size 60436480 diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp b/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp index 6e60614b..5ebfac92 100644 --- a/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp +++ b/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp @@ -1,6 +1,6 @@ D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDefines.h D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDynamicObstacle.h -D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathFindPath.h -D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolumeGroundPrio.h D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathNode.h +D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolumeGroundPrio.h +D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathFindPath.h D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolume.h diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/LiveCodingInfo.json b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/LiveCodingInfo.json index 5a2fc05f..3c39dda5 100644 --- a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/LiveCodingInfo.json +++ b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/LiveCodingInfo.json @@ -1,5 +1,24 @@ { "RemapUnityFiles": { + "Module.CPathfinding.cpp.obj": [ + "CPathDefines.gen.cpp.obj", + "CPathDynamicObstacle.gen.cpp.obj", + "CPathfinding.init.gen.cpp.obj", + "CPathFindPath.gen.cpp.obj", + "CPathNode.gen.cpp.obj", + "CPathVolume.gen.cpp.obj", + "CPathVolumeGroundPrio.gen.cpp.obj", + "PerModuleInline.gen.cpp.obj", + "CPathAsyncVolumeGeneration.cpp.obj", + "CPathDefines.cpp.obj", + "CPathDynamicObstacle.cpp.obj", + "CPathfinding.cpp.obj", + "CPathFindPath.cpp.obj", + "CPathNode.cpp.obj", + "CPathOctree.cpp.obj", + "CPathVolume.cpp.obj", + "CPathVolumeGroundPrio.cpp.obj" + ] } } \ No newline at end of file diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.dll.rsp b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.dll.rsp index cbdd7589..0586a7f6 100644 --- a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.dll.rsp +++ b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.dll.rsp @@ -37,23 +37,7 @@ /FUNCTIONPADMIN:6 /NOIMPLIB "..\Intermediate\Build\Win64\x64\UnrealEditor\Development\UnrealEd\SharedPCH.UnrealEd.Project.ValApi.Cpp20.InclOrderUnreal5_3.h.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathAsyncVolumeGeneration.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDefines.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDynamicObstacle.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathfinding.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathFindPath.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathNode.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathOctree.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolume.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolumeGroundPrio.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\PerModuleInline.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDefines.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDynamicObstacle.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathfinding.init.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathFindPath.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathNode.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolume.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolumeGroundPrio.gen.cpp.obj" +"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\Module.CPathfinding.cpp.obj" "..\Intermediate\Build\Win64\x64\UnrealEditor\Development\Default.rc2.res" "..\Intermediate\Build\Win64\x64\UnrealEditor\Development\CoreUObject\UnrealEditor-CoreUObject.lib" "..\Intermediate\Build\Win64\x64\UnrealEditor\Development\Engine\UnrealEditor-Engine.lib" diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp index c6acdcad12a188120a4c3fd438459cf93912950a..a16d023ce455c85ce495d17fa3049c83bffc674d 100644 GIT binary patch delta 23 fcmX@y#eBGnnJuM_iQ&z(iEK$sZ>DX`x_JZuZ*dAr delta 23 ecmX@y#eBGnnJuM_iNPa&B3lxZNBqXDn@0d(c?gsM diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib index 758e3ab3..71d8ac84 100644 --- a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib +++ b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63e8419c281fde9b9807c9f027f7223576cb47e6acaee335df5c5dfb215de55f +oid sha256:cf01a64ff5b3c42a37701d45ac680647703263640c64c45f37026eab0f5c26aa size 86112 diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib.rsp b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib.rsp index 47b5671d..7f403ae1 100644 --- a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib.rsp +++ b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib.rsp @@ -7,22 +7,6 @@ /IGNORE:4221 /NODEFAULTLIB "..\Intermediate\Build\Win64\x64\UnrealEditor\Development\UnrealEd\SharedPCH.UnrealEd.Project.ValApi.Cpp20.InclOrderUnreal5_3.h.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathAsyncVolumeGeneration.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDefines.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDynamicObstacle.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathfinding.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathFindPath.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathNode.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathOctree.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolume.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolumeGroundPrio.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\PerModuleInline.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDefines.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathDynamicObstacle.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathfinding.init.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathFindPath.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathNode.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolume.gen.cpp.obj" -"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\CPathVolumeGroundPrio.gen.cpp.obj" +"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\Module.CPathfinding.cpp.obj" "..\Intermediate\Build\Win64\x64\UnrealEditor\Development\Default.rc2.res" /OUT:"D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Intermediate\Build\Win64\x64\UnrealEditor\Development\CPathfinding\UnrealEditor-CPathfinding.lib" \ No newline at end of file