LuckyRobots/LuckyWorld
14
0
Fork 0
Code Issues Pull Requests2 Actions Packages Projects1 Releases13 Wiki Activity

Finished fixing merge conflicts and touched up camera settings.

Browse Source 
More merge conflicts. Taking main changes then will integrate mine.
This commit is contained in:
Behron 2025-04-08 14:49:46 -06:00
parent a2ea69c469
commit 60aaea751f
2325 changed files with 137704 additions and 92 deletions
.idea
.idea.LuckyWorld/.idea
.gitignore.nameencodings.xmlindexLayout.xmlvcs.xml
.idea.Luckyrobots/.idea
.gitignore.nameencodings.xmlvcs.xml
Binaries
Mac
Luckyrobots-Mac-Shipping.target
Win64
LuckyrobotsEditor.targetUnrealEditor-Luckyrobots.dllUnrealEditor-Luckyrobots.expUnrealEditor-Luckyrobots.pdb
Config
DefaultEditor.iniDefaultGameplayTags.ini
Content
Blueprint
Core
BP_NaviSplineCreator.uassetBP_PickAndPlaceManager.uassetBP_PickAndPlaceTarget.uassetBP_RobotArmPlacementVolume.uassetBP_RobotArmRandomItemsVolume.uasset
DATA/datatables
DT_Furniture_Table.uassetDT_Level.uassetDT_MainBPCharacter.uasset
Game
BP_LuckyGameState.uassetBP_LuckyRobots.uasset
Mujoco
BP_MujocoSettingsStretchV1.uasset
RobotPawnActors
BP_DroneRobot.uassetBP_mujoco_SOArm100.uassetBP_mujokoStretch.uasset
State
ST_LuckyWorld.uasset
oldRobotsBP
BP_DJI_DroneMovementBluePrint.uasset
robotAccessoriesSensors
BP_CameraSensor.uasset
Developers
Bhrama
DT_LuckyStateTreeTags.uasset
Robots
BP_SoArm100.uasset
BP_SoArm100
Materials
MI_Black.uassetMI_Orange.uasset
Meshes
STL
Base.uassetBase_Motor.uassetBase_Motor_Mujoco.uassetBase_Mujoco.uassetFixed_Jaw.uassetFixed_Jaw_Collision_1.uassetFixed_Jaw_Collision_1_Mujoco.uassetFixed_Jaw_Collision_2.uassetFixed_Jaw_Collision_2_Mujoco.uassetFixed_Jaw_Motor.uassetFixed_Jaw_Motor_Mujoco.uassetFixed_Jaw_Mujoco.uassetLower_Arm.uassetLower_Arm_Motor.uassetLower_Arm_Motor_Mujoco.uassetLower_Arm_Mujoco.uassetMoving_Jaw.uassetMoving_Jaw_Collision_1.uassetMoving_Jaw_Collision_1_Mujoco.uassetMoving_Jaw_Collision_2.uassetMoving_Jaw_Collision_2_Mujoco.uassetMoving_Jaw_Collision_3.uassetMoving_Jaw_Collision_3_Mujoco.uassetMoving_Jaw_Mujoco.uassetRotation_Pitch.uassetRotation_Pitch_Motor.uassetRotation_Pitch_Motor_Mujoco.uassetRotation_Pitch_Mujoco.uassetUpper_Arm.uassetUpper_Arm_Motor.uassetUpper_Arm_Motor_Mujoco.uassetUpper_Arm_Mujoco.uassetWrist_Pitch_Roll.uassetWrist_Pitch_Roll_Motor.uassetWrist_Pitch_Roll_Motor_Mujoco.uassetWrist_Pitch_Roll_Mujoco.uasset
fixed_jaw_pad_1.uassetfixed_jaw_pad_1_Mujoco.uassetfixed_jaw_pad_2.uassetfixed_jaw_pad_2_Mujoco.uassetfixed_jaw_pad_3.uassetfixed_jaw_pad_3_Mujoco.uassetfixed_jaw_pad_4.uassetfixed_jaw_pad_4_Mujoco.uassetmoving_jaw_pad_1.uassetmoving_jaw_pad_1_Mujoco.uassetmoving_jaw_pad_2.uassetmoving_jaw_pad_2_Mujoco.uassetmoving_jaw_pad_3.uassetmoving_jaw_pad_3_Mujoco.uassetmoving_jaw_pad_4.uassetmoving_jaw_pad_4_Mujoco.uasset
Wdev/Robots
BP_Stretch.uasset
Levels/Office/AIUE5_vol11_04
materials
MI_AI_vol11_04_dial_02.uasset
mesh/NewinteractiblesOffice/Int_SM_AI_vol11_04_copier_1_1_new
LegoTest.uasset
Map
CleanTestMap.umapPickAndPlaceArmLevel.umap
Streamer
DynamicCameraRender.uasset
luckyBot/Luckywidget/ChildItems
LO_CameraSetting.uassetWB_CameraSetting.uassetWB_CameraSettings.uassetWB_ObjectsListCheckbox.uassetWB_SimplePick.uasset
Show More

