From c9882b88ea6531515297863e4d263bec1053e345 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Mon, 12 Apr 2021 20:54:16 -0500 Subject: [PATCH] Implement shotgun [git-p4: depot-paths = "//depot/main/": change = 58] --- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../Content/Weapons/Shotgun/BP_Shotgun.uasset | 3 +++ .../Weapons/Shotgun/Materials/M_Master.uasset | 3 +++ .../Materials/M_ShotgunVer1_Inst.uasset | 3 +++ .../Shotgun/Mesh/Prototype_Shotgun.uasset | 3 +++ .../Prototype_Shotgun_PhysicsAsset.uasset | 3 +++ .../Mesh/Prototype_Shotgun_Skeleton.uasset | 3 +++ .../T_Prototype_GrenadeLauncher_D.uasset | 3 +++ .../T_Prototype_GrenadeLauncher_M.uasset | 3 +++ .../T_Prototype_GrenadeLauncher_N.uasset | 3 +++ .../Textures/T_Prototype_Shotgun_D.uasset | 3 +++ .../Textures/T_Prototype_Shotgun_M.uasset | 3 +++ .../Textures/T_Prototype_Shotgun_N.uasset | 3 +++ .../Private/Characters/SNGProtagonist.cpp | Bin 14932 -> 15970 bytes .../SNGWeaponInventoryComponent.cpp | Bin 4684 -> 5744 bytes .../Controllers/SNGPlayerController.cpp | Bin 4876 -> 4772 bytes .../Private/Weapons/SNGHitscanWeapon.cpp | Bin 6764 -> 6610 bytes .../Private/Weapons/SNGRangedWeaponBase.cpp | Bin 3666 -> 3644 bytes .../Public/Characters/SNGProtagonist.h | Bin 6800 -> 6944 bytes .../Components/SNGWeaponInventoryComponent.h | Bin 3106 -> 3682 bytes .../Public/Weapons/SNGHitscanWeapon.h | Bin 1560 -> 1446 bytes .../Public/Weapons/SNGRangedWeaponBase.h | Bin 4126 -> 4240 bytes 22 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Materials/M_Master.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Materials/M_ShotgunVer1_Inst.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_PhysicsAsset.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_Skeleton.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_D.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_M.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_N.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_D.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_M.uasset create mode 100644 SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_N.uasset diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index 7031eb5..37aba20 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:2c651c0a1101680562d7e7636c69a5d61b9a7d16f7d416caa260a0a284a445c9 -size 115906 +oid sha256:b8484d3639c37b3d4cfc708a8d564c1d526ce4f9b4d89de4e8e51e2bd80c32b4 +size 116367 diff --git a/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset b/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset new file mode 100644 index 0000000..3dcb443 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67643f4184f1ba0cb8ea39ca7609516bdf15125335919cee69a78e429a189463 +size 109039 diff --git a/SwordNGun/Content/Weapons/Shotgun/Materials/M_Master.uasset b/SwordNGun/Content/Weapons/Shotgun/Materials/M_Master.uasset new file mode 100644 index 0000000..0ec316f --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Materials/M_Master.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fb200cc7cb5177208b455f516989dcb28089d0db66adf65c6a983353ce938ee +size 149934 diff --git a/SwordNGun/Content/Weapons/Shotgun/Materials/M_ShotgunVer1_Inst.uasset b/SwordNGun/Content/Weapons/Shotgun/Materials/M_ShotgunVer1_Inst.uasset new file mode 100644 index 0000000..1f7367b --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Materials/M_ShotgunVer1_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffb7135719ec0e5cc5874236579c2714366d3aa0958267dc467ad28b24be5522 +size 130069 diff --git a/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset new file mode 100644 index 0000000..cc6f1e0 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:549e2f923ad9db999a09dadc5c93a98eefd584fdd5ef824f7cdc209f8a7c5329 +size 423017 diff --git a/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_PhysicsAsset.uasset b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_PhysicsAsset.uasset new file mode 100644 index 0000000..6f5375f --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e817b1b16618947c186a6bfbe9b9dd46ebbc9a7472d2a5e75f8c445d2d78affa +size 83824 diff --git a/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_Skeleton.uasset b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_Skeleton.uasset new file mode 100644 index 0000000..9d1b883 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb723a5bc9be259672d7253615c60df872f06b9f3fccad438995c19f3050e540 +size 3239 diff --git a/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_D.uasset b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_D.uasset new file mode 100644 index 0000000..16754e7 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99debc9e9301d7c848a0d4181050bc9b14e7c55df1580a8509d4fdc59764355a +size 3528994 diff --git a/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_M.uasset b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_M.uasset new file mode 100644 index 0000000..f0fb42d --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_M.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f98fd5bf6ab22e4a690d24059d3e02d2d584cc30e7bd1e3390924ad340d4e91 +size 114231 diff --git a/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_N.uasset b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_N.uasset new file mode 100644 index 0000000..e0b9131 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_GrenadeLauncher_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2571df2b5e63ccdef8859864a167d6f52c376dd16802d24d22e1f91d9f791ed +size 2269715 diff --git a/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_D.uasset b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_D.uasset new file mode 100644 index 0000000..16ea820 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:310982cd83481e64d77c384fd5628745a8db950b44840101f1b0c7646dbc605c +size 3153327 diff --git a/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_M.uasset b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_M.uasset new file mode 100644 index 0000000..6245781 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_M.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e45a487c73ed6277b03db15d8b43de280188cc527bc618b556e6659dc8faae2 +size 94113 diff --git a/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_N.uasset b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_N.uasset new file mode 100644 index 0000000..a687c69 --- /dev/null +++ b/SwordNGun/Content/Weapons/Shotgun/Textures/T_Prototype_Shotgun_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31836a7fc7d4868ee578ca54af894dd705f5afc83f3e64c16253dccc4869599d +size 1488835 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index aae39f97f96f5d13fb737d2f0fbf3681aecaa28b..e53685e7171994aef984082de7dde4dcfc495101 100644 GIT binary patch delta 896 zcmcao@~CD3m$)lKAwwxcCPM*3I72E!B9P8!$Yao$9LQlf*?`MzvICDE0W}hnxADkq zUc%QRIr$xz)?^261o!F(@!N1Fb9qLS!pF z8B!Q3Ca>j6H}wRnOabbxV9>y!-w&ui7e#k5P^Tj+SbXwtF3I|0JbFPUm!Rkd+YNM= zEf8x1Ax`%JcN%>kN|?RnHEpW`!|yhojDa*l?|+xjU{oKF?k~Q=E2Vt{Xfjwc@G@{Qa8CZKrO58gP|8rmP&8RkO>%ORhTr4_ zE-68{3I=3Z4Go3KOSFYhbX?HhG`WdO3u?N^>Nyc!I+>`2rU2ilP$tbuR?+y;;w mx(y&PpbeXKxEmxVZxXPY?4ZImd4amhIhtbPoo47rmTnI##ECrdKRPiA74m@L4@GI5k{S!E~pF(qtX$9#g3UjgWVQidELEC4#BX!1=CS&&9fh(QVrwv!(+ONv4)=L8y) z3RDF$E{{QB@>?cDyv~AoNRU$!=s3B_LYxwlSFrQo)e}59k4+5f9kt1;*u+@DE}8t8 vbw5zQ)Z|5Ma!^lHPhQ6?0#q$A`3|$+<_YXx*gRuQlt&`j^f$Y3a&Q6wbAwuj delta 170 zcmeyMb4F!D8`ES3){My$m~|$vW09Nugjqq{nt_*ri=h@wf>>n?`3#v1DU$=4?I-`? z5}EvfU23uhx8G(KHXp{x3G61!3JkWB8QEkRqbDn}i%)LhssI`%GFgCIV)6zSnaL@f ma`=qg{D9BTxsKZbiSILc5t|)QTw`(sM;MS+ fV%B7^p1hFFesT%78d$7^TVe76evi#a>a5(*$kQt)^K?jhD3&9h77Pg zl#MJe>dTPIkORc242}#XK$yso%#aOIEsMkl>0sbx;9}rp&|=UBu_o_lciw!9O^a#r cKQ^1m=Qz10`*Auz**=p~m>f3C@wBl40Dgok7ytkO diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp index 9985f646cb6cae641aac57d81fa7660f5c55f76b..7f81f58520955ae1c68183964ab2a262f5cf0de2 100644 GIT binary patch delta 49 zcmaE3a>;nZ7B*%VhWyFgQs$Fiu<=3J+LPtjc_uqasZGAcVz9Y`-ARarmw}4`0Ewav AhyVZp delta 107 zcmca){KjO%7B+S_hD?SchSbRi*{qS+ij%e2c_jTA@)$gT@+Az#49N_MKps@}W_R{> ep~*4q27(w$CjV#CX60qzVyK?1&#ub?VgUdJu^Dp! diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp index 076963c94c693021e8825e25a55422042a46c17e..0c7e18ca3ec7895b1aa978b1946e671e17af037e 100644 GIT binary patch delta 46 tcmca4vqxsb8XkU522KVShI|G$hD?SchSbg1d7K$}kpvjxCoA$90st2>3i|*6 delta 40 ucmdlZb4g~y8XkUL1}+9pAarBMWGG@toy^UrxcLB&9pmH+EF6=0_zVEdfC{-9)<)? diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h index 18cd85e324108437f2cdd713ac719cc53ae24172..3c1ce74cf1e1d83a21d0c66aeb3777234452c9ea 100644 GIT binary patch delta 249 zcmZ1^@knOFBo^^ZhCGH624e;z1_cIphEyQikD-(yck)FRNyg&I`fR@3oD6U^lXtV| zPd>-S#i%j4mo^ViAT#`V z;bw#EpWM%;2{->c&|Iy_POKu6rPw4U7qGH{%-+18&6J6|6v;`loXV`83@Hp1lLa{x YHz#nOW1ResgAGMVEVm+5NiFwM03{ke_W%F@ delta 109 zcmaDPvq)mYB$mluY&w%KuvT%GG2}C3GNdplFa%G&$g0bl$&klTGFhKfeew(T7ihA= zlleI1HXCr7Fil>9+~*h>IVUS}7_vJvlrj`C6is$y6ra40cL@Oe C`5&AB diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h index 096242963b67628767bc3e4be158c2fe186ba7ed..8c5f244f94653b5fcc15da612d5fa29afabcdd1a 100644 GIT binary patch delta 29 lcmbQivy6Mg6c%0=hI|G$hD?SchE#_5$+KBfCs(j8004U_2#Npz delta 93 zcmZ3+J%eY%6c%nI;`9Qf8 h1_cIxhCBujAiIR2m?0UcCyxPY3WElN=H$yPmjTwU6f6J$ diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h index 7a8f28f80e94e78f1ff9d6cbc974f341e94989fe..cc02d89023eaea13b45732b52b3f1eefbe5e1d90 100644 GIT binary patch delta 83 zcmbQIFhOy{IsVBDnANoX7!nyu7%~~k7*ZKr!DJqgugSp6z{S7`