diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 68ac0ce..67aa4f0 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -53,51 +53,6 @@ UIScaleCurve=(EditorCurveData=(PreInfinityExtrap=RCCE_Constant,PostInfinityExtra NearClipPlane=1.000000 bSmoothFrameRate=False -[/Script/Engine.PhysicsSettings] -DefaultGravityZ=-980.000000 -DefaultTerminalVelocity=4000.000000 -DefaultFluidFriction=0.300000 -SimulateScratchMemorySize=262144 -RagdollAggregateThreshold=4 -TriangleMeshTriangleMinAreaThreshold=5.000000 -bEnableAsyncScene=False -bEnableShapeSharing=False -bEnablePCM=True -bEnableStabilization=False -bWarnMissingLocks=True -bEnable2DPhysics=False -PhysicErrorCorrection=(PingExtrapolation=0.100000,PingLimit=100.000000,ErrorPerLinearDifference=1.000000,ErrorPerAngularDifference=1.000000,MaxRestoredStateError=1.000000,MaxLinearHardSnapDistance=400.000000,PositionLerp=0.000000,AngleLerp=0.400000,LinearVelocityCoefficient=100.000000,AngularVelocityCoefficient=10.000000,ErrorAccumulationSeconds=0.500000,ErrorAccumulationDistanceSq=15.000000,ErrorAccumulationSimilarity=100.000000) -LockedAxis=Invalid -DefaultDegreesOfFreedom=Full3D -BounceThresholdVelocity=200.000000 -FrictionCombineMode=Average -RestitutionCombineMode=Average -MaxAngularVelocity=3600.000000 -MaxDepenetrationVelocity=0.000000 -ContactOffsetMultiplier=0.020000 -MinContactOffset=2.000000 -MaxContactOffset=8.000000 -bSimulateSkeletalMeshOnDedicatedServer=True -DefaultShapeComplexity=CTF_UseSimpleAndComplex -bDefaultHasComplexCollision=True -bSuppressFaceRemapTable=False -bSupportUVFromHitResults=False -bDisableActiveActors=False -bDisableKinematicStaticPairs=False -bDisableKinematicKinematicPairs=False -bDisableCCD=False -bEnableEnhancedDeterminism=False -MaxPhysicsDeltaTime=0.033333 -bSubstepping=False -bSubsteppingAsync=False -MaxSubstepDeltaTime=0.016667 -MaxSubsteps=6 -SyncSceneSmoothingFactor=0.000000 -AsyncSceneSmoothingFactor=0.990000 -InitialAverageFrameRate=0.016667 -PhysXTreeRebuildRate=10 -DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2) - [/Script/Engine.CollisionProfile] -Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) -Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) @@ -143,4 +98,47 @@ DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") - +[/Script/Engine.PhysicsSettings] +DefaultGravityZ=-980.000000 +DefaultTerminalVelocity=4000.000000 +DefaultFluidFriction=0.300000 +SimulateScratchMemorySize=262144 +RagdollAggregateThreshold=4 +TriangleMeshTriangleMinAreaThreshold=5.000000 +bEnableAsyncScene=False +bEnableShapeSharing=False +bEnablePCM=True +bEnableStabilization=False +bWarnMissingLocks=True +bEnable2DPhysics=False +PhysicErrorCorrection=(PingExtrapolation=0.100000,PingLimit=100.000000,ErrorPerLinearDifference=1.000000,ErrorPerAngularDifference=1.000000,MaxRestoredStateError=1.000000,MaxLinearHardSnapDistance=400.000000,PositionLerp=0.000000,AngleLerp=0.400000,LinearVelocityCoefficient=100.000000,AngularVelocityCoefficient=10.000000,ErrorAccumulationSeconds=0.500000,ErrorAccumulationDistanceSq=15.000000,ErrorAccumulationSimilarity=100.000000) +LockedAxis=Invalid +DefaultDegreesOfFreedom=Full3D +BounceThresholdVelocity=200.000000 +FrictionCombineMode=Average +RestitutionCombineMode=Average +MaxAngularVelocity=3600.000000 +MaxDepenetrationVelocity=0.000000 +ContactOffsetMultiplier=0.020000 +MinContactOffset=2.000000 +MaxContactOffset=8.000000 +bSimulateSkeletalMeshOnDedicatedServer=True +DefaultShapeComplexity=CTF_UseSimpleAndComplex +bDefaultHasComplexCollision=True +bSuppressFaceRemapTable=False +bSupportUVFromHitResults=False +bDisableActiveActors=False +bDisableKinematicStaticPairs=False +bDisableKinematicKinematicPairs=False +bDisableCCD=False +bEnableEnhancedDeterminism=False +MaxPhysicsDeltaTime=0.033333 +bSubstepping=False +bSubsteppingAsync=False +MaxSubstepDeltaTime=0.016667 +MaxSubsteps=6 +SyncSceneSmoothingFactor=0.000000 +AsyncSceneSmoothingFactor=0.990000 +InitialAverageFrameRate=0.016667 +PhysXTreeRebuildRate=10 +DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2) diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index b696140..f2d8781 100644 Binary files a/Config/DefaultInput.ini and b/Config/DefaultInput.ini differ diff --git a/Content/Architecture/Warehouse/Props/DEC_Little_Truck.uasset b/Content/Architecture/Warehouse/Props/DEC_Little_Truck.uasset index 0cd0458..e3d7089 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_prateleira_1.uasset b/Content/Architecture/Warehouse/Props/DEC_prateleira_1.uasset index c785ef9..0a73e6f 100644 Binary files a/Content/Architecture/Warehouse/Props/DEC_prateleira_1.uasset and b/Content/Architecture/Warehouse/Props/DEC_prateleira_1.uasset differ diff --git a/Content/Assets/Underground_Bunker/Meshes/Lighting/FloodLight_02.uasset b/Content/Assets/Underground_Bunker/Meshes/Lighting/FloodLight_02.uasset index 7436d3a..7544659 100644 Binary files a/Content/Assets/Underground_Bunker/Meshes/Lighting/FloodLight_02.uasset and b/Content/Assets/Underground_Bunker/Meshes/Lighting/FloodLight_02.uasset differ diff --git a/Content/Blueprints/BP_Engine.uasset b/Content/Blueprints/BP_Engine.uasset index d6240ca..f42c717 100644 Binary files a/Content/Blueprints/BP_Engine.uasset and b/Content/Blueprints/BP_Engine.uasset differ diff --git a/Content/Blueprints/BP_Helicopter1.uasset b/Content/Blueprints/BP_Helicopter1.uasset index 61ef044..93e112b 100644 Binary files a/Content/Blueprints/BP_Helicopter1.uasset and b/Content/Blueprints/BP_Helicopter1.uasset differ diff --git a/Content/Blueprints/Player/GS1.uasset b/Content/Blueprints/Player/GS1.uasset index 9ccfd2b..b355cab 100644 Binary files a/Content/Blueprints/Player/GS1.uasset and b/Content/Blueprints/Player/GS1.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_MotionController.uasset b/Content/Blueprints/Player/VR/BP_MotionController.uasset index f61ae64..9191c1e 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 d612c81..d51645a 100644 Binary files a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset and b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset differ diff --git a/Content/Blueprints/Player/VR/VRPC.uasset b/Content/Blueprints/Player/VR/VRPC.uasset new file mode 100644 index 0000000..fa6a760 Binary files /dev/null and b/Content/Blueprints/Player/VR/VRPC.uasset differ diff --git a/Content/Blueprints/UI/Materials/Emissive.uasset b/Content/Blueprints/UI/Materials/Emissive.uasset new file mode 100644 index 0000000..05f854d Binary files /dev/null and b/Content/Blueprints/UI/Materials/Emissive.uasset differ diff --git a/Content/Blueprints/UI/Materials/MeshHighlight.uasset b/Content/Blueprints/UI/Materials/MeshHighlight.uasset new file mode 100644 index 0000000..518705b Binary files /dev/null and b/Content/Blueprints/UI/Materials/MeshHighlight.uasset differ diff --git a/Content/Blueprints/UI/Materials/WidgetMat.uasset b/Content/Blueprints/UI/Materials/WidgetMat.uasset new file mode 100644 index 0000000..460b3ae Binary files /dev/null and b/Content/Blueprints/UI/Materials/WidgetMat.uasset differ diff --git a/Content/Blueprints/UI/Other/Daskboard.uasset b/Content/Blueprints/UI/Other/Daskboard.uasset new file mode 100644 index 0000000..3117c14 Binary files /dev/null and b/Content/Blueprints/UI/Other/Daskboard.uasset differ diff --git a/Content/Blueprints/UI/Wbps/VRSlate1.uasset b/Content/Blueprints/UI/Wbps/VRSlate1.uasset new file mode 100644 index 0000000..9a6a023 Binary files /dev/null and b/Content/Blueprints/UI/Wbps/VRSlate1.uasset differ diff --git a/Content/Materials/Engine/MI_Metal_2.uasset b/Content/Materials/Engine/MI_Metal_2.uasset index 1013b55..b07ad1f 100644 Binary files a/Content/Materials/Engine/MI_Metal_2.uasset and b/Content/Materials/Engine/MI_Metal_2.uasset differ diff --git a/Content/Materials/Engine/M_Engine.uasset b/Content/Materials/Engine/M_Engine.uasset index e85ce93..a203ba0 100644 Binary files a/Content/Materials/Engine/M_Engine.uasset and b/Content/Materials/Engine/M_Engine.uasset differ diff --git a/Content/Materials/Engine/M_Engine_Case.uasset b/Content/Materials/Engine/M_Engine_Case.uasset index 33381d9..fc85dfe 100644 Binary files a/Content/Materials/Engine/M_Engine_Case.uasset and b/Content/Materials/Engine/M_Engine_Case.uasset differ diff --git a/Content/Materials/Engine/M_Engine_Turbine.uasset b/Content/Materials/Engine/M_Engine_Turbine.uasset index cac91b4..ed71832 100644 Binary files a/Content/Materials/Engine/M_Engine_Turbine.uasset and b/Content/Materials/Engine/M_Engine_Turbine.uasset differ diff --git a/Content/Materials/M_TileDirt.uasset b/Content/Materials/M_TileDirt.uasset index 54430e8..4bf3947 100644 Binary files a/Content/Materials/M_TileDirt.uasset and b/Content/Materials/M_TileDirt.uasset differ diff --git a/Content/Materials/Metal.uasset b/Content/Materials/Metal.uasset index d3850a0..414391a 100644 Binary files a/Content/Materials/Metal.uasset and b/Content/Materials/Metal.uasset differ diff --git a/Content/Materials/White.uasset b/Content/Materials/White.uasset index cbc3927..dfe2ecc 100644 Binary files a/Content/Materials/White.uasset and b/Content/Materials/White.uasset differ diff --git a/Content/Materials/warpedMetal.uasset b/Content/Materials/warpedMetal.uasset new file mode 100644 index 0000000..7323a72 Binary files /dev/null and b/Content/Materials/warpedMetal.uasset differ diff --git a/Content/Meshes/Engin_2/SM_Engine_Ring_1.uasset b/Content/Meshes/Engin_2/SM_Engine_Ring_1.uasset index 8ea2316..234c27b 100644 Binary files a/Content/Meshes/Engin_2/SM_Engine_Ring_1.uasset and b/Content/Meshes/Engin_2/SM_Engine_Ring_1.uasset differ diff --git a/Content/Meshes/Engin_2/SM_Engine_Ring_2.uasset b/Content/Meshes/Engin_2/SM_Engine_Ring_2.uasset index aee31df..9fab0bf 100644 Binary files a/Content/Meshes/Engin_2/SM_Engine_Ring_2.uasset and b/Content/Meshes/Engin_2/SM_Engine_Ring_2.uasset differ diff --git a/Content/Meshes/Engin_2/SM_Engine_Ring_7.uasset b/Content/Meshes/Engin_2/SM_Engine_Ring_7.uasset index 2488c51..ee93c91 100644 Binary files a/Content/Meshes/Engin_2/SM_Engine_Ring_7.uasset and b/Content/Meshes/Engin_2/SM_Engine_Ring_7.uasset differ diff --git a/Content/Meshes/Engin_2/SM_Engine_SM_Spark_Plug1.uasset b/Content/Meshes/Engin_2/SM_Engine_SM_Spark_Plug1.uasset index d7cadb7..166868b 100644 Binary files a/Content/Meshes/Engin_2/SM_Engine_SM_Spark_Plug1.uasset and b/Content/Meshes/Engin_2/SM_Engine_SM_Spark_Plug1.uasset differ diff --git a/Content/Meshes/Hangar/SM_EngineSupport.uasset b/Content/Meshes/Hangar/SM_EngineSupport.uasset index 042ed57..80d909d 100644 Binary files a/Content/Meshes/Hangar/SM_EngineSupport.uasset and b/Content/Meshes/Hangar/SM_EngineSupport.uasset differ diff --git a/Content/Textures/T_Dirt_N.uasset b/Content/Textures/T_Dirt_N.uasset index f44d1d6..4359afa 100644 Binary files a/Content/Textures/T_Dirt_N.uasset and b/Content/Textures/T_Dirt_N.uasset differ