13
.idea/.idea.LuckyWorld/.idea/.gitignore generated vendored Normal file

@ -0,0 +1,13 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/modules.xml
/projectSettingsUpdater.xml
/contentModel.xml
/.idea.LuckyWorld.iml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

1
.idea/.idea.LuckyWorld/.idea/.name generated Normal file

@ -0,0 +1 @@
LuckyWorld

4
.idea/.idea.LuckyWorld/.idea/encodings.xml generated Normal file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

8
.idea/.idea.LuckyWorld/.idea/indexLayout.xml generated Normal file

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

6
.idea/.idea.LuckyWorld/.idea/vcs.xml generated Normal file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

13
.idea/.idea.Luckyrobots/.idea/.gitignore generated vendored Normal file

@ -0,0 +1,13 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/modules.xml
/projectSettingsUpdater.xml
/.idea.Luckyrobots.iml
/contentModel.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

1
.idea/.idea.Luckyrobots/.idea/.name generated Normal file

@ -0,0 +1 @@
Luckyrobots

4
.idea/.idea.Luckyrobots/.idea/encodings.xml generated Normal file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

6
.idea/.idea.Luckyrobots/.idea/vcs.xml generated Normal file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

3552
Binaries/Mac/Luckyrobots-Mac-Shipping.target Normal file

File diff suppressed because it is too large Load Diff

35039
Binaries/Win64/LuckyrobotsEditor.target Normal file

File diff suppressed because it is too large Load Diff

BIN
Binaries/Win64/UnrealEditor-Luckyrobots.dll (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Binaries/Win64/UnrealEditor-Luckyrobots.exp Normal file

Binary file not shown.

BIN
Binaries/Win64/UnrealEditor-Luckyrobots.pdb (Stored with Git LFS) Normal file

Binary file not shown.

2
Config/DefaultEditor.ini

File diff suppressed because one or more lines are too long

3
Config/DefaultGameplayTags.ini

@ -5,8 +5,9 @@ ClearInvalidTags=False
AllowEditorTagUnloading=True
AllowGameTagUnloading=False
FastReplication=False
bDynamicReplication=False
InvalidTagCharacters="\"\',"
+GameplayTagTableList=/Game/ElectircDream/Audio/Soundscape/SoundscapeStates.SoundscapeStates
+GameplayTagTableList=/Game/Developers/Bhrama/DT_LuckyStateTreeTags.DT_LuckyStateTreeTags
NumBitsForContainerSize=6
NetIndexFirstBitSegment=16

BIN
Content/Blueprint/Core/BP_NaviSplineCreator.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/Core/BP_PickAndPlaceManager.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/Core/BP_PickAndPlaceTarget.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/Core/BP_RobotArmPlacementVolume.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/Core/BP_RobotArmRandomItemsVolume.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/DATA/datatables/DT_Furniture_Table.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/DATA/datatables/DT_Level.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/DATA/datatables/DT_MainBPCharacter.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/Game/BP_LuckyGameState.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/Game/BP_LuckyRobots.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/Mujoco/BP_MujocoSettingsStretchV1.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/RobotPawnActors/BP_mujoco_SOArm100.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/State/ST_LuckyWorld.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprint/robotAccessoriesSensors/BP_CameraSensor.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Developers/Bhrama/DT_LuckyStateTreeTags.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Materials/MI_Black.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Materials/MI_Orange.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Base.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Base_Motor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Base_Motor_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Base_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Collision_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Collision_1_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Collision_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Collision_2_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Motor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Motor_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Fixed_Jaw_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Lower_Arm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Lower_Arm_Motor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Lower_Arm_Motor_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Lower_Arm_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Collision_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Collision_1_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Collision_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Collision_2_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Collision_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Collision_3_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Moving_Jaw_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Rotation_Pitch.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Rotation_Pitch_Motor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Rotation_Pitch_Motor_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Rotation_Pitch_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Upper_Arm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Upper_Arm_Motor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Upper_Arm_Motor_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Upper_Arm_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Wrist_Pitch_Roll.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Wrist_Pitch_Roll_Motor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Wrist_Pitch_Roll_Motor_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/STL/Wrist_Pitch_Roll_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_1_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_2_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_3_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/fixed_jaw_pad_4_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_1_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_2_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_3_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Bhrama/Robots/BP_SoArm100/Meshes/moving_jaw_pad_4_Mujoco.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Developers/Wdev/Robots/BP_Stretch.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Levels/Office/AIUE5_vol11_04/materials/MI_AI_vol11_04_dial_02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Levels/Office/AIUE5_vol11_04/mesh/NewinteractiblesOffice/Int_SM_AI_vol11_04_copier_1_1_new/LegoTest.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Map/CleanTestMap.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Map/PickAndPlaceArmLevel.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Streamer/DynamicCameraRender.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/ChildItems/LO_CameraSetting.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/ChildItems/WB_CameraSetting.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/ChildItems/WB_CameraSettings.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/luckyBot/Luckywidget/ChildItems/WB_SimplePick.uasset (Stored with Git LFS)

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More