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

Fixing merge conflicts

Browse Source 
Finish merge conflicts
This commit is contained in:
Behron 2025-04-08 23:38:49 -06:00
parent 271315f69b
commit a2ea69c469
29 changed files with 225 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/.idea.Luckyrobots/.idea/indexLayout.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

7
.idea/.idea.Luckyrobots/.idea/projectSettingsUpdater.xml generated Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="singleClickDiffPreview" value="1" />
<option name="vcsConfiguration" value="3" />
</component>
</project>

194
.idea/.idea.Luckyrobots/.idea/workspace.xml generated Normal file
View File

@ -0,0 +1,194 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoGeneratedRunConfigurationManager">
<projectFile profileName="EpicGames.AspNet">E:/EpicGames/UE5_5/Engine/Source/Programs/Shared/EpicGames.AspNet/EpicGames.AspNet.csproj</projectFile>
<projectFile kind="Docker">E:/EpicGames/UE5_5/Engine/Source/Programs/Shared/EpicGames.Perforce.Fixture/EpicGames.Perforce.Fixture.csproj</projectFile>
<projectFile>F:/EpicGames/UE_5.5/Engine/Source/Programs/AutomationTool/AutomationTool.csproj</projectFile>
<projectFile kind="Docker">F:/EpicGames/UE_5.5/Engine/Source/Programs/Shared/EpicGames.Perforce.Fixture/EpicGames.Perforce.Fixture.csproj</projectFile>
<projectFile>F:/EpicGames/UE_5.5/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.csproj</projectFile>
<projectFile>Intermediate/ProjectFiles/Luckyrobots.vcxproj</projectFile>
<projectFile>Intermediate/ProjectFiles/UE5.vcxproj</projectFile>
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DpaMonitoringSettings">
<option name="firstShow" value="false" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="cidr-memory-view://1" 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>
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 4
}</component>
<component name="ProjectId" id="2um34SHzT4B8sGgIUSIbpAfa7CH" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;C/C++ Project.Luckyrobots.executor&quot;: &quot;Debug&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;bg__add__armandpathfinding&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
<component name="RunManager" selected="C/C++ Project.Luckyrobots">
<configuration name="Luckyrobots" type="CppProject" factoryName="C++ Project">
<configuration_1 setup="1">
<option name="CONFIGURATION" value="Development_Editor" />
<option name="PLATFORM" value="x64" />
<option name="CURRENT_LAUNCH_PROFILE" value="Local" />
<option name="EXE_PATH" value="$(LocalDebuggerCommand)" />
<option name="PROGRAM_PARAMETERS" value="$(LocalDebuggerCommandArguments)" />
<option name="WORKING_DIRECTORY" value="$(LocalDebuggerWorkingDirectory)" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/Intermediate/ProjectFiles/Luckyrobots.vcxproj" />
</configuration_1>
<option name="DEFAULT_PROJECT_PATH" value="$PROJECT_DIR$/Intermediate/ProjectFiles/Luckyrobots.vcxproj" />
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/Intermediate/ProjectFiles/Luckyrobots.vcxproj" />
<option name="AUTO_SELECT_PRIORITY" value="10010" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="UE5" type="CppProject" factoryName="C++ Project">
<option name="DEFAULT_PROJECT_PATH" value="$PROJECT_DIR$/Intermediate/ProjectFiles/UE5.vcxproj" />
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/Intermediate/ProjectFiles/UE5.vcxproj" />
<option name="AUTO_SELECT_PRIORITY" value="10000" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="AutomationTool" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="F:/EpicGames/UE_5.5/Engine/Source/Programs/AutomationTool/AutomationTool.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
<option name="PROJECT_KIND" value="DotNetCore" />
<option name="PROJECT_TFM" value="" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="UnrealBuildTool" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="F:/EpicGames/UE_5.5/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
<option name="PROJECT_KIND" value="DotNetCore" />
<option name="PROJECT_TFM" value="" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="EpicGames.AspNet" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="E:/EpicGames/UE5_5/Engine/Source/Programs/Shared/EpicGames.AspNet/EpicGames.AspNet.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net8.0" />
<option name="LAUNCH_PROFILE_NAME" value="EpicGames.AspNet" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="EpicGames.Perforce.Fixture/Dockerfile (1)" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="containerName" value="epicgames.perforce.fixture" />
<option name="contextFolderPath" value="D:\Projects\luckyworld\luckyworld" />
<option name="sourceFilePath" value="E:/EpicGames/UE5_5/Engine/Source/Programs/Shared/EpicGames.Perforce.Fixture/Dockerfile" />
</settings>
</deployment>
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2" />
</configuration>
<configuration name="EpicGames.Perforce.Fixture/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="containerName" value="epicgames.perforce.fixture" />
<option name="contextFolderPath" value="D:\Projects\luckyworld\luckyworld" />
<option name="sourceFilePath" value="F:/EpicGames/UE_5.5/Engine/Source/Programs/Shared/EpicGames.Perforce.Fixture/Dockerfile" />
</settings>
</deployment>
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2" />
</configuration>
<configuration default="true" type="docker-deploy" factoryName="dockerfile" temporary="true">
<deployment type="dockerfile">
<settings />
</deployment>
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2" />
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="" />
<created>1742839732908</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1742839732908</updated>
<workItem from="1742839733597" duration="216000" />
<workItem from="1742839966093" duration="4945000" />
<workItem from="1742922967503" duration="4476000" />
<workItem from="1742939003799" duration="3205000" />
<workItem from="1743200855511" duration="3680000" />
<workItem from="1743436527286" duration="6219000" />
<workItem from="1743522027071" duration="36604000" />
<workItem from="1743998849387" duration="7343000" />
<workItem from="1744126161743" duration="605000" />
<workItem from="1744127162882" duration="5232000" />
<workItem from="1744156005223" duration="2074000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
</project>

