LuckyRobots/LuckyWorld
14
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects 1 Releases 13 Wiki Activity

More changes for SOArm100

Browse Source 
More merge conflicts
This commit is contained in:
Behron 2025-04-10 09:37:04 -06:00
parent 64e3d3ce20
commit 8b904426a9
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/.idea.Luckyrobots/.idea/workspace.xml generated
View File

@ -15,10 +15,12 @@
<component name="ChangeListManager">
<list default="true" id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="">
<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$/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/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" />
<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/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$/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/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.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.pdb" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -42,7 +44,7 @@
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="cidr-memory-view://12" root0="FORCE_HIGHLIGHTING" />
<setting file="cidr-memory-view://14" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Private/AI/PickAndPlaceUser.cpp" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Private/AI/Tasks/STT_PickAndPlace.cpp" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/LuckyMujoco/Private/Actors/MujocoVolumeActor.cpp" root0="FORCE_HIGHLIGHTING" />
@ -207,7 +209,7 @@
<workItem from="1744126161743" duration="605000" />
<workItem from="1744127162882" duration="5232000" />
<workItem from="1744156005223" duration="4822000" />
<workItem from="1744222869352" duration="16913000" />
<workItem from="1744222869352" duration="19167000" />
</task>
<servers />
</component>

BIN
Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/menu/WB_SelectGoalMenu_Camera.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp
View File

@ -1,6 +1,6 @@
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDefines.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathNode.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathFindPath.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolume.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDynamicObstacle.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathNode.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolumeGroundPrio.h