From 154420278d23de595979c462d2d40965d97b6de3 Mon Sep 17 00:00:00 2001
From: Kevin Poretti <kevinporetti@gmail.com>
Date: Mon, 22 Mar 2021 19:59:14 -0500
Subject: [PATCH] Reset combo flag

[git-p4: depot-paths = "//depot/main/": change = 37]
---
 .../AnimNotifies/AN_ResetCombo.uasset         |   3 +++
 .../Melee/Air_Attack_1_Montage.uasset         |   4 ++--
 .../Melee/Air_Attack_2_Montage.uasset         |   4 ++--
 .../Melee/Ground_Attack_1_Montage.uasset      |   4 ++--
 .../Melee/Ground_Attack_2_Montage.uasset      |   4 ++--
 .../Melee/Ground_Attack_3_Montage.uasset      |   4 ++--
 .../States/BP_ProtagAirAttack1.uasset         |   4 ++--
 .../States/BP_ProtagAirAttack2.uasset         |   4 ++--
 .../States/BP_ProtagGroundAttack1.uasset      |   4 ++--
 .../States/BP_ProtagGroundAttack2.uasset      |   4 ++--
 .../States/BP_ProtagGroundAttack3.uasset      |   4 ++--
 .../Private/Characters/SNGProtagonist.cpp     | Bin 10744 -> 11154 bytes
 .../Public/Characters/SNGProtagonist.h        | Bin 4072 -> 4498 bytes
 13 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 SwordNGun/Content/Characters/Protagonist/AnimNotifies/AN_ResetCombo.uasset

diff --git a/SwordNGun/Content/Characters/Protagonist/AnimNotifies/AN_ResetCombo.uasset b/SwordNGun/Content/Characters/Protagonist/AnimNotifies/AN_ResetCombo.uasset
new file mode 100644
index 0000000..ec65779
--- /dev/null
+++ b/SwordNGun/Content/Characters/Protagonist/AnimNotifies/AN_ResetCombo.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb3302071f75e7d93776b03ebad0af9fa0c403e33b2b1ce4378e6870c37d3592
+size 23359
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 9deff79..0e6d6b9 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:6761ea4225dc8f32474c04277c19f7cceab85c5b50e50931a9b1753786056c40
-size 98511
+oid sha256:1b42e0b4e12a0cc14f40b5f1d37b40fb4edd569fdcd602d6ccacfcbca964667e
+size 101031
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 0a965ad..dfb23e8 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:ea6b83fe148cae75b2952cb52c21ed9a3a09929b06aea66893c0726c28a3f826
-size 97073
+oid sha256:1471002c02a81241b70c4834d500fc5142482c8c61784f066dd55a065148cb01
+size 98679
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 b80eadf..5521ff2 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:9dbe46bf12bd821830fcb8720ef3ae1da1251676c3e100f781e812824106a9f3
-size 98597
+oid sha256:064bb5c356f67d97d132e044a0c33593d9a6c04981edc6fc71caa692aaf694da
+size 100099
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 8bf8934..be72034 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:6ad6751e57fb29e52b4c82411e586a10e1e7cb65e7d7d871e63a96585a9cb05e
-size 99753
+oid sha256:a1f59389147cc2bd03c9b10d0ee60f517ac139c3ac0670edb0070e93569c216d
+size 100999
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 46a5470..17f1b13 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:fb2216fc6e9db25ea4fe3851028196d97946482fb16be53c3b650ef7362df43f
-size 99089
+oid sha256:77003cb10755dc4ae9629ab3dfb1011b3e1f7c599750b63ee09298fa90f74a9c
+size 100188
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset
index 3ade6d3..955462b 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f8e1a15cb2f4cf70a6465cbaf50f453135181e2b49748f61c42645439fd02d4
-size 103492
+oid sha256:7e7a94f3b3616d0894230ee31ccdb6e1fad07c41eec07d875a869e11905a9c99
+size 132964
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset
index 8131a01..985996d 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack2.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:165bf9f15eda10c9e5e64b36b18d505d4854dd7100b528837d968da2cfb987ee
-size 103991
+oid sha256:e271f4891f944a659117c9b902f5672948c3b47c83090612bebf4120e5b39e63
+size 101903
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset
index d6eeccb..b11407f 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:7f04da310c025be9b91479f975036f39a7ad7921be091f6ea500c0695acf1255
-size 98583
+oid sha256:3fe666ef66decc8bc62083c54f680abc8604da0ab8e143c87ccd4aa586552fea
+size 129856
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack2.uasset
index 06c44d7..eaccdcc 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:23520e6dc98da7c0b02a036da10e0edd6970e492f864e93ba0af26c720eb14c7
-size 98678
+oid sha256:23224299273a0a806f72fe09715e4c4afef30569db5946feec2a828a11cc35ef
+size 129514
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack3.uasset
index 234d70c..6464523 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:429fe1c980e83dd7fcc6b5d9759288d92b5f72ebdbd353999cc67a5a0c42125a
-size 98931
+oid sha256:e661470af848489d2985685a9aff673b86a1bcc47d998c17d509b2d50e03e9c4
+size 130498
diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp
index c3a5f2698490f856f47f4e52fc61f9a144ad3a9b..b4487ea0cec146f4b895d20e5acac9894594c99b 100644
GIT binary patch
delta 232
zcmewnJSlvGoD{PsL-FK=V&dk`4EYSX3`syTh#{4s7>G+4G#E4)cp11Ds=*{DLlIcC
z6iDYWC;-($^$KF>o%~<Lo;4Vx8f3O3LS6%GLq0<eP(M&N140I2E2^DvTMV(ORba5i
LZPMn4lHvjY7{4zP

delta 12
TcmbOf{v&vUoYdwW(zo~lCY=S0

diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h
index 845b52a68daeafd3021277f6f081ce4916caa81d..c2a99e95b4767f9c277898d29212e9b57dad911c 100644
GIT binary patch
delta 183
zcmaDMKS_B*82jW0tZLlu45<tyK$yx<G+B{LnAww|c=ACeaZzW6e1=?xBp?|Clq&|S
z(wKaaHJmjV#0IG`N2t*NtITJ}VNhTIn!tdNLFm?Gux8+8;9}t1?9Xn_J~@C_WbzkQ
cp~(r%0+W@vgjkb68bQViW6`|1oUf1(0FZtuw*UYD

delta 17
YcmbQF{6c<182jcb4g>bh1_DWp06Mq@i~s-t