BIN
Binaries/Mac/libboost_atomic-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_chrono-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_filesystem-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_iostreams-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_program_options-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_python311-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_regex-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_system-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libboost_thread-mt-a64.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/libmujoco.3.2.7.dylib
View File

Binary file not shown.

BIN
Binaries/Mac/mujoco.dylib
View File

Binary file not shown.

BIN
Binaries/Win64/mujoco.dll (Stored with Git LFS)
View File

Binary file not shown.

7
Plugins/AsyncLoac1ceae7b44acV11/Binaries/Win64/UnrealEditor.modules
View File

@ -1,7 +0,0 @@
{
"BuildId": "37670630",
"Modules":
{
"AsyncLoadingScreen": "UnrealEditor-AsyncLoadingScreen.dll"
}
}

7
Plugins/BlueprintJson/Binaries/Win64/UnrealEditor.modules
View File

@ -1,7 +0,0 @@
{
"BuildId": "37670630",
"Modules":
{
"BlueprintJson": "UnrealEditor-BlueprintJson.dll"
}
}

7
Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor.modules
View File

@ -1,7 +0,0 @@
{
"BuildId": "37670630",
"Modules":
{
"FileHelper": "UnrealEditor-FileHelper.dll"
}
}

BIN
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_1.exe (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_1.exp Normal file
View File

Binary file not shown.

BIN
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.patch_1.pdb (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.patch_0.exe (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.patch_0.exp Normal file
View File

Binary file not shown.

BIN
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.patch_0.pdb (Stored with Git LFS) Normal file
View File

Binary file not shown.

2
Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor.modules
View File

@ -1,5 +1,5 @@
{
"BuildId": "37670630",
"BuildId": "827e4aed-aff1-4853-85bd-51def0d581c9",
"Modules":
{
"LuckyMujoco": "UnrealEditor-LuckyMujoco.dll",

7
Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor.modules
View File

@ -1,7 +0,0 @@
{
"BuildId": "37670630",
"Modules":
{
"LuckyTextWrite": "UnrealEditor-LuckyTextWrite.dll"
}
}

BIN
Plugins/Marketplace/FSR3-550/FSR3/Binaries/Win64/UnrealEditor-FFXFSR3Settings.pdb (Stored with Git LFS) Normal file
View File

Binary file not shown.

11
Plugins/SocketIOClient/Binaries/Win64/UnrealEditor.modules
View File

@ -1,11 +0,0 @@
{
"BuildId": "37670630",
"Modules":
{
"CoreUtility": "UnrealEditor-CoreUtility.dll",
"SIOJEditorPlugin": "UnrealEditor-SIOJEditorPlugin.dll",
"SIOJson": "UnrealEditor-SIOJson.dll",
"SocketIOClient": "UnrealEditor-SocketIOClient.dll",
"SocketIOLib": "UnrealEditor-SocketIOLib.dll"
}
}

8
Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor.modules
View File

@ -1,8 +0,0 @@
{
"BuildId": "37670630",
"Modules":
{
"VaRest": "UnrealEditor-VaRest.dll",
"VaRestEditor": "UnrealEditor-VaRestEditor.dll"
}
}