From 59f0e5bba0ead423dc43ec365713859d31314270 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Wed, 4 Aug 2021 20:08:28 -0500 Subject: [PATCH] Soft lock [git-p4: depot-paths = "//depot/main/": change = 108] --- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../States/BP_ProtagGroundAttack1.uasset | 4 ++-- .../States/BP_ProtagGroundAttack2.uasset | 4 ++-- .../States/BP_ProtagGroundAttack3.uasset | 4 ++-- .../States/BP_ProtagGroundAttack4.uasset | 4 ++-- .../Private/Characters/SNGCharacterBase.cpp | Bin 9858 -> 11282 bytes .../Private/Characters/SNGProtagonist.cpp | Bin 14446 -> 20074 bytes .../Public/Characters/SNGCharacterBase.h | Bin 4470 -> 5280 bytes .../Public/Characters/SNGProtagonist.h | Bin 6076 -> 6674 bytes 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index b693460..8b30a73 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:f6ff6f19d68eca7466968067730dfc40355634a9f4a085d06d04164c09ca7c7f -size 165977 +oid sha256:c64b5054e9e5cfea39e68fa4674cda61c9a9a9a1ba1c46822707bfe2c88d6e3a +size 165087 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset index 77c454e..069a65f 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bc4ef24dd7fa2056a989a6965c227872a968438455d674d81584049dc72843e -size 150755 +oid sha256:c31f8a010e85bf00fe9a3090ab4f057c97cd868840f482fb302a5564a18ddf84 +size 165933 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset index 22a2ec1..00f14dd 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b91097f8b38758fc1c3fe65761d0b2a00b844ba6687d9196e79832aa12b996ea -size 148844 +oid sha256:40b2409733b0b8f2cdec563f66340d1109c5cf6b66ed997303dfce90faab6ca3 +size 160658 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset index 54c1a81..db884dd 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ce676103c31a489c22f37cbbccdb9162ebe5b0eea5601974dcab5435dcd619d -size 169053 +oid sha256:952214c64a93e36261c85912cb8392b52ed78eb27cad659b5a24ec24826d3d58 +size 180848 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset index a1d0889..0751c23 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a1ca9a9e1297551c6a833c81989e50c4d0079d94dcf7caa4b310c732f5f3b59 -size 116478 +oid sha256:22d1f3b75cae4ddd7d2c79e63188facacd5a78ce5a49713e0f4ad7e5df37fb19 +size 129346 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index e569b9d47647f49f8b6e481e53cd7c3a2f6256a4..dc671f8d3b03d1035677635116af209c67ce007a 100644 GIT binary patch delta 1059 zcma)5-AV#M7(J0>20^ybMJ8;9xMIH-b&;7wKhT8~)0R!szm%5pJU#WufDC~l9tia`jXVVvVKaLUxI3-M0WhR X69|4p5<24n;~k3xT~~IxvG(W}w!gnG delta 17 YcmbOf(d4^26!c6`sE=(05>5G@v)xN>j9O+yt~Nxo*6ulC!i$VMwAxv({FUw&DtTpuS|= z@0-J;b7t-?Q*crk0=Ii-&YXRlx%%&a?u0v`A2!1@oP>Xb{jeA2_`My@@Ov6Y`2Hzg zkHVX9jL$V(Jq_=0XA;KYRUG?oT>mWG#cLJcz6Ol9xXaO-5yn17&2ihSdeXIqr=C^BA*dfVqMh*J@!tjPTCFL#(lj zwZ`F(_;v^y1inEi!{`y#JHp6~2!-E-E3bi95!@CJ{+%d2tua2-1@s%s}t9>1* z;_Nx#`(ICi#~idi!HC_6%M>!WEVOORCHIJF7l@`4lnC{K(osFpYlao&&2@zWuk{GjWDi->)}?!vX7O!{B^_b7GRUZT~^>&Pm}W4 zOQRnigQExF=oI=PvLlcCi)-pDa$6L-FNf25l+Z?aiO*M%8CSi&kTq!>)_Q?^;agzCaujm0}{u=HImHSbj4zSi6XzUzxzQNijc&RVGAHKoWX2@ScOTBE{%%RMb&%IWw z+zwx296i(<;55W1^UV1ltwS|nDglKm&Gf}tr}*|rTWn+f9l7! z;Y=HuD363g-$gx<7(%;be4!7ew!T{$&&0QNT`T8h*ZC=Th2C9wpILYcD(S!Xorb+$ zP)qBeU!UQ{OoefQ_H!7os73C=u1?~pJSvlmr_f&NCoOyrqYkkSbBZIZOkXFyjadny zS6TZB)}14Qo&d&cAVL~P>}B@n;kWQ7cX3B?+r|t(b1UL81|Bklxzyck&NEMb3D@dyO_nLxH9wjAzHM? zaft;SzZ!m@;rV0qgp}l4K%T_xvDtS&06ybL$tL)=1HI1uHNB!_Z1nZz>p~k9xYt*=ET+NnJ zUMQxP!PQ}VImxQ+ZGiqMGDT)*BS=^Dj=3Ri_Yij(@%u4V)_i^%!}_c=O+ zGlXWc4iN2S?k97-CP;Pj7^~2ZnOpRs6|8l{#`_U2@tQ|SN4O)^3v?DX{_8n0oSyCp!LwdKEo)|dOK9uaF_WRwU)MXh(Fpu&RIW#S)h*@o}cY8_zU#(Y(Y0;DCw@k zb|uJYj?wsOG91D#Mlrto8r>{t0G({ExoJVdkJJ}^3x2S3LVnVc%K0hyNrdp$CK7u; zAG?J$r6Y5B|7tKk`c~77kG^$&;jKUVR`H?cQ$PCF9<*b*zSaEDhx4nfAOD10j2&FY zE}xJ7yt0=zxy$(?%ls+iEvZF$8RT*DPPh^A_BBLvz4;J1h2~^lswou7?5+R#Fjj!} zTXG}KGc@PY49n}SbX2A1@DNd2>InA4^Bl`!&JY-W7qf{&*j90t&!(itk%~iV9In9H zfwd8<0;x}Y-Xpzu!AUD4=6jmmX}4EvHs(~!=U73pk|S)cVdEz;U(_1w2&1dl8Lkc4>;Vuhi5q>}Luj(`e~eT9>z&nYPXRSVysn7YN)H;ttRE@DC=rBEG)I`XjoY z{3DK@V%5ns^Dok(HIC_Fxn61~MaQRb2hb?7f%Lj%%W8w{jZxA$PrpHD{3Uu{&yfue zVh?PLE);i^PGgR~4&IPE)A%dxOIPpb^^slQgH}Dm%s%v9aI`wxs4iCA+7FbS3s%+n zZerSRv}~K5Z&sB)&m&*F{+fIT7%AO<!{hG+Kgk-f+$(<-OSr?4_wrq<*Mw z|C8LZ{>~7qv*Kc>X%MUavMwqm&r$t~nR-8scv=IpS3^#-zRtUm>^zv2c@L!#$j`Qs zMJ*S3u;*vC$}Zr!@kf#BTXMi#o#|TYnKjBtA)>hP|j!_zHirhGbU&njrWL3JuF^+KwCus!FYjN;ckUdqch!gPGl-Jh-P%h<$d_Mh8V@OX3X4o5cQcg z&vHsd>Mf+KScj0^5IU2VJN%S9uM8E^VhoZS7280bykB5F`Xy- zwU2?na_eTed9kCCVkcvM4X&2aqjX>OK5iAogSeYlPFdT%Xsd;~cqy|gi#MKgxtI0# zy2)HMU2Lj)wV#Vcl~eE`?Wr82|6gk=r?=UbuJW`*l?Tym)!Wa5SXJ$#|JhGG8f#>O z!#Z&T{y|Q}_2U_(;&~M2m>T2#8Y!$M+bVWN>S3|omg?bEtn4KR^{1t^`lhV3Un>;( zxkro0EN7rtQA!8s2(g}LDmj;Zl5NDL9dr~(mG2#}*Tmir&kD$C^a;L?F`jik=X1?= zXJeWqrS~_HMd%3>_JA4v=MhWov-s0So{ukqDSK?hODRvg5nh^U9pd3!jsMMaH0{rC zU`O2c$J^9j!Utk0J?iFuxbJYJd-J-NZ9DFis2^|pO~tWkUO0@kQhpACR`_(07v}dQ z7gM?V6B3l6oT1PhLOUOlVU|JSd5q(z*L;S7HYfP`vnQ$4Q{K}O^u&*siDICA1!_?b zzQa0VZBB|*@xW)to&yG5`)!u#wqJXBXGD~0&l!49(yluprjsJsw*5xYfE1Qrr}@-K zKYIHVLQ!8ulI4_`p1&Uz2In#q*z9`jb3Lw-!cEwO!8FReH}d`UE;+8+t?%wO_r1Lj zK8V^gSky(_cN4wgvn=xKK0fPV&T#5WY7gerGLQ92(e}Mp)2x|0Qj9OMZqXm;eOAUi zg{X12x$E78_201a-;)!1^*wN}yJg;oeQ`b|v9s_?-7Ijq9sjGLo&EnZ8M1@zPnD-< zI)~^SFjvp{qbK6}kb$1#GpUw&U!9?TSp0~cfAn@>kW>$S6tX#z%XkXz$8&{tMR!uy zAYI#EGWdFywW!eoNj10$j^UYN$|q5(R%XO)Cu@zNx`!iH*MyVka86kYs|%-yuR^nV z9-hW{JHynAcEx=?mG}9@x8?Jut+bjsWAt_7vduHTC|BfD-pP&BU$)O(H{qquV6}P{ z^a(UO-#O$iHS-~QXCE_kzqIa2Ce>w=R2nbY)n$b+#b>d$N;9(bDb+Gel~2Z(d_N|A zMnmFe8y*N`gWDxK>+^c-mC}A$3CXjJ5+%4BA{^$9v2aZJmEvoV%!lT)1yiw*CXcX! zDx6%EPOf^>)VCL(-Z8!0#>{=p7aJJFCuUh?`bSdwP7Pb*BiKpMCUr*cpGpaFK z**iQ}#S;m%I(E6suPY~d75BNX&9jvLEJ}K+f+wuFy6MzqVKHOK^&>sQ(QcJp^ixPT zb4T?wtZlWkuAL!oKV{inwfu^iik`cp+{M>ewon{>9r?3ViGAowJ53>EUB&Y{j|bIQ zGtTkp3P$ARRf*N><#crT2apyhlH&vcv5ldJ6Y zu2Q@nbJhvod3Hx;N-vIDBKuK16CxeC915Sdd5+ULPhbn%cs++ldx>7>IxJ)}{!;ps zHtjYs|B?tQnqlWCSv@iG6|H|8Gc?0~5IZ?MJ$4*%KZKnWIaH>3Wsy_<7l7o1xu%wl z7Y(&%jf%LcUX{gzt%&s)9M^M6^*kgMCQa|b>?9>|*ZSFbn`(6R|CEs4>*>Y0AJZ4l zbDpXbzt*0wMa#c>e)8E|c|w+W8ZD~dysG}rOTNj^a^5=XH(G)JZzZ+@`KYV#yYzwb zGlhgxuB%0?HZJUdaf>#|9BR7gLo=J?ej6dyjie_T#ZkBMWSZBSb5}zQVYOQOQ*Q-F zyCy!Ph&kh-&Rbb{dg+0v)vK-N5H)&JV?8E3dzC&#oyRtRmT`C^#_ zDH1(pH%fLLSV0XT$0?-GXH8{|qV`mCkeX3_SMA6~~bx%w338Q6p`hSlDNog{fcl*;Fp=$AG@<=UM8X@h2@h!g~F>f8Zrvha0=-^gl=7 u4{Nx8!FJPV@>9~6I!a_OsEy9l>k3bikHH1{yq!yGOs=JtD~ex}_x}MJyy~j} delta 45 zcmV+|0Mh^JoB{4|u*LziTmsexlPC-}vxEwy6O#-XLbEC$$`q4kFgUYXJKh1alu6bE DuxAnm diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index 90f6d877a961128181ee8ef4c95ca45ac5b4aced..a8feaf5af8d51eccb7eb08549b442a78f2ffa9f4 100644 GIT binary patch delta 667 zcma)3u}Z^G6up%up)o?Li$awk7%M7ua0@!Apdg3}f`d>@41t)GrnNdqHh0ob&EIx4-H0$_DL0#Rbd37tsm+Z93b+cAdiQ0^u0M``nYM zEPs|SRz^?#Q!sB<7x+V&=Ox+X7g8iBapayDj=ngAL>uRBn5JiZpBJyzSlEII1 zSgP=Yy2!dxPrj9(sks5Q2VfJXi54RPME~`~^=UhSC54 delta 69 zcmZ3W`Aunq9qZ;7Y;KH`Kd_ih_Te#NRbT+Z$rHKdCqLrQnEZ;xZ}JJ=qRm2_ub4ne XHv8}}F;2d~Be2$L@!%KeT=NB< zgk1dszrqjkV9joZB@0GmVCdJBP$26nvB! z)p3O-6m;Na^R{C1N2uYN*Z?22Y3K2GhWRu@g$$;*-+5~51G6!S35=sfq)~N( zTeM-3R!cdm3se!3vrfiNtY*DJ7m7K>oX@(%9bX|DM3}dUjRIwTE|mCcGAnpGIO831 zo*=8FhK6o?d9$hiGd~@3+C36Qt%$MMcNqJua-Shj4G-919B{58F2pK!sW|Oi&`E-! z>xeDp8tnFGvCnUkG-Zsbq)qR6x#bd9XtDgvOLZ@YO5d)P$_9?tkP>&)1=j~==_CwM@JCybHc6xT#8 zFvTNc3>n9)>)jw@Rsa4bkNB3dCUnMIEFoDk<~}>)97|l(hTdAL8Rl#n5Huic$<_s9 zH5%Rq_m(CkYK(ySh=d8FjQNz2WJE*?KO=)r4hfmqS4k8@id@d(eH?nl{;D2