From 53a1f0c3d69a161f8037654697ac93f31d3a9042 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Mon, 6 Sep 2021 18:21:29 -0500 Subject: [PATCH] Implement aim down sights [git-p4: depot-paths = "//depot/main/": change = 123] --- SwordNGun/Config/DefaultInput.ini | 12 +++++++----- .../Protagonist/BP_Protagonist.uasset | 4 ++-- SwordNGun/Content/Maps/Test.umap | 2 +- SwordNGun/Content/Maps/Test_BuiltData.uasset | 2 +- .../Private/Characters/SNGProtagonist.cpp | Bin 20272 -> 21132 bytes .../Public/Characters/SNGProtagonist.h | Bin 6674 -> 7276 bytes 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/SwordNGun/Config/DefaultInput.ini b/SwordNGun/Config/DefaultInput.ini index 30e67a8..99f9b09 100644 --- a/SwordNGun/Config/DefaultInput.ini +++ b/SwordNGun/Config/DefaultInput.ini @@ -123,14 +123,16 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Q) +ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=One) +ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Two) -+ActionMappings=(ActionName="Attack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Top) ++ActionMappings=(ActionName="Attack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left) +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) +ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Right) +ActionMappings=(ActionName="Fire",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger) -+ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left) -+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="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder) ++ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftShoulder) ++ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_DPad_Right) ++ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_DPad_Left) ++ActionMappings=(ActionName="Aim",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton) ++ActionMappings=(ActionName="Aim",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger) +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/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index 8f08a67..c424a91 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:0b6ec78025310ad90d655c0976d4399a63898db3655fe9d421e75361ca05a5b6 -size 167528 +oid sha256:ffdcedc3ba44c771fdfecd4e08aae249b1d870fd4a22a54ec0a92c01f1895e12 +size 171177 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 321afe0..a33a9ce 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:aeb18b3a35a9457bcd5cdc54d9f659365962244d0d0d66838e23ed86c5161d27 +oid sha256:41c4185755e312aae8805498ae386758aa2068067054b62bcd15011122591cec size 685766 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 9d5f26f..59df0c9 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:18f7fdb8883e81388af29c35d8edbb972f49f192f2a9511e41dd6f680c6b94b4 +oid sha256:00b12ece10185c4f4bd339844e75af1d8e964c1b1bfcbc28f53b3e311de4a156 size 2330061 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index 8de784ea3a2a70354e1325b56a2752aa2b41211c..6e75099eae83be09636cb6c6ffffa6950024b69b 100644 GIT binary patch delta 705 zcmZuv%TB^j5IrOYgT{q6Y;@7<4kHSIL=%x16GP%g7ZP2gZKa{K1gecIe!z|C-kp04 zU*aeD0sez$dJEP-n){fUGiRoA?&Ll9`jMN|3cU@ip@4I^=%a;e+(Mzrb%ZJoxg0c* z#oS;3o1c~9Y74jvMjdqU1P@`BGyck(aW%hEY_XcnsKt5?D~c6O_X|JuaRn6;kLU<_ zI&+{xKuh6SgL$)vkyd=(T<(wb1w0iZbd!A9hqMPQ)xk?@xnx(g<%ef^7BeHs-Dc1w zRhQ)j79<2d&oKTrjk`7zhm1>m*=gP5l6XDE8R;4G|IhV=o@LW%2>1FGStHFFza1Bi z7CC*^k)If#%^pg#2_7t+Aj;%l?64evp6(bD)7{J!jCWV-DMB<4s4jNPdkDQE^C^4Es-$KD{27O+<%DA$K7d JO*fn7)-S|Ze_j9p delta 19 bcmeBK%D7=3;|3$n&38DT8E-CekPrd@QtSt> diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h index 6800f191480a952ecbf15c1a7a0200e14edc6852..48902a562bcaa368a4b16b34980301454f7c7657 100644 GIT binary patch delta 280 zcmbPa^2TCApTJ};KAFjK;ue!Hh_MJeGGsF30&yNgI)gO>F9R0?=VU?tQeg!KTLuLN zB?f1PM4)^sLlHyb;`d zfWa4RBShSQL65-@tR7iDk)Z;r&yc~0!GJ+?@-}$Spi6c nAlUs3X+V4Ofi{%@MO=XD(tzwzpjZh5)ZK7@)^6q!