From 940846786ef4ccbefa2886b9154a8fe44d43e3f0 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Wed, 31 Mar 2021 20:42:38 -0500 Subject: [PATCH] Create weapon inventory component and create + initialize weapons [git-p4: depot-paths = "//depot/main/": change = 50] --- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../Mesh/UE4_Mannequin_Skeleton.uasset | 4 ++-- .../Private/Characters/SNGProtagonist.cpp | Bin 12042 -> 12966 bytes .../SNGWeaponInventoryComponent.cpp | Bin 0 -> 2666 bytes .../SNGProtagonistState.cpp | Bin 772 -> 764 bytes .../{Components => States}/SNGState.cpp | Bin 6550 -> 6542 bytes .../Public/Characters/SNGProtagonist.h | Bin 5030 -> 6426 bytes .../Components/SNGStateMachineComponent.h | Bin 2630 -> 2644 bytes .../Components/SNGWeaponInventoryComponent.h | Bin 0 -> 1966 bytes .../SNGProtagonistState.h | Bin 954 -> 946 bytes .../Public/{Components => States}/SNGState.h | Bin .../SwordNGun/Public/Weapons/SNGWeaponBase.h | Bin 2302 -> 2304 bytes 12 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp rename SwordNGun/Source/SwordNGun/Private/{Components => States}/SNGProtagonistState.cpp (88%) rename SwordNGun/Source/SwordNGun/Private/{Components => States}/SNGState.cpp (98%) create mode 100644 SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h rename SwordNGun/Source/SwordNGun/Public/{Components => States}/SNGProtagonistState.h (92%) rename SwordNGun/Source/SwordNGun/Public/{Components => States}/SNGState.h (100%) diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index 9dee506..b4c76d3 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:313faca3eaa319d312d1ae364ec5e932c9175fccfd25bfee417bacc88234e00e -size 115372 +oid sha256:c3327312455050452fe757f9456cb88cb70bfb7720fe5c53e3160a5b7cbe723d +size 115616 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 2aff237..8a678d1 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:fbcb78c96f3dfe7a0a1b7987c918d4b1b98f0ef11d676fbf4be742cec4649f35 -size 29108 +oid sha256:f99a3549e0cedc9b22ee9acf4a645d5628bdb0ff2ecc04180497aad22694ae71 +size 30408 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index f6d630610e4e1e33510697fff238bfb3b0e07647..596fc3f2ed4272cb8c39657ca43b95431a2ce78b 100644 GIT binary patch delta 661 zcma)4%Syvg5Ir>}5Fe{5A{eN+iABM!l`5&=1F?uLx)Wj>t28DhNrf&-blZiS`vc;_ zjT^y#@q0Y?VkKy?F6P3_oH=u5<_<1iytgOaI)?`r9fSyQNV}sSAfX?jCmtq_maEvu z->BT=%2=Mfc+_Wdrf4sf#fSc!udq)GH|%u+p9*@gMZak6jEG|uTbRX^GINX;N3+sh zbg4f2nk1{;#>O|B2?sU&oUTGGF)NEGV91kYD4@(tHu8IGj`dQLyzAJe z8jqVl<5ptYCC#TLayNV>e@efuIG(|KmJcd#!twM`{CL)0%A%xPzO#`{fb`mP!gZN3{oLSqu zb!;k9WNl*a?3}rsnf?81S9ZmhwuCa1&k{&qVtjXGh3`-Xcz=L(EDM?9{|LKtxq@UQ zL%GzmKe7Kr_OKq~?Ikdlkn(g}F#?>5v2$1MWb2-u=*t+m18DeCQS1rOXV49>Vu|2e zM^0h=3_HC<_5!kHa)Lfy6=>GrTP3q*V(dVNn7&%P0Nw)j8SN79^dwN}g?jBnatSYa zzK@;jo^9#=T(dTZUWn5p)n}A%H}twL^^J9_vaRuc(_asnV_gTD%`J_R9`@yn)bvTC zoZ`eP(IE>)h_qLd)ozAxj-2;Uho)8{lvLu&GgxJA$H-71PqP}N9vSP*(vM8mD9G0# zFo^IFc(=*tF)(6yyFg4K-pMPMP5Hd>OsuC3-;JKDVPdl0FOk8KcFJx1H0=DFpX@2J z)%AtF!2bD~tNsWzsFs}c1FcW z_B`uWK@9YyEU%{Co_NZilpE=;<$;&6%tbOC;qFB8p~Tk5q+cv1`^0oI`)!OT&{$TO zP2{qfQkZr)Ltqazt8IAE!_>`pP6rG!vyk;DK5w$dsMhC! z2hNfeK9D(^V|-n&%8^=*5EpA+CgT)0v(RN_LmGOw(E?|RTagwfAnzR7=KL}xR@vKjq^v*eeu8VJZm!A_h0$MV>u~sYfFObjrJ}WkqJlzK6(-Y3CK$(p6FVeWD=YW!`)D-gE9b?|z;BvT**}v!~vZr|%?^KpJu+ ziM+w;;G9Sc=caV+h4<0^@Wz(htW-*}D_gQD?(G^-Qq;~%EJg8Uh|50qCN9?pzWH|5 z|71@`2Op%%7oLl`1$k0nhk0ulVCGfhcU zZ-_WMcPT2`?qUCq0#YE5K9Xsr*+x?vDuB4I6OMlSFE>7%qVc}F_H6js`~SYiKr`rp zqY-0wTg)785>!$$#WOcl6I?|O8wStVf7}eZLl1ig@qLgI5^Q z0E|R^jUByka_z5Np|^!u*@Mcv^YRj!S()|4!Ok42^_?u^hSOEWeH*-yI!%_Ys$}&G y=QT?GeFgPL>a&rzm){?K9w@CLwW?q{2=d)$Ac7;v(QD#Y19&7W8H8QTA72B&8?>maz$jqJ?;{QM1~TEREA;({f)P?IRRYW2aEs! delta 14 Wcmca2a!h2xy~)=Y`8NKF;sgLSX$H3d diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h new file mode 100644 index 0000000000000000000000000000000000000000..c4a7ed8b75ccb3930ba4a9a94377ae94bd6d3675 GIT binary patch literal 1966 zcmcJQUvCmo5XI*e6TicTCMw2Q^$}~6^2er83n`GsCxfs829U4|l^8#eUsC;@*`@3P zCB|r)EqCwCojEh-%-vrbvZxbe}K=FtYOBk(>)uLv(J8D zMbA5D{mvtg{N&i4f}ohj+<#_5F2xUdVvDHt%qvuFswHnf9PgSa-87yewd|6h7z-y^zLrIW%HfmSRp zsNofsDyxXDs0$@~g6D*YF}|`^y#JwdrQXIwn_;_Q-L;Qc!#xN~L@7BVsyE3hHC+t^r_?mWscL(csAOEBmft5KuqXuCa!Kz{%VpqNS=GY2!qE6O2n9i)tZw*8h zFxKonwI>zGKO4Vnh4geXGcE5{L|&=%6V)z2qUl+(mU=__8(+wbR>C-b3Hl zTxh<;uO>$4g`)7+T~aMCJ;plDYhqo(T$}DUSnXrF>iET9!gJD(f@^At)3h7ISzb-q%dD;X<`` z$#4Rame0Xv<{Dr*Imp+kox)g_oy|QV-Q`uYTlfF2N%z;?THD5+$9wp!Zp1_>+3J&e z^Ao0i&QZLq0<;LjjP?V@L(!lFgQkl}rG7&j*MA diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGState.h b/SwordNGun/Source/SwordNGun/Public/States/SNGState.h similarity index 100% rename from SwordNGun/Source/SwordNGun/Public/Components/SNGState.h rename to SwordNGun/Source/SwordNGun/Public/States/SNGState.h diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h index 8c26f640aaa8b4fb35a77186908e302bee82b22c..a2708e8dc7d2610d615cb2ba0c36b6d695e961d8 100644 GIT binary patch delta 16 Xcmew-*dVlF1Jh(SW{J(mm@L=;HP8id delta 16 XcmZn=`X{(y1JmRzX0gpDm@L=;H}VD5