Merge pull request 'martin' (#15) from martin into main

Reviewed-on: luckyrobots/LuckyRobotsUnreal#15
2025-04-08 04:03:37 +00:00 · 2025-04-08 04:03:37 +00:00 · 51a964c2f4
commit 51a964c2f4
parent 537443339d 3e85af79ae
120 changed files with 28 additions and 2 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -245,9 +245,9 @@ ManualIPAddress=

 [/Script/EngineSettings.GameMapsSettings]
 GameDefaultMap=/Game/Map/SelectLevel.SelectLevel
-GlobalDefaultGameMode=/Game/Blueprint/Game/BP_LuckyRobots.BP_LuckyRobots_C
+GlobalDefaultGameMode=/Game/GameBP/GameModes/BP_LuckyRobotsGameMode.BP_LuckyRobotsGameMode_C
 GlobalDefaultServerGameMode=/Game/luckyBot/blueprint/gameBP/luckycar.luckycar_C
-GameInstanceClass=/Game/Blueprint/Game/BP_LuckyGameinstanceMode.BP_LuckyGameinstanceMode_C
+GameInstanceClass=/Game/GameBP/Core/BP_LuckyRobotsGameInstance.BP_LuckyRobotsGameInstance_C
 EditorStartupMap=/Game/Map/SelectLevel.SelectLevel

 [/Script/LinuxTargetPlatform.LinuxTargetSettings]
--- a/Content/Blueprint/Core/BPI_PipeConnect.uasset
+++ b/Content/Blueprint/Core/BPI_PipeConnect.uasset
--- a/Content/Blueprint/Core/BP_3DtextHelp.uasset
+++ b/Content/Blueprint/Core/BP_3DtextHelp.uasset
--- a/Content/Blueprint/Core/BP_DrawrCabin.uasset
+++ b/Content/Blueprint/Core/BP_DrawrCabin.uasset
--- a/Content/Blueprint/Core/BP_ElbowPipe.uasset
+++ b/Content/Blueprint/Core/BP_ElbowPipe.uasset
--- a/Content/Blueprint/Core/BP_EndPipeMujoco.uasset
+++ b/Content/Blueprint/Core/BP_EndPipeMujoco.uasset
--- a/Content/Blueprint/Core/BP_LampButton.uasset
+++ b/Content/Blueprint/Core/BP_LampButton.uasset
--- a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset
+++ b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset
--- a/Content/Blueprint/Core/BP_PipeMujoco.uasset
+++ b/Content/Blueprint/Core/BP_PipeMujoco.uasset
--- a/Content/Blueprint/Core/BP_PipeTeeElbowMujoco2.uasset
+++ b/Content/Blueprint/Core/BP_PipeTeeElbowMujoco2.uasset
--- a/Content/Blueprint/Core/BP_PipeTeeMujoco.uasset
+++ b/Content/Blueprint/Core/BP_PipeTeeMujoco.uasset
--- a/Content/Blueprint/Core/BP_StoveButton.uasset
+++ b/Content/Blueprint/Core/BP_StoveButton.uasset
--- a/Content/Blueprint/Core/BP_ToHoldItem.uasset
+++ b/Content/Blueprint/Core/BP_ToHoldItem.uasset
--- a/Content/Blueprint/Core/BP_allObjectCreate.uasset
+++ b/Content/Blueprint/Core/BP_allObjectCreate.uasset
--- a/Content/Blueprint/Core/BP_drawing.uasset
+++ b/Content/Blueprint/Core/BP_drawing.uasset
--- a/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset
+++ b/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset
--- a/Content/Blueprint/DATA/structures/FAllTransformCaptureStruct.uasset
+++ b/Content/Blueprint/DATA/structures/FAllTransformCaptureStruct.uasset
--- a/Content/Blueprint/DATA/structures/FPipeType.uasset
+++ b/Content/Blueprint/DATA/structures/FPipeType.uasset
--- a/Content/Blueprint/Game/BP_LuckyGameState.uasset
+++ b/Content/Blueprint/Game/BP_LuckyGameState.uasset
--- a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset
+++ b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset
--- a/Content/Blueprint/Game/BP_LuckyRobots.uasset
+++ b/Content/Blueprint/Game/BP_LuckyRobots.uasset
--- a/Content/Blueprint/Game/BP_LuckybotGameMode.uasset
+++ b/Content/Blueprint/Game/BP_LuckybotGameMode.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_HumanoidRobot.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_HumanoidRobot.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_MujocoBostonDynamicsSpotWithArm.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_MujocoBostonDynamicsSpotWithArm.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_MujocoUnitreeGo2.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_MujocoUnitreeGo2.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_PuralinkRobot.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_PuralinkRobot.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_RevoluteRobot.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_RevoluteRobot.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_SelectScreenChar.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_SelectScreenChar.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_WheeledRobot.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_WheeledRobot.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_WheeledRobotStatic.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_WheeledRobotStatic.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_mujokoArm.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_mujokoArm.uasset
--- a/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset
+++ b/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset
--- a/Content/Blueprint/component/BPC_Capture.uasset
+++ b/Content/Blueprint/component/BPC_Capture.uasset
--- a/Content/Blueprint/component/BPC_DataTrasnfer.uasset
+++ b/Content/Blueprint/component/BPC_DataTrasnfer.uasset
--- a/Content/Blueprint/component/BPC_FlyingRobots.uasset
+++ b/Content/Blueprint/component/BPC_FlyingRobots.uasset
--- a/Content/Blueprint/component/BPC_FourLeggedRobots.uasset
+++ b/Content/Blueprint/component/BPC_FourLeggedRobots.uasset
--- a/Content/Blueprint/component/BPC_NaviPoint.uasset
+++ b/Content/Blueprint/component/BPC_NaviPoint.uasset
--- a/Content/Blueprint/component/BPC_StationaryRobots.uasset
+++ b/Content/Blueprint/component/BPC_StationaryRobots.uasset
--- a/Content/Blueprint/component/BPC_TwoLeggedRobots.uasset
+++ b/Content/Blueprint/component/BPC_TwoLeggedRobots.uasset
--- a/Content/Blueprint/component/BPC_WheeledRobots.uasset
+++ b/Content/Blueprint/component/BPC_WheeledRobots.uasset
--- a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset
+++ b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset
--- a/Content/Blueprint/oldRobotsBP/BP_WheeledRobot.uasset
+++ b/Content/Blueprint/oldRobotsBP/BP_WheeledRobot.uasset
--- a/Content/Blueprint/oldRobotsBP/BP_WheeledRobotStatic.uasset
+++ b/Content/Blueprint/oldRobotsBP/BP_WheeledRobotStatic.uasset
--- a/Content/Blueprint/oldRobotsBP/BP_WheeledRobot_OneArm.uasset
+++ b/Content/Blueprint/oldRobotsBP/BP_WheeledRobot_OneArm.uasset
--- a/Content/Blueprint/robotAccessoriesSensors/BP_CameraSensor.uasset
+++ b/Content/Blueprint/robotAccessoriesSensors/BP_CameraSensor.uasset
--- a/Content/Blueprint/robotAccessoriesSensors/BP_IMUSensor.uasset
+++ b/Content/Blueprint/robotAccessoriesSensors/BP_IMUSensor.uasset
--- a/Content/Blueprint/robotAccessoriesSensors/BP_LidarSensor.uasset
+++ b/Content/Blueprint/robotAccessoriesSensors/BP_LidarSensor.uasset
--- a/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset
+++ b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset
--- a/Content/Cinematic/1_House_ObjectColor.umap
+++ b/Content/Cinematic/1_House_ObjectColor.umap
--- a/Content/Cinematic/1_House_cinematic.umap
+++ b/Content/Cinematic/1_House_cinematic.umap
--- a/Content/GameBP/BP_LuckyRobotsPlayerController.uasset
+++ b/Content/GameBP/BP_LuckyRobotsPlayerController.uasset
--- a/Content/GameBP/Controllers/BP_LuckyRobotsPlayerController.uasset
+++ b/Content/GameBP/Controllers/BP_LuckyRobotsPlayerController.uasset
--- a/Content/GameBP/Core/BP_LuckyRobotsGameInstance.uasset
+++ b/Content/GameBP/Core/BP_LuckyRobotsGameInstance.uasset
--- a/Content/GameBP/FunctionLibraries/BP_LuckyRobotsLibrary.uasset
+++ b/Content/GameBP/FunctionLibraries/BP_LuckyRobotsLibrary.uasset
--- a/Content/GameBP/GameModes/BP_LuckyRobotsGameMode.uasset
+++ b/Content/GameBP/GameModes/BP_LuckyRobotsGameMode.uasset
--- a/Content/GameBP/GameModes/BP_LuckyRobotsGameState.uasset
+++ b/Content/GameBP/GameModes/BP_LuckyRobotsGameState.uasset
--- a/Content/GameBP/Lobby/BP_LobbyGameMode.uasset
+++ b/Content/GameBP/Lobby/BP_LobbyGameMode.uasset
--- a/Content/GameBP/Lobby/BP_LobbyPlayerController.uasset
+++ b/Content/GameBP/Lobby/BP_LobbyPlayerController.uasset
--- a/Content/luckyBot/Luckywidget/WB_MainScreen.uasset
+++ b/Content/luckyBot/Luckywidget/WB_MainScreen.uasset
--- a/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset
+++ b/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset
--- a/Content/GameBP/UI/WB_GameWidget.uasset
+++ b/Content/GameBP/UI/WB_GameWidget.uasset
--- a/Content/Levels/House01/Maps/LoftLevel.umap
+++ b/Content/Levels/House01/Maps/LoftLevel.umap
--- a/Content/Levels/House05/Maps/IstanbulLevel.umap
+++ b/Content/Levels/House05/Maps/IstanbulLevel.umap
--- a/Content/Map/SelectLevel.umap
+++ b/Content/Map/SelectLevel.umap
--- a/Content/Map/Test_Level.umap
+++ b/Content/Map/Test_Level.umap
--- a/Content/Map/new_map.umap
+++ b/Content/Map/new_map.umap
--- a/Content/Map/simpleTestMap.umap
+++ b/Content/Map/simpleTestMap.umap
--- a/Content/luckyBot/Luckywidget/ChildItems/BP_goolinterface.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/BP_goolinterface.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/ListBoxItemUIMoveTo.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/ListBoxItemUIMoveTo.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/LogItemStruct.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/LogItemStruct.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/PauseResetWidget.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/PauseResetWidget.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_GrabAndPull.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_GrabAndPull.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_ListBoxItemUIMoveTo.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_ListBoxItemUIMoveTo.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_NavigateSimpleEnvironments.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_NavigateSimpleEnvironments.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectListBox1.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectListBox1.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListBox.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListBox.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_PickAndPlace.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_PickAndPlace.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_SimplePick.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_SimplePick.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_SimplePlace.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_SimplePlace.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/WB_TaskListBox.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/WB_TaskListBox.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/captureItemWidget.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/captureItemWidget.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/goalsInterface.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/goalsInterface.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/listBoxInterface.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/listBoxInterface.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/logItemWidget.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/logItemWidget.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/menuTitle.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/menuTitle.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/objectsListCheckbox.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/objectsListCheckbox.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/objectsListItem.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/objectsListItem.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/widget_NavigateSimpleEnvironments.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/widget_NavigateSimpleEnvironments.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/widget_PickAndPlace.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/widget_PickAndPlace.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/widget_SimplePick.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/widget_SimplePick.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/widget_SimplePlace.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/widget_SimplePlace.uasset
--- a/Content/luckyBot/Luckywidget/ChildItems/widget_grabAndPull.uasset
+++ b/Content/luckyBot/Luckywidget/ChildItems/widget_grabAndPull.uasset
--- a/Content/luckyBot/Luckywidget/EUW_PipeEditor.uasset
+++ b/Content/luckyBot/Luckywidget/EUW_PipeEditor.uasset
--- a/Content/luckyBot/Luckywidget/InGameWidget1.uasset
+++ b/Content/luckyBot/Luckywidget/InGameWidget1.uasset
--- a/Content/luckyBot/Luckywidget/Style/W_LuckyStartSelectChar_Layout.uasset
+++ b/Content/luckyBot/Luckywidget/Style/W_LuckyStartSelectChar_Layout.uasset
--- a/Content/luckyBot/Luckywidget/Style/W_luckyButton.uasset
+++ b/Content/luckyBot/Luckywidget/Style/W_luckyButton.uasset
--- a/Content/luckyBot/Luckywidget/Style/W_luckyCheckBoxLayout.uasset
+++ b/Content/luckyBot/Luckywidget/Style/W_luckyCheckBoxLayout.uasset
--- a/Content/luckyBot/Luckywidget/Style/W_luckyTextFieldLayout.uasset
+++ b/Content/luckyBot/Luckywidget/Style/W_luckyTextFieldLayout.uasset
--- a/Show More
+++ b/Show More