diff --git a/SwordNGun/Config/DefaultInput.ini b/SwordNGun/Config/DefaultInput.ini index 30e67a8..430be02 100644 --- a/SwordNGun/Config/DefaultInput.ini +++ b/SwordNGun/Config/DefaultInput.ini @@ -131,6 +131,7 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger) +ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftShoulder) +ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder) ++ActionMappings=(ActionName="DashStab",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) +AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D) diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset index 9f0cf2e..ebc6d1a 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_1_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9332a635d4106be81f098600ce6b4519845d7e7e9ecab60e099289c55a40c2c5 -size 101601 +oid sha256:1796da30cc944af5e6f81db9b338faa79fa94949696679ba1802084c84676865 +size 101758 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset index 9c8c9f7..35dd4ae 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Air_Attack_2_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0166f718176566dbe72001eaac7b752fe37e1f5c3c9e26e93cb2dcf9774242d6 -size 100281 +oid sha256:c97f8accc75f41873d00d1f1a208159b2c16a5f426d7c1cba08b59c67708416a +size 100438 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset index c5ce8e6..0e3d61d 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_1_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc15a2076bc2f05fb4c47c2d61f2aaed9e6732270028ff6f801b4f9c5efa4bab -size 101793 +oid sha256:2b8b9759448a39e0f82bdec21dd667d5754ece943fe30c6b370f81460999508a +size 101842 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset index f3ba023..24fb5f6 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_2_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35a965a76e1380bae7604b9428a56dbeee99eab35a5c5398f606b03cb4d085c1 -size 102903 +oid sha256:2aa42e97b4e64bfdeabb35bbccab86f3a63be3fd1fccbd31335fdedd21e660ba +size 102952 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset index dadb305..a8f609f 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_3_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874441e28abddcfed7ef6a5268016169687f89d8d56002fff430fafa46cd10a6 -size 101952 +oid sha256:f5ebc400353a71a2070e3ec29a26f9485b3fa2c2083a207aa8f3c4eb8ca71470 +size 102001 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset index 43c63e4..acd1f02 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Ground_Attack_4_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60b026efefad8fc4219de87fed2079df9596d602eb256739868d6884a1aaa49e -size 100396 +oid sha256:fb4c930685f5ac955d69026031340baa95645c43832951751b959b0c243b2346 +size 100445 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset index ff2c969..d7ac0a9 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Launcher_Attack_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8659a9d0615b44abac56c2214a70646abd59c9c3614692b01e4e663fad87bd88 -size 101501 +oid sha256:0bed0e89793d919ec8d23a37b366dcf4b554549f7ab10e766e3890c54194185c +size 101550 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch.uasset new file mode 100644 index 0000000..05771cd --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33414adecb3b2c1128a4b2b0eb8be8ec8376f8e971a057fb69075bf90e12ab4a +size 192731 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_End.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_End.uasset new file mode 100644 index 0000000..cc06a83 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15a40a4fc23a893449de6f7cb5b771ba3361b9b927d2e2d959bb618659be4539 +size 172210 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_End_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_End_Montage.uasset new file mode 100644 index 0000000..cb39b03 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_End_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c18ede1c6f364c833b8d5b64d0532e5988613b857d02ddbe97fbc8b0f71a026 +size 100137 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Montage.uasset new file mode 100644 index 0000000..5090ce9 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93eabe62c7f6796dc4f7c8aa7ad0bc841ffd4970b2812999636344de4aa5c8f0 +size 100255 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Start.uasset new file mode 100644 index 0000000..34e8054 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc7d798aa350978e7a4ddd885c12d8e376dba1ebdfda4837924b694325df3bdc +size 123027 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Start_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Start_Montage.uasset new file mode 100644 index 0000000..3c4cb82 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Melee/Stinger/Fighter_DashPunch_Start_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40c7dd57d70017d5265bc3a7d7a726b01dfc6d6c329763c8b2561612816acdde +size 95078 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index 6a6e841..24d11eb 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:e7f4b9ba40b2686c9bbfb57d061557f5855229c3d6f76a5fedea280ec4a9763d -size 115892 +oid sha256:0e73066b1dc334d995ad8b24155225d2522cabd9a50a2cb6fe16e68e7fbbf0d5 +size 159236 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset index ce530c7..577e994 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb77be3907c8513d9c1cdba0c4abd64e5318f8100a182c614a9ae4ce4115a15e +oid sha256:2aad50460c6c3c0fd44dfd4c723f3aa5535fa1664aa71ebed84da916410fbf40 size 30740 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAttacking.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAttacking.uasset index 94c02bb..03d44f6 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAttacking.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAttacking.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b10315fe1618b6e261c30469853ac4d9e08e5f950612c1fc74c3c7f0a1183743 -size 24659 +oid sha256:d5cbb988d0e757e90516eaff47c8387c60dc262704bfdb4db7578976226638af +size 25601 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset new file mode 100644 index 0000000..76bb284 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd7d6e8d8be8342a2ba52303b1be8f7ea1ca84b57369842077b2a3b4ba9b673e +size 6044 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStabEnd.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStabEnd.uasset new file mode 100644 index 0000000..9916373 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStabEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:882995d51c97ff3b9f1bba93d2bd16838ce5d37e89a62b7c306d26d00f030793 +size 55109 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStabStart.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStabStart.uasset new file mode 100644 index 0000000..b9f09f1 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashStabStart.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12d1ff730a24f691939c70def6fc40d02635d5212690c72f13268dcca6c7695e +size 116245 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset index 66a8d05..217085e 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff785b27e9097a5b5ba7dcad54b2db6814fb0bc98f0fdafc305517929d6685b9 -size 203534 +oid sha256:1504937ca5a46a45e0fba0c86010dfb36f5194cd5c02b3f27b7c691ff303ef4c +size 227021 diff --git a/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset b/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset index 4c4f631..66caafe 100644 --- a/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset +++ b/SwordNGun/Content/Core/AnimNotifies/ANS_DoMeleeAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e78c831d28ea538e80b325fe23c6ac7eda918938c1fd9d30dd9ff03a33c72a1 -size 51020 +oid sha256:3f7f28f2f7d83705207053606e57c0121b5794afb7249d50284d039bf9c3d631 +size 61596 diff --git a/SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp b/SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp index 2366e21..c8b1216 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp and b/SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp index 9a7dc36..8d4da71 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h index 2ca4606..3b7dd1a 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h and b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGMeleeWeaponBase.h differ diff --git a/SwordNGun/Source/SwordNGun/SNGTypes.h b/SwordNGun/Source/SwordNGun/SNGTypes.h index a2dc8c0..02ce7a2 100644 Binary files a/SwordNGun/Source/SwordNGun/SNGTypes.h and b/SwordNGun/Source/SwordNGun/SNGTypes.h differ