Finished SOArm100 UI

More merge conflicts. Taking main changes
This commit is contained in:
Behron 2025-04-08 23:30:55 -06:00
parent 60aaea751f
commit 4e1c6bf590
13 changed files with 38 additions and 51 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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\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

View File

@ -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"
]
}
}

View File

@ -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"

View File

@ -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"