diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 234801e..b671d1b 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -13,7 +13,7 @@ bSupportsLandscapeLeftOrientation=True PreferredLandscapeOrientation=LandscapeLeft [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Levels/index.index +EditorStartupMap=/Game/Levels/Hangar_2.Hangar_2 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C GameDefaultMap=/Game/Levels/index.index bUseSplitscreen=False @@ -108,7 +108,7 @@ RagdollAggregateThreshold=4 TriangleMeshTriangleMinAreaThreshold=5.000000 bEnableAsyncScene=False bEnableShapeSharing=False -bEnablePCM=True +bEnablePCM=False bEnableStabilization=False bWarnMissingLocks=True bEnable2DPhysics=False @@ -119,8 +119,8 @@ BounceThresholdVelocity=200.000000 FrictionCombineMode=Average RestitutionCombineMode=Average MaxAngularVelocity=3600.000000 -MaxDepenetrationVelocity=0.000000 -ContactOffsetMultiplier=0.020000 +MaxDepenetrationVelocity=100.000000 +ContactOffsetMultiplier=2.000000 MinContactOffset=2.000000 MaxContactOffset=8.000000 bSimulateSkeletalMeshOnDedicatedServer=True @@ -133,9 +133,9 @@ bDisableKinematicStaticPairs=False bDisableKinematicKinematicPairs=False bDisableCCD=False bEnableEnhancedDeterminism=False -MaxPhysicsDeltaTime=0.033333 -bSubstepping=False -bSubsteppingAsync=False +MaxPhysicsDeltaTime=0.030000 +bSubstepping=True +bSubsteppingAsync=True MaxSubstepDeltaTime=0.016667 MaxSubsteps=6 SyncSceneSmoothingFactor=0.000000 diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index f2d8781..8d70dc0 100644 Binary files a/Config/DefaultInput.ini and b/Config/DefaultInput.ini differ diff --git a/Content/Architecture/Warehouse/Materials/papelao_Mat.uasset b/Content/Architecture/Warehouse/Materials/papelao_Mat.uasset index 623b101..efd3254 100644 Binary files a/Content/Architecture/Warehouse/Materials/papelao_Mat.uasset and b/Content/Architecture/Warehouse/Materials/papelao_Mat.uasset differ diff --git a/Content/Architecture/Warehouse/Props/DEC_Little_Truck.uasset b/Content/Architecture/Warehouse/Props/DEC_Little_Truck.uasset index e3d7089..dccb497 100644 Binary files a/Content/Architecture/Warehouse/Props/DEC_Little_Truck.uasset and b/Content/Architecture/Warehouse/Props/DEC_Little_Truck.uasset differ diff --git a/Content/Architecture/Warehouse/Props/DEC_caixa_papelao_aberta.uasset b/Content/Architecture/Warehouse/Props/DEC_caixa_papelao_aberta.uasset index 34a1dbe..e92448e 100644 Binary files a/Content/Architecture/Warehouse/Props/DEC_caixa_papelao_aberta.uasset and b/Content/Architecture/Warehouse/Props/DEC_caixa_papelao_aberta.uasset differ diff --git a/Content/Blueprints/BP_Engine.uasset b/Content/Blueprints/BP_Engine.uasset index 94fa8fd..2387470 100644 Binary files a/Content/Blueprints/BP_Engine.uasset and b/Content/Blueprints/BP_Engine.uasset differ diff --git a/Content/Blueprints/NewBlueprint.uasset b/Content/Blueprints/NewBlueprint.uasset new file mode 100644 index 0000000..875c5ae Binary files /dev/null and b/Content/Blueprints/NewBlueprint.uasset differ diff --git a/Content/Blueprints/Player/GetSome.uasset b/Content/Blueprints/Player/GetSome.uasset index e98c9c2..a9844b8 100644 Binary files a/Content/Blueprints/Player/GetSome.uasset and b/Content/Blueprints/Player/GetSome.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_MotionController.uasset b/Content/Blueprints/Player/VR/BP_MotionController.uasset index f659bff..440f506 100644 Binary files a/Content/Blueprints/Player/VR/BP_MotionController.uasset and b/Content/Blueprints/Player/VR/BP_MotionController.uasset differ diff --git a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset index fd5d04a..efd4471 100644 Binary files a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset and b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset differ diff --git a/Content/Blueprints/ScrewKey.uasset b/Content/Blueprints/ScrewKey.uasset index b1e5d2d..0d0a8e6 100644 Binary files a/Content/Blueprints/ScrewKey.uasset and b/Content/Blueprints/ScrewKey.uasset differ diff --git a/Content/Blueprints/TankEngine.uasset b/Content/Blueprints/TankEngine.uasset index 715fd73..9b7d2c2 100644 Binary files a/Content/Blueprints/TankEngine.uasset and b/Content/Blueprints/TankEngine.uasset differ diff --git a/Content/Blueprints/UI/Materials/BigCircleDecal.uasset b/Content/Blueprints/UI/Materials/BigCircleDecal.uasset index 84a2ff1..487ac86 100644 Binary files a/Content/Blueprints/UI/Materials/BigCircleDecal.uasset and b/Content/Blueprints/UI/Materials/BigCircleDecal.uasset differ diff --git a/Content/Blueprints/UI/Other/Daskboard.uasset b/Content/Blueprints/UI/Other/Daskboard.uasset index 70d2262..f1ea690 100644 Binary files a/Content/Blueprints/UI/Other/Daskboard.uasset and b/Content/Blueprints/UI/Other/Daskboard.uasset differ diff --git a/Content/Blueprints/UI/Wbps/VRSlateMainTank.uasset b/Content/Blueprints/UI/Wbps/VRSlateMainTank.uasset index 87bad68..c02f445 100644 Binary files a/Content/Blueprints/UI/Wbps/VRSlateMainTank.uasset and b/Content/Blueprints/UI/Wbps/VRSlateMainTank.uasset differ diff --git a/Content/Blueprints/UI/Wbps/VRSlateStart.uasset b/Content/Blueprints/UI/Wbps/VRSlateStart.uasset index 67ccdc1..448653e 100644 Binary files a/Content/Blueprints/UI/Wbps/VRSlateStart.uasset and b/Content/Blueprints/UI/Wbps/VRSlateStart.uasset differ diff --git a/Content/Blueprints/UI/imgs/TankEngine.uasset b/Content/Blueprints/UI/imgs/TankEngine.uasset new file mode 100644 index 0000000..416d568 Binary files /dev/null and b/Content/Blueprints/UI/imgs/TankEngine.uasset differ diff --git a/Content/Blueprints/randomSpawner.uasset b/Content/Blueprints/randomSpawner.uasset new file mode 100644 index 0000000..c2703bc Binary files /dev/null and b/Content/Blueprints/randomSpawner.uasset differ diff --git a/Content/Levels/Hangar_2.umap b/Content/Levels/Hangar_2.umap index 549dba5..520e8bc 100644 Binary files a/Content/Levels/Hangar_2.umap and b/Content/Levels/Hangar_2.umap differ diff --git a/Content/Materials/Physics/Carton.uasset b/Content/Materials/Physics/Carton.uasset new file mode 100644 index 0000000..fb49c92 Binary files /dev/null and b/Content/Materials/Physics/Carton.uasset differ diff --git a/Content/Materials/Physics/Steel.uasset b/Content/Materials/Physics/Steel.uasset new file mode 100644 index 0000000..cc71afc Binary files /dev/null and b/Content/Materials/Physics/Steel.uasset differ diff --git a/Content/Meshes/Tank/SM_T72VZ_Nut.uasset b/Content/Meshes/Tank/SM_T72VZ_Nut.uasset new file mode 100644 index 0000000..d17fecd Binary files /dev/null and b/Content/Meshes/Tank/SM_T72VZ_Nut.uasset differ diff --git a/Content/VirtualReality/Mannequin/Animations/NutPose1.uasset b/Content/VirtualReality/Mannequin/Animations/NutPose1.uasset new file mode 100644 index 0000000..0e7acd7 Binary files /dev/null and b/Content/VirtualReality/Mannequin/Animations/NutPose1.uasset differ diff --git a/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset b/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset index ea6581f..5567336 100644 Binary files a/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset and b/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset differ diff --git a/Content/VirtualReality/Mannequin/Animations/ValGrab.uasset b/Content/VirtualReality/Mannequin/Animations/ValGrab.uasset new file mode 100644 index 0000000..9d9aab0 Binary files /dev/null and b/Content/VirtualReality/Mannequin/Animations/ValGrab.uasset differ diff --git a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset index 02ce552..069efd1 100644 Binary files a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset and b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset differ diff --git a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset index b89dd0a..04688c2 100644 Binary files a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset and b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset differ diff --git a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset index fbbc631..7ce94cb 100644 Binary files a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset and b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset differ