diff --git a/SwordNGun/Config/DefaultEngine.ini b/SwordNGun/Config/DefaultEngine.ini index 7cbff76..c8589e1 100644 --- a/SwordNGun/Config/DefaultEngine.ini +++ b/SwordNGun/Config/DefaultEngine.ini @@ -14,3 +14,30 @@ AppliedDefaultGraphicsPerformance=Maximum [/Script/EngineSettings.GameMapsSettings] EditorStartupMap=/Game/Maps/Test.Test +[/Script/Engine.PhysicsSettings] +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) +DefaultDegreesOfFreedom=Full3D +bSuppressFaceRemapTable=False +bSupportUVFromHitResults=False +bDisableActiveActors=False +bDisableKinematicStaticPairs=False +bDisableKinematicKinematicPairs=False +bDisableCCD=False +bEnableEnhancedDeterminism=False +AnimPhysicsMinDeltaTime=0.000000 +bSimulateAnimPhysicsAfterReset=False +MaxPhysicsDeltaTime=0.033333 +bSubstepping=False +bSubsteppingAsync=False +MaxSubstepDeltaTime=0.016667 +MaxSubsteps=6 +SyncSceneSmoothingFactor=0.000000 +InitialAverageFrameRate=0.016667 +PhysXTreeRebuildRate=10 ++PhysicalSurfaces=(Type=SurfaceType1,Name="Flesh") ++PhysicalSurfaces=(Type=SurfaceType2,Name="FleshVulnerable") +DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,bUseMBPOuterBounds=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPOuterBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2) +MinDeltaVelocityForHitEvents=0.000000 +ChaosSettings=(DefaultThreadingModel=TaskGraph,DedicatedThreadTickMode=VariableCappedWithTarget,DedicatedThreadBufferMode=Double) +DefaultGravityZ=-1960.000000 + diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset index b704a63..3e4c295 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c61e8156f2a4c6b44969df5eb57bca9bae0ce67828807338b54f9fd47228fc9 -size 117952 +oid sha256:8e04749cecd19fa0189e44c9c307a40d0fef15d9db4c6d009488d1cfacc4d922 +size 117869 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset b/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset index 39de4c5..ffb68e2 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:629b5c9e0c08d55c5d73972645817844b877657e75720cbf2d5270bae6ebc76e -size 17717 +oid sha256:c302a9345a4458cb8849d898970ce6471317dba740451f34379b5de906bf5f0d +size 31528 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index d0bd7a4..6a6e841 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5795bd82a2f460f36c613a77d7c8b42cd0ffa633797451d300396933da8f2c9 -size 116009 +oid sha256:e7f4b9ba40b2686c9bbfb57d061557f5855229c3d6f76a5fedea280ec4a9763d +size 115892 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset index 834fab3..fcb46a9 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagFiringWeaponState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31e3a940c5da3793e74e95f5960ac9b34135d92265216a87aea84a31f76ec937 -size 154135 +oid sha256:eb5b13393aaf304c8de4e364b5b4c6d00882639763818e21f681d8b1ba790851 +size 166837 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 973c686..c025037 100644 --- a/SwordNGun/Content/Maps/Test.umap +++ b/SwordNGun/Content/Maps/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2368a03d1174ceb99cda1651c2c09c310973fc16731685a50545f519a7fcb6a3 +oid sha256:a3efbf2958f7efd99acd6a65a2e5941d0d6186816eb6bf9962d73594f638af9d size 643306 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index e142a58..39514ac 100644 --- a/SwordNGun/Content/Maps/Test_BuiltData.uasset +++ b/SwordNGun/Content/Maps/Test_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d243f8443fc7958813be8bb8aa2c4cf2c2b37053222933958c7cb118c1533518 +oid sha256:da7cde7021021b701904f384c6c703b1b6823b22cec47f6bdb7df9a0013fa190 size 2330061 diff --git a/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset b/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset new file mode 100644 index 0000000..89c29b0 --- /dev/null +++ b/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d533e9f9b5597e622401af522081c47c0d8a72b583965306ff54117fc7831b5c +size 24526 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair001.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair001.uasset new file mode 100644 index 0000000..9a9b0ba --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c34ab054e5cb39dc7c20a982f8c0c64281fb1d7a9f01cfb512556b640725791 +size 4582 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair005.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair005.uasset new file mode 100644 index 0000000..6695328 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69628b56ceddb65d42d14b7819e9a8c55afa20bd833cfceadfa5c5f14a2e4cc0 +size 5797 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair006.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair006.uasset new file mode 100644 index 0000000..0781f58 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec7677c352cf35c373f3a2890b79bd55151b4a7ce658f2015b0720fcc863e00f +size 5053 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair007.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair007.uasset new file mode 100644 index 0000000..8c3e530 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d55f220d025b9a44d952206932bdcd7b8e708c380fac8497f6c9588cec21934a +size 4978 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair009.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair009.uasset new file mode 100644 index 0000000..d4c8ff3 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fcd070961b35ed2d8b37b8dc34569275e08e119372901d3e1c0e0414392ead2 +size 4997 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair010.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair010.uasset new file mode 100644 index 0000000..bd1d388 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1558e5bde57e78ff403af3c5e79b3d5f0148182f3d1ec98e5ed58255a7977749 +size 5602 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair011.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair011.uasset new file mode 100644 index 0000000..2b14f8b --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3dc23280e4cfab7e29ce2ef8074a33403d81e096bfafeb496bcdee25644a55a +size 4845 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair012.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair012.uasset new file mode 100644 index 0000000..36d5cae --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a09ca0624dcdb40bfceb227f7a38d79770831d076712b269bb711cbed61440a +size 4944 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair066.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair066.uasset new file mode 100644 index 0000000..96872cc --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair066.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4e971f21dee6d74c85b2cc1a86da8a4548db7a02cce7055dcd1cbef7daaaa8c +size 13661 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair085.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair085.uasset new file mode 100644 index 0000000..4471721 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair085.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3fa88c71748a203a860eaefe8d0f96a1504a3847c8cc35d3e5080f430dedd5 +size 6651 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair086.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair086.uasset new file mode 100644 index 0000000..e46d6d9 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair086.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3deeb3872cdca06ddac934b501bc592f183bec64df7b8b838c8184b90c3693c5 +size 6450 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair087.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair087.uasset new file mode 100644 index 0000000..db1df18 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair087.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c96d57e7779acc48517ac5fbcb7acc1712861c585430d277818619521b6871b7 +size 7118 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair117.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair117.uasset new file mode 100644 index 0000000..438c901 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair117.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1463bb9d986b8cec99b8523fb63f8c0b6b2abcae3db2e0e523afce864f29e36c +size 13065 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair118.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair118.uasset new file mode 100644 index 0000000..d0ae108 --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair118.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0487cf1f9fe22285c317dc19c53f4736c5d4718f0cfdafb26fbaba1dfa743fc +size 16033 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair123.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair123.uasset new file mode 100644 index 0000000..06aaadb --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair123.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de0ecf9d38b9a2105f31d6d293c0caea42b053ecc7817636a400b85485ed0c6 +size 13081 diff --git a/SwordNGun/Content/UI/Textures/Crosshairs/crosshair190.uasset b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair190.uasset new file mode 100644 index 0000000..fb6585b --- /dev/null +++ b/SwordNGun/Content/UI/Textures/Crosshairs/crosshair190.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03597b2e4af04c725f34801771da2a1ebedfab46f198bbc531201ff2ca59c547 +size 10811 diff --git a/SwordNGun/Content/UI/Textures/WeaponIcons/revolver.uasset b/SwordNGun/Content/UI/Textures/WeaponIcons/revolver.uasset new file mode 100644 index 0000000..a230d2e --- /dev/null +++ b/SwordNGun/Content/UI/Textures/WeaponIcons/revolver.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dc84c76ddadce3ab6cd723b51ab2ed3ada2ed53531745d252dc10b24eb97472 +size 19845 diff --git a/SwordNGun/Content/UI/Textures/WeaponIcons/sawed-off-shotgun.uasset b/SwordNGun/Content/UI/Textures/WeaponIcons/sawed-off-shotgun.uasset new file mode 100644 index 0000000..f26cd5c --- /dev/null +++ b/SwordNGun/Content/UI/Textures/WeaponIcons/sawed-off-shotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fdf5a461d86c6046d153d543eccf80fd9a95531dd7f37cb7cf81b5c237ddaea +size 27530 diff --git a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset index cfd0fda..5893598 100644 --- a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset +++ b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3bb3f2043a0a85f693ff12394f1e28167ed42ba8fcfc86f6042a021f1bdf3d7 -size 100800 +oid sha256:563fdbdd4eb7d554e978adc9b137c0427d6ddd72631569ad9fbded16605d8f2b +size 101365 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 68af13a..1849d4f 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp index 7f81f58..a27f30f 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h index cc02d89..3fd2ed1 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h differ