From d7de0d3846ac7b88f12bdd453055587d6ee533d1 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Mon, 6 Sep 2021 16:13:25 -0500 Subject: [PATCH] Create separate revolver and shotgun UI; Add ammo counter to gun UI [git-p4: depot-paths = "//depot/main/": change = 121] --- .../Protagonist/BP_PlayerController.uasset | 4 ++-- SwordNGun/Content/Maps/Test.umap | 4 ++-- SwordNGun/Content/Maps/Test_BuiltData.uasset | 2 +- .../UI/Blueprints/WBP_RangedWeapon.uasset | 4 ++-- .../Content/UI/Blueprints/WBP_Revolver.uasset | 3 +++ .../Content/UI/Blueprints/WBP_Shotgun.uasset | 3 +++ .../Content/UI/Fonts/CloisterBlack.uasset | 3 +++ .../UI/Fonts/CloisterBlack_Font.uasset | 3 +++ .../Weapons/Revolver/BP_Revolver.uasset | 4 ++-- .../Content/Weapons/Shotgun/BP_Shotgun.uasset | 4 ++-- .../Private/Characters/SNGProtagonist.cpp | Bin 20304 -> 20272 bytes .../SNGWeaponInventoryComponent.cpp | Bin 5744 -> 5724 bytes .../Private/Weapons/SNGRangedWeaponBase.cpp | Bin 3644 -> 3752 bytes .../Private/Weapons/SNGWeaponBase.cpp | Bin 2074 -> 2444 bytes .../Public/Weapons/SNGRangedWeaponBase.h | Bin 5110 -> 5230 bytes .../SwordNGun/Public/Weapons/SNGWeaponBase.h | Bin 2594 -> 3436 bytes 16 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 SwordNGun/Content/UI/Blueprints/WBP_Revolver.uasset create mode 100644 SwordNGun/Content/UI/Blueprints/WBP_Shotgun.uasset create mode 100644 SwordNGun/Content/UI/Fonts/CloisterBlack.uasset create mode 100644 SwordNGun/Content/UI/Fonts/CloisterBlack_Font.uasset diff --git a/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset b/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset index bd48a0b..9cf7b9d 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:647bcd273d9703c3e62538cff767c64f0cfd31214863fa0462611c5ce1a92d4c -size 15447 +oid sha256:477e5123eeb9e7c0d041e16429ec7bcab3f3f186203d77939ceb1e52bdc20327 +size 15406 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 048c772..321afe0 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:b993a863e255fffa45e66048e4737c20826beb1ae27e5bdf3883183bd93c2da4 -size 688108 +oid sha256:aeb18b3a35a9457bcd5cdc54d9f659365962244d0d0d66838e23ed86c5161d27 +size 685766 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 899d4df..9d5f26f 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:2dbabbe61b4787bbdd12029232c54b0f50ca64efdcd0edddbeb2260fc611c24d +oid sha256:18f7fdb8883e81388af29c35d8edbb972f49f192f2a9511e41dd6f680c6b94b4 size 2330061 diff --git a/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset b/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset index 37d2ad4..43d3ce8 100644 --- a/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset +++ b/SwordNGun/Content/UI/Blueprints/WBP_RangedWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1935c536d774a26b8a0d19cc76efa7a34b9b9509523b4d7cd4c4eefc096ee1ba -size 61733 +oid sha256:8fb30e594052323a5576f67feaf8d7ff663074081260690f53c543337eaf615c +size 2316 diff --git a/SwordNGun/Content/UI/Blueprints/WBP_Revolver.uasset b/SwordNGun/Content/UI/Blueprints/WBP_Revolver.uasset new file mode 100644 index 0000000..75f30a4 --- /dev/null +++ b/SwordNGun/Content/UI/Blueprints/WBP_Revolver.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af48fc9606ae0c382bfa7bbaf62c05f43aed7e85bdd8c0dea10c1602aa89414b +size 91261 diff --git a/SwordNGun/Content/UI/Blueprints/WBP_Shotgun.uasset b/SwordNGun/Content/UI/Blueprints/WBP_Shotgun.uasset new file mode 100644 index 0000000..1909ada --- /dev/null +++ b/SwordNGun/Content/UI/Blueprints/WBP_Shotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a36275eeffa5b4bb200d6263517b8aa20bcc4859d49b13a33ea01f4bd649de06 +size 90910 diff --git a/SwordNGun/Content/UI/Fonts/CloisterBlack.uasset b/SwordNGun/Content/UI/Fonts/CloisterBlack.uasset new file mode 100644 index 0000000..92fc808 --- /dev/null +++ b/SwordNGun/Content/UI/Fonts/CloisterBlack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69bb08052b700c923a441d1bd946c628d95a230c0c0669f725610a4be3d08114 +size 73236 diff --git a/SwordNGun/Content/UI/Fonts/CloisterBlack_Font.uasset b/SwordNGun/Content/UI/Fonts/CloisterBlack_Font.uasset new file mode 100644 index 0000000..17da33e --- /dev/null +++ b/SwordNGun/Content/UI/Fonts/CloisterBlack_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04864ad61963ed432e03854c518d4908b9dd249e370dab4c6d938c35469c1472 +size 9478 diff --git a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset index 3c62ece..1e4a45c 100644 --- a/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset +++ b/SwordNGun/Content/Weapons/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a0357fc01113755e54c4edfed1e626f523a1533028b7b1fe21d757cc7aab7da -size 129619 +oid sha256:2137d7fab22d58928c1e0ada8d3d6aa6206e72947c97c91d96750eb4c1b1ba17 +size 187368 diff --git a/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset b/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset index d04bedd..3d412b5 100644 --- a/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset +++ b/SwordNGun/Content/Weapons/Shotgun/BP_Shotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b70b445c3a61bd989988ea2f647d3a4ce9d05f262382eb5adc325f20fece3ec -size 108755 +oid sha256:7de094080b0233351249600210db3f1bdea5e8f48b6880b614811b19411002e8 +size 205727 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index 167a43bda01b3cc5a25fd2f82a03535cc6d4aac6..8de784ea3a2a70354e1325b56a2752aa2b41211c 100644 GIT binary patch delta 98 zcmcaGk8uMKwW$k-GUPF&G88hDGGsCo0AVUa%H)e0l9TzgGbSgfOKi5$n8Soi(Plnv SHD*CqRNV|3n*;U!D*ym*hZ@5G delta 132 zcmdlmkMY7h#tm)i@?i{_48=g41jIQ&T*6Svpuv#FkO<@zGo((o)exWjODkh?g1W@y h3hkQB>ogRYh|#q9mzEl{Fc#A%8_J4qw$b~d003soBR&8C diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGWeaponInventoryComponent.cpp index 0c9b783e5e28112a4adceae042a54e839811f2f5..31a4d3190f2156b311ff562146f30ec6550ae2d6 100644 GIT binary patch delta 76 zcmeyMb4O>x2SL$LhCGH;hC+r?hD?S6AWUUQVbIvjFZ7gI5vvq~CWAEtF9R0?Cj;kX LK`!yhW@1(V25At( delta 80 zcmcbk^Fe3B2SNEThD?THAWj0}93U=XsASM!NMlF@@`@Q!H?s;oWhSI(@_*4-0B89W AfB*mh diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp index 0c7e18ca3ec7895b1aa978b1946e671e17af037e..0848997440d6ae3bc3a3e91108cd0a5e4168772b 100644 GIT binary patch delta 114 zcmdlZvqE;mCN^zO27iV;h9HJih8%``hD3%GAS;DIkHLwd2+B_eiWW1JFlbCxWLIR= hoE*>YyZHxO7n?FjqZ>meP$6C|%$f|=lQ;5q0|3m68D9VZ delta 59 zcmZ1>yGLfjCbmhOT$=^hkFiZ&#ml3d$dC(!`3wpS$w0D{A&;R1$S!3lU`Sy|1hP{Z KQYOptbprtLeGdHq diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGWeaponBase.cpp index 148ac6c77a3949f2635652f7d85d01b6ac85eed7..51a6f384cc26b73d4015a5a118800ebde6caba6c 100644 GIT binary patch delta 208 zcmbOw&?CH|i)HdOmLh&vhC+r?hD?S6AWUUQnas#8Jeh@6%DRN12q>P)pvhp(z{|kJ zz{%jxkjH?gnn91j38*fgA(0`4AsI*(Gn6oBOzvg1l?(>zEnx@+>Pf|JgJT*{eGX6u Qx*b^b;I?No6RQL>0C)Z=F#rGn delta 28 jcmeAXo+YrMi-kL!A(bJKp@1QuA#ZXgOY!C^HX&vJc0C8! diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h index ee83cf35652404c4fdccfb3a3d7f4303be7b6d24..16bd6100256dff7d303ebfe39bc4bac4e20160dc 100644 GIT binary patch delta 173 zcmeyS{!U}VH%7sD27iV;hE#?ChD3%UAkLj!$Rs+Mi%CXXhe3fM6DU{0V9a2|0OC0_ zlmgWhF*q{h0%1OopAQrPs+c^NDRFWeQwk2#{xK<$V%lbTW_DJfaT1d!u(NIU;8@2E E0DC?r-2eap delta 49 zcmaE-@lAchH^#{um_#OjV3(PEhsg)Xt^o7>n3aHhj?GJ$|FHlil{O#XSjPet=rAtx^z5#AqYh)+W|t!MiBTKkyd_ z`8WOrJ$V;=G4xUcR*;3=d2eQR=grRZ%=`Syi8ip|U=w?=a7e2O8x0%~?PHgGlV_dY z+BdRLr4`3GuEw*7EgZvxi!M57lexhye4;MdGiLd?Anzh1-y^q-HB4a=_JG0v z{d}EId1ICk9cfRRd}LrAs(d3rc{wKv(V|D;j{9(m6t0N^w8S(_S<%