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

Workspace.xml changes

Browse Source 
re merge conflicts.
This commit is contained in:
Behron 2025-04-09 12:10:41 -06:00
parent 4e1c6bf590
commit 9f7023cfd5
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,18 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="" />
<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$/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/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/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" />
<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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -26,7 +37,7 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="cidr-memory-view://1" root0="FORCE_HIGHLIGHTING" />
<setting file="cidr-memory-view://2" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/include/mujoco/mjdata.h" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/include/mujoco/mjtnum.h" root0="SKIP_HIGHLIGHTING" />
</component>
@ -180,7 +191,7 @@
<workItem from="1743998849387" duration="7343000" />
<workItem from="1744126161743" duration="605000" />
<workItem from="1744127162882" duration="5232000" />
<workItem from="1744156005223" duration="2074000" />
<workItem from="1744156005223" duration="4174000" />
</task>
<servers />
</component>

BIN
Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll (Stored with Git LFS)
View File

Binary file not shown.

BIN
Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb (Stored with Git LFS)
View File

Binary file not shown.

8
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\CPathDynamicObstacle.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
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolumeGroundPrio.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDefines.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathFindPath.h
D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathNode.h

BIN
Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp
View File

Binary file not shown.

BIN
Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib (Stored with Git LFS)
View File

Binary file not shown.