diff --git a/Content/AnimStarterPack/Aim_Space_Hip.uasset b/Content/AnimStarterPack/Aim_Space_Hip.uasset index 22edd82c..2dbdd0fa 100644 --- a/Content/AnimStarterPack/Aim_Space_Hip.uasset +++ b/Content/AnimStarterPack/Aim_Space_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:744d5ce173f1742c02ca16878ccf7f7fe9651ee8316b10256cda0a0418d48806 -size 1531 +oid sha256:c2c16e6eace2fc8327df2fcbc7cf54c50a5161dcdb00375a91623cdf6cbc24ae +size 188546 diff --git a/Content/AnimStarterPack/Aim_Space_Ironsights.uasset b/Content/AnimStarterPack/Aim_Space_Ironsights.uasset index 1254f54f..de35bc98 100644 --- a/Content/AnimStarterPack/Aim_Space_Ironsights.uasset +++ b/Content/AnimStarterPack/Aim_Space_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea9960ee88b4dfb03d4e1c1bb6086abaf64625ea5b3e4ddbef54e5a478c6f5c9 -size 1587 +oid sha256:5b7bae25f911f397715577099f1737e20c5ef0eeb705c32316ed4139117e95f4 +size 188243 diff --git a/Content/AnimStarterPack/BS_CrouchWalk.uasset b/Content/AnimStarterPack/BS_CrouchWalk.uasset index 7631efee..a8f156d6 100644 --- a/Content/AnimStarterPack/BS_CrouchWalk.uasset +++ b/Content/AnimStarterPack/BS_CrouchWalk.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82ca172c885f2f1fff864074bfdb420a45a0c1954250082afbc43c7ad0bc8222 -size 1527 +oid sha256:7ff0b12b2467d3ba0b80336401662b6906e4844b2350a436a17d78e0e9cd6265 +size 103283 diff --git a/Content/AnimStarterPack/BS_Jog.uasset b/Content/AnimStarterPack/BS_Jog.uasset index 97cc9577..9cdb8ba4 100644 --- a/Content/AnimStarterPack/BS_Jog.uasset +++ b/Content/AnimStarterPack/BS_Jog.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9f7ac6d9a79e167843a27a5816d91f84a8c1dcc79e03d999538c596b913cc97 -size 1471 +oid sha256:2ea9fa690d60831caffcafd82d994c3f60baa442404951c86c491120a0f81489 +size 101424 diff --git a/Content/AnimStarterPack/Crouch_Idle_Rifle_Hip.uasset b/Content/AnimStarterPack/Crouch_Idle_Rifle_Hip.uasset index 7c1eb2b5..1f00a491 100644 --- a/Content/AnimStarterPack/Crouch_Idle_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Crouch_Idle_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:614c44f4031bae94034a43245a79f22253281fc9b4609d140ccf20cf5191ced2 -size 1595 +oid sha256:69a34d7fa650f93fa067e010b3acd9cbef8374e17307d4de7603695f7f27bc4d +size 274931 diff --git a/Content/AnimStarterPack/Crouch_Idle_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Crouch_Idle_Rifle_Ironsights.uasset index 02b0e0da..fb752aff 100644 --- a/Content/AnimStarterPack/Crouch_Idle_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Crouch_Idle_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70f4e0b8f5c41c94fcf93c0ce9a34b31e1beca4cf24f6c4b4ae123f4be2b6d0b -size 1651 +oid sha256:a61ee8829cee45361ee69296563272b282f60ce542dfd2155ad2d97662c9ff6b +size 273362 diff --git a/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Hip.uasset b/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Hip.uasset index 294cdb7e..3aaefdbf 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:558d111bb0c54e1d133a45c95272ed2e3d9a228cbb9a71b886a2c60147de5ef4 -size 1627 +oid sha256:160bbfe193cf1d3b3a3969488e015750fb52597408c9b1aec1054c80c10282c6 +size 164111 diff --git a/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset index 7fc8c7b9..a50a2efa 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8430a76a0f8e239aa64b3d84010e15120ae5598c7cd078c2ce8760d5bff768ef -size 1683 +oid sha256:a839e3356baa6a299feba099a1a963ea18ac19e02fdb94de8e3b15f8fd9d2b71 +size 162475 diff --git a/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Hip.uasset b/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Hip.uasset index 4076da0b..0bbeb8dd 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:250de583ed08fb83ef52936277b131834b2f6c782a4d78d06b09c301442ae2d0 -size 1627 +oid sha256:451b09121c8b153e8c037db4aaff096c827df4b4bf579684161463bb95e6ce76 +size 162779 diff --git a/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset index 6555a1b3..373e3ea0 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9a71389cb9df2dc371638809a809c5a6fa35748a222a822960a8d62214e345e -size 1683 +oid sha256:3c4f95ed8fb9042b8ac6d7c2bbb6849c47952b5ce278ef6b80bb4e5d0ab143ad +size 161486 diff --git a/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Hip.uasset b/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Hip.uasset index edf7f88a..096d305c 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:076f97874626aee435f79536d6a1a3a01ab4104b1bf4be454c412c67f4f93a0a -size 1619 +oid sha256:684a76e4bc017b76c4a2d152f3cf4408a037e6c541494ab044d2c276c0222dad +size 162832 diff --git a/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset index 29dea3ff..6bed8ac7 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc4cf377a159262a1b5b88ded83a42dbb4b1ffef3360dcd06657ff3c4c7e30cb -size 1675 +oid sha256:c4b17ad64131d8655dff3bf0f6d943e83c906f3b71adc44a7b498fbe6a3eec23 +size 161801 diff --git a/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Hip.uasset b/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Hip.uasset index 0fb02bef..9d554411 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f6cceb755e1b52ff87ebde3f42b177061cb22f40faa88e4706db890b194152e -size 1619 +oid sha256:9e0543e60def9006f8ea84b1392c7761aaca48af42ce8d209d3a8fe7a4d40cdd +size 163011 diff --git a/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset index 94f63927..c709bb7e 100644 --- a/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:182c662d6196382e06ac56d864b6c896c96443b27fb2cd358831680fd74f9e2c -size 1675 +oid sha256:f153046369c877511b96de889d75989228c7320a7580d282c6cc7d28d1341b0f +size 161951 diff --git a/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Hip.uasset b/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Hip.uasset index c346f2cd..7471a03d 100644 --- a/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43a60b4f8f24cc99078bc898bf6bf3d0947d6f022a7239ca97f57ea645b41895 -size 1627 +oid sha256:d81b911926f77953e6b46cfde3e2ef3be13c6edad2dff8ec0a1bcad0812db1cc +size 124784 diff --git a/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset index 6c8cefd4..4a202a91 100644 --- a/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:207b8feaac7e06df18bba27939b31b932536d789bd6bae8df57093dbb2b3adea -size 1683 +oid sha256:d05d2af612368838060c2cc5cfc694b7df6103467b42a984848b3939b278178e +size 123072 diff --git a/Content/AnimStarterPack/Death_1.uasset b/Content/AnimStarterPack/Death_1.uasset index c12d9a8e..9296967d 100644 --- a/Content/AnimStarterPack/Death_1.uasset +++ b/Content/AnimStarterPack/Death_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0af7a63526b0647d52056b91178e96d2f5c644690a2b1ee6c97e7c0e8f599c44 -size 1477 +oid sha256:0a409188568d20a3f97ad3ee1d72b55f9a32e21de0b39d08e13261e891bf1f2c +size 181646 diff --git a/Content/AnimStarterPack/Death_2.uasset b/Content/AnimStarterPack/Death_2.uasset index df204933..c8c79647 100644 --- a/Content/AnimStarterPack/Death_2.uasset +++ b/Content/AnimStarterPack/Death_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d11f26e4a4ad218f67efa409f7f0ae149cc646506ab5a46560a923c1e8f2fa0 -size 1477 +oid sha256:9c2bcdc686e0064034395caa24788e1f68b53e9f2513debcc424bb6ecb8a0243 +size 178337 diff --git a/Content/AnimStarterPack/Death_3.uasset b/Content/AnimStarterPack/Death_3.uasset index 48dcfa2a..8f8ec341 100644 --- a/Content/AnimStarterPack/Death_3.uasset +++ b/Content/AnimStarterPack/Death_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:936a9422d9d6e0aa1989ef8228b4288435fd337151d895e351dfee33b8334fae -size 1477 +oid sha256:5a1136840a33b85b355882f3f1a9c1fe72e5238cd01971ea309236de310dd687 +size 199405 diff --git a/Content/AnimStarterPack/Death_Ironsights_1.uasset b/Content/AnimStarterPack/Death_Ironsights_1.uasset index 79dd0c09..9415085d 100644 --- a/Content/AnimStarterPack/Death_Ironsights_1.uasset +++ b/Content/AnimStarterPack/Death_Ironsights_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:913331e1008ac9e01e83ff5ed1585424940cf845b6c325d3d1646356a69a0563 -size 1565 +oid sha256:d795e63d710e58b16dcff560305530eff5b23f1985a16d82133743d619ef28d2 +size 195153 diff --git a/Content/AnimStarterPack/Death_Ironsights_2.uasset b/Content/AnimStarterPack/Death_Ironsights_2.uasset index 9c3d33fb..cbb29b7a 100644 --- a/Content/AnimStarterPack/Death_Ironsights_2.uasset +++ b/Content/AnimStarterPack/Death_Ironsights_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bca8501d3e099d9caaf2a6f50f7ac92fa50ba31f76912c3ac710c908eaaf5e32 -size 1565 +oid sha256:eb4cfbc5804df5527f6b39289e9629cc42ed461a5daa3566a885f8c46901da31 +size 177351 diff --git a/Content/AnimStarterPack/Equip_Pistol_Standing.uasset b/Content/AnimStarterPack/Equip_Pistol_Standing.uasset index 42a3940c..4540ada8 100644 --- a/Content/AnimStarterPack/Equip_Pistol_Standing.uasset +++ b/Content/AnimStarterPack/Equip_Pistol_Standing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b8bbab8958f0021e46d3d7b887304df7164cd78754c233af5d9f0449603228b -size 1595 +oid sha256:1f71b8e27bb0bf658808e30cf1d374fe980d695e4c23f4d720350e01714f5bfc +size 195932 diff --git a/Content/AnimStarterPack/Equip_Rifle_Standing.uasset b/Content/AnimStarterPack/Equip_Rifle_Standing.uasset index 333ed486..ddd6e183 100644 --- a/Content/AnimStarterPack/Equip_Rifle_Standing.uasset +++ b/Content/AnimStarterPack/Equip_Rifle_Standing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:382e76f615aebf9756c79fba406dddb2a93e27db2b526567419e266b5e0f1951 -size 1587 +oid sha256:ce1901a59b4c8263a75c96c7a59db1aaf6d41e0a6e810726930b69e43f531f35 +size 193980 diff --git a/Content/AnimStarterPack/Fire_Rifle_Hip.uasset b/Content/AnimStarterPack/Fire_Rifle_Hip.uasset index 34bda317..7a5dd2c6 100644 --- a/Content/AnimStarterPack/Fire_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Fire_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:702cad18a3ca5cfb84fd3080599ffea6e84835160dc373783df64cc8dbdfce98 -size 1539 +oid sha256:fecee6bc8acfcb9504d8263e76205e08cda10811e0061d2510c5ca690eaaaac8 +size 112330 diff --git a/Content/AnimStarterPack/Fire_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Fire_Rifle_Ironsights.uasset index 57980ba8..44543138 100644 --- a/Content/AnimStarterPack/Fire_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Fire_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb0b96ff08c5d9688f91014c76a3f9f348943566ed9fdbfa429526056a1bfc92 -size 1595 +oid sha256:9dc6e9aaf143d9899babd94f15b2fe8844f7b9263691991fc4041ba2141de3e5 +size 111380 diff --git a/Content/AnimStarterPack/Fire_Shotgun_Hip.uasset b/Content/AnimStarterPack/Fire_Shotgun_Hip.uasset index c2ad6e11..dd42cbe0 100644 --- a/Content/AnimStarterPack/Fire_Shotgun_Hip.uasset +++ b/Content/AnimStarterPack/Fire_Shotgun_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af1b660b8bb08da9190d7e315ab5ac59b87f6e66340b8a33412bec6584e4aa8a -size 1555 +oid sha256:b4e014e4b8e6bd8d4c09d79ed000c522ee2f5aabf1771d0dfbc0a603f9562f76 +size 144387 diff --git a/Content/AnimStarterPack/Fire_Shotgun_Ironsights.uasset b/Content/AnimStarterPack/Fire_Shotgun_Ironsights.uasset index 6bd46c5d..4dca0198 100644 --- a/Content/AnimStarterPack/Fire_Shotgun_Ironsights.uasset +++ b/Content/AnimStarterPack/Fire_Shotgun_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c71eb9d0c9a915a8ecf48f96ef22194ef2b045e930d51b983bfea855ffff751a -size 1611 +oid sha256:d3943744c98170bb5a3717e016c610a432e77cda94adcee85c64df4159bc6563 +size 141701 diff --git a/Content/AnimStarterPack/Hit_React_1.uasset b/Content/AnimStarterPack/Hit_React_1.uasset index 5ff6cdfd..0de7d83e 100644 --- a/Content/AnimStarterPack/Hit_React_1.uasset +++ b/Content/AnimStarterPack/Hit_React_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0854832c7c4f669816401050baa5dffee023b23ff3174c352f3bcb7b9347feb3 -size 1509 +oid sha256:a067fa97220ca3a7f56199f6b58ddf888f66e5359694ffcc64eef7fb7e321148 +size 132820 diff --git a/Content/AnimStarterPack/Hit_React_2.uasset b/Content/AnimStarterPack/Hit_React_2.uasset index 906db606..ef0abe31 100644 --- a/Content/AnimStarterPack/Hit_React_2.uasset +++ b/Content/AnimStarterPack/Hit_React_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eca48d407c4caff1f8aaec6a8cfe3e49a1353c7716ca2d0e56123dede095b07 -size 1509 +oid sha256:fc51b2d6721967b118bccc1031191e22633bab2987a004a6a873163f8e130a11 +size 133658 diff --git a/Content/AnimStarterPack/Hit_React_3.uasset b/Content/AnimStarterPack/Hit_React_3.uasset index cd85924a..001604f8 100644 --- a/Content/AnimStarterPack/Hit_React_3.uasset +++ b/Content/AnimStarterPack/Hit_React_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fe34e1557bbbf14fe5bfb9afb465ab356710b799a08dfae68a91cfdf3dc5998 -size 1509 +oid sha256:841411f30371cca90309c453e77030eac9d0c79ece652b12a0292606d2a8c2f8 +size 133138 diff --git a/Content/AnimStarterPack/Hit_React_4.uasset b/Content/AnimStarterPack/Hit_React_4.uasset index 09a60026..7b6227f9 100644 --- a/Content/AnimStarterPack/Hit_React_4.uasset +++ b/Content/AnimStarterPack/Hit_React_4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77d92f40510e76250365c52e5d616b589e3afecb538fad9d023d2b72bdf98942 -size 1509 +oid sha256:ba62f4a8c2e151da1b3a7a161c03f09027de537dd6c1f0a218985fee57a367b5 +size 133343 diff --git a/Content/AnimStarterPack/Idle_Pistol.uasset b/Content/AnimStarterPack/Idle_Pistol.uasset index 3b07435a..1b4a59b0 100644 --- a/Content/AnimStarterPack/Idle_Pistol.uasset +++ b/Content/AnimStarterPack/Idle_Pistol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4336f63e49713a87a48ba46d9ed77cde4b577ea81ae5bbb4a07d7fe177e12219 -size 1515 +oid sha256:b3b2e3a0279ac45993ee978461ea6018cd7590818dc5be7c6f76b441150bd272 +size 276217 diff --git a/Content/AnimStarterPack/Idle_Rifle_Hip.uasset b/Content/AnimStarterPack/Idle_Rifle_Hip.uasset index 96f11418..41c7ab69 100644 --- a/Content/AnimStarterPack/Idle_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Idle_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e713fb4e62347cbe705fded6e72d1ec660388be8bf30b85a975ebaed7c0bde29 -size 1539 +oid sha256:c10957e249c797e2c392394fb6d8b506859e8dd0f52e41e871a5a46fa2c3757b +size 277628 diff --git a/Content/AnimStarterPack/Idle_Rifle_Hip_Break1.uasset b/Content/AnimStarterPack/Idle_Rifle_Hip_Break1.uasset index d2ada2be..36c77875 100644 --- a/Content/AnimStarterPack/Idle_Rifle_Hip_Break1.uasset +++ b/Content/AnimStarterPack/Idle_Rifle_Hip_Break1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce7bc692511936d1bf2843c4fcb39709cbbb59ee925934e68c2c4f6bb506b1ac -size 1595 +oid sha256:99b18185d81daa06179666ba694e283447327f96e1addde7dd3bdad16df91bd1 +size 250239 diff --git a/Content/AnimStarterPack/Idle_Rifle_Hip_Break2.uasset b/Content/AnimStarterPack/Idle_Rifle_Hip_Break2.uasset index 7e43b8b5..b42534bf 100644 --- a/Content/AnimStarterPack/Idle_Rifle_Hip_Break2.uasset +++ b/Content/AnimStarterPack/Idle_Rifle_Hip_Break2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d32a044775bba20e63513b3fecfe40881662ed21d56224dd62204f8d72d0260a -size 1595 +oid sha256:7585cb067b2ec15c54111fe07ab3643b8b4187837fcd6c6ca349ba86a106b9ac +size 270515 diff --git a/Content/AnimStarterPack/Idle_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Idle_Rifle_Ironsights.uasset index dcf9d154..48504af3 100644 --- a/Content/AnimStarterPack/Idle_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Idle_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22e867e941aa67f6024aad08eb26dc077be8f02dc4d93e7286fbdccf4c7b960c -size 1595 +oid sha256:bf32e388be17f181b63f9a716498250554399e397ee674b7067b4944ef1b97d1 +size 276375 diff --git a/Content/AnimStarterPack/Jog_Bwd_Rifle.uasset b/Content/AnimStarterPack/Jog_Bwd_Rifle.uasset index 61df8c19..81c27a3f 100644 --- a/Content/AnimStarterPack/Jog_Bwd_Rifle.uasset +++ b/Content/AnimStarterPack/Jog_Bwd_Rifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bce2f69cb86a5347b731ad5a73ff134d93e2b446ba1a75c3bfd07e26ef2ab9b3 -size 1531 +oid sha256:d48f2e65466394884c1ea37cea6ea3932b42d7427031e02af9284fa6b3de322c +size 149391 diff --git a/Content/AnimStarterPack/Jog_Fwd_Rifle.uasset b/Content/AnimStarterPack/Jog_Fwd_Rifle.uasset index 3bef4405..8d76e5cb 100644 --- a/Content/AnimStarterPack/Jog_Fwd_Rifle.uasset +++ b/Content/AnimStarterPack/Jog_Fwd_Rifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fc63cea92d9ea729e5ef996ab6cb6cbd075a12174e7f03f019770c987cc5245 -size 1531 +oid sha256:e5da5653211aea7a780411b8708cba355f7b53e8238605fd1d2236ddae7282e4 +size 147577 diff --git a/Content/AnimStarterPack/Jog_Lt_Rifle.uasset b/Content/AnimStarterPack/Jog_Lt_Rifle.uasset index 74993965..49b334e1 100644 --- a/Content/AnimStarterPack/Jog_Lt_Rifle.uasset +++ b/Content/AnimStarterPack/Jog_Lt_Rifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f180360340df7d878311ed68ab3730a68586c3c2d17d24cdb91a553d9846b135 -size 1523 +oid sha256:e84008fc6f5098cd8f7630e8c5d3e488e160f1c0c3b3e4acfc3bc2601d1e2b5e +size 141543 diff --git a/Content/AnimStarterPack/Jog_Rt_Rifle.uasset b/Content/AnimStarterPack/Jog_Rt_Rifle.uasset index 7be16e9f..3e10797a 100644 --- a/Content/AnimStarterPack/Jog_Rt_Rifle.uasset +++ b/Content/AnimStarterPack/Jog_Rt_Rifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33ed02f55ce10e345c358b8157fab9046cafd66ef999d7e84f77e9be251f1fc6 -size 1523 +oid sha256:9eb8c252b7588e55e8a8e7e7dfaba994b8e34adfaecc791c0f4a7a6ac827c34f +size 149973 diff --git a/Content/AnimStarterPack/Jump_From_Jog.uasset b/Content/AnimStarterPack/Jump_From_Jog.uasset index 906dac2c..c3d89f2f 100644 --- a/Content/AnimStarterPack/Jump_From_Jog.uasset +++ b/Content/AnimStarterPack/Jump_From_Jog.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89c3364c83bcbb5f695908df5f65937dc4d61acb443fb87bcd166d1b47de94e8 -size 1531 +oid sha256:ca0a9b84f1480830b0af36131a398c40c3f9e8e9af7d5e504414409562eda1c6 +size 128514 diff --git a/Content/AnimStarterPack/Jump_From_Stand.uasset b/Content/AnimStarterPack/Jump_From_Stand.uasset index 465a9b7b..96e03772 100644 --- a/Content/AnimStarterPack/Jump_From_Stand.uasset +++ b/Content/AnimStarterPack/Jump_From_Stand.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6855b2f9c8be7c172b9ba2f4786e4ed8764d906c2d86df2880f72434ea4a4e4 -size 1547 +oid sha256:f1f0f83dd792890d9d570953c876b04b246c990eec5db6dd0927be53ca3197e0 +size 142552 diff --git a/Content/AnimStarterPack/Jump_From_Stand_Ironsights.uasset b/Content/AnimStarterPack/Jump_From_Stand_Ironsights.uasset index 05d95707..46ef9eff 100644 --- a/Content/AnimStarterPack/Jump_From_Stand_Ironsights.uasset +++ b/Content/AnimStarterPack/Jump_From_Stand_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03d83799d7d557c04d98ae78cdc9709710ee9d34ea9e3b30464c655c956e70c -size 1635 +oid sha256:384b0fb456ff269192ba0511b67900bab17c15788d38c7c895309f2563456ea0 +size 142359 diff --git a/Content/AnimStarterPack/Prone_Death_1.uasset b/Content/AnimStarterPack/Prone_Death_1.uasset index 39236a5d..9a36ce16 100644 --- a/Content/AnimStarterPack/Prone_Death_1.uasset +++ b/Content/AnimStarterPack/Prone_Death_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a53c1e24d1f8ec9e45eaf54ac05f728069aec2b0ae5fa77301d41a62025a639 -size 1525 +oid sha256:147e8c24a64c3686c73a53f8f1956017561a169cf05526416e481baccb7d3354 +size 121931 diff --git a/Content/AnimStarterPack/Prone_Death_2.uasset b/Content/AnimStarterPack/Prone_Death_2.uasset index 0319a7b8..df9e2051 100644 --- a/Content/AnimStarterPack/Prone_Death_2.uasset +++ b/Content/AnimStarterPack/Prone_Death_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65c93783aadc9d31e4a4505027706d16d3f7326191fbad37f990705344079c38 -size 1525 +oid sha256:16f6a8538a6228bc60791693af025aa25d962f24df2448490cbbde7020a4b280 +size 196912 diff --git a/Content/AnimStarterPack/Prone_Fire_1.uasset b/Content/AnimStarterPack/Prone_Fire_1.uasset index 109fc9ef..fc4b559a 100644 --- a/Content/AnimStarterPack/Prone_Fire_1.uasset +++ b/Content/AnimStarterPack/Prone_Fire_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3177e5ea55ae46dd29791b4a123c330952267a1c415181ece2bf92eed5371ae7 -size 1517 +oid sha256:707a955e73dda4b6e6b9d6a6336395ccb050eafcad778d2273d0bd8fb87b1dda +size 99855 diff --git a/Content/AnimStarterPack/Prone_Fire_2.uasset b/Content/AnimStarterPack/Prone_Fire_2.uasset index df0e7cb4..ad9c189e 100644 --- a/Content/AnimStarterPack/Prone_Fire_2.uasset +++ b/Content/AnimStarterPack/Prone_Fire_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23106f82f901be5b7426d274ac54cdadd7bab2079c11f90de6629a303003cd2e -size 1517 +oid sha256:bf39f77398a9f605de2a4f508dc0f6b39ab4ea7c2d5038a7189eb6f5f0ed6ae0 +size 100442 diff --git a/Content/AnimStarterPack/Prone_Idle.uasset b/Content/AnimStarterPack/Prone_Idle.uasset index 0e2a0a5e..3668a53a 100644 --- a/Content/AnimStarterPack/Prone_Idle.uasset +++ b/Content/AnimStarterPack/Prone_Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d173d05288c9723a0d65c38b659b3ea6471b4aaf5241b592f51b3ec0d9850b5b -size 1507 +oid sha256:885f88eb6499754ea3d141b3fa142a0486953292ceda229f2458fd284926e688 +size 336195 diff --git a/Content/AnimStarterPack/Prone_Reload_Rifle.uasset b/Content/AnimStarterPack/Prone_Reload_Rifle.uasset index 7bab1bef..b59a8e70 100644 --- a/Content/AnimStarterPack/Prone_Reload_Rifle.uasset +++ b/Content/AnimStarterPack/Prone_Reload_Rifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccb4add4d1689078b15b6334152983df8576213894e3c73e2ea4f4bdbf54fb0d -size 1571 +oid sha256:53fdab9e9454038df1bb90100ef815f01f42e5dc5a96496242864d18ff917271 +size 239624 diff --git a/Content/AnimStarterPack/Prone_Reload_Shotgun.uasset b/Content/AnimStarterPack/Prone_Reload_Shotgun.uasset index d2d4b136..91b898a8 100644 --- a/Content/AnimStarterPack/Prone_Reload_Shotgun.uasset +++ b/Content/AnimStarterPack/Prone_Reload_Shotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbc035a4598a9a6854cb5c31e36fd0ec461243168fd3ca6205f757ead9781537 -size 1587 +oid sha256:0709c07b3e348b8b53464345c2c33207b6e086197aa62451760270effe267eaf +size 282360 diff --git a/Content/AnimStarterPack/Prone_To_Stand.uasset b/Content/AnimStarterPack/Prone_To_Stand.uasset index 88849e61..1891effe 100644 --- a/Content/AnimStarterPack/Prone_To_Stand.uasset +++ b/Content/AnimStarterPack/Prone_To_Stand.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c38b67709958b51448d020513804c71feb011ba8565550ece20abad3f082d0f6 -size 1539 +oid sha256:3c6d1837237e2cdf2681bcaa4455990c0cde1eac0ac817eae1a5560a6f2eb069 +size 161933 diff --git a/Content/AnimStarterPack/Reload_Pistol.uasset b/Content/AnimStarterPack/Reload_Pistol.uasset index 4a95bb00..78b2f801 100644 --- a/Content/AnimStarterPack/Reload_Pistol.uasset +++ b/Content/AnimStarterPack/Reload_Pistol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8197c15e488831c90cb0f7ba1f95faa7fd92fd986d0a21909486a158e77e1098 -size 1531 +oid sha256:340d0cf6315a946ab0490f0edb27a6715f0d02453df1233981a36adc9c27ed97 +size 178832 diff --git a/Content/AnimStarterPack/Reload_Rifle_Hip.uasset b/Content/AnimStarterPack/Reload_Rifle_Hip.uasset index 67234244..d1b2f9de 100644 --- a/Content/AnimStarterPack/Reload_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Reload_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4de179731dd499f1137648a09e79d65382bc44ff05e5b76374763a70e35a2b19 -size 1555 +oid sha256:1a0e8d0c4f59bd262699f273af214ed43d0a2a3e6cb6c923ca59e2c8da70f8bf +size 201655 diff --git a/Content/AnimStarterPack/Reload_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Reload_Rifle_Ironsights.uasset index 6b169741..0f10a18c 100644 --- a/Content/AnimStarterPack/Reload_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Reload_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efd3c465c0523b04ec5b1c8297806405588df9e8769d89565f8317fefb944f76 -size 1611 +oid sha256:5c7020c92423742122ae2d7d3b28c31e8c4e438d48c817caa8c0cb0b568d92a3 +size 202183 diff --git a/Content/AnimStarterPack/Reload_Shotgun_Hip.uasset b/Content/AnimStarterPack/Reload_Shotgun_Hip.uasset index e15c5d7b..8bb0486c 100644 --- a/Content/AnimStarterPack/Reload_Shotgun_Hip.uasset +++ b/Content/AnimStarterPack/Reload_Shotgun_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f1042a1d75fc407f3b5218dd289aca338f8b763661528a1afcfda98c2580670 -size 1571 +oid sha256:3475283122e464da7b204544bcdc25da55576bc2a1386958761ce9a66f1b6290 +size 294511 diff --git a/Content/AnimStarterPack/Reload_Shotgun_Ironsights.uasset b/Content/AnimStarterPack/Reload_Shotgun_Ironsights.uasset index 16a491a9..b89e21c5 100644 --- a/Content/AnimStarterPack/Reload_Shotgun_Ironsights.uasset +++ b/Content/AnimStarterPack/Reload_Shotgun_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afa39b006655622c64fa61b063a956670fb00673b013b7b34ccd057e377fdc68 -size 1627 +oid sha256:611c363a51b13fd38a4b281ca710c80a54a199a6339545ac0d13eaef58cdf381 +size 293729 diff --git a/Content/AnimStarterPack/Showcase.umap b/Content/AnimStarterPack/Showcase.umap index aa57a4fe..11a6abeb 100644 --- a/Content/AnimStarterPack/Showcase.umap +++ b/Content/AnimStarterPack/Showcase.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d92c98328649d3338e9ea966985489943a875af472f4eb1ff015a3efa6fcd783 -size 1477 +oid sha256:95581ef8fd87b23fd7185a0e6acbd380b19a212a5c65c7d1b336f73026d5120b +size 585213 diff --git a/Content/AnimStarterPack/Sprint_Fwd_Rifle.uasset b/Content/AnimStarterPack/Sprint_Fwd_Rifle.uasset index 4dd3afb5..4b52199a 100644 --- a/Content/AnimStarterPack/Sprint_Fwd_Rifle.uasset +++ b/Content/AnimStarterPack/Sprint_Fwd_Rifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47577e032d3ebb81b52257491c52efbdb8e94d92a704f8d75b9cb2f468a34314 -size 1555 +oid sha256:57e70cbbf2bef3836da8a7a6bfba21a241665d23b1bc15bb4afa9fdf390553f5 +size 150598 diff --git a/Content/AnimStarterPack/Stand_To_Prone.uasset b/Content/AnimStarterPack/Stand_To_Prone.uasset index 912c9feb..4381d652 100644 --- a/Content/AnimStarterPack/Stand_To_Prone.uasset +++ b/Content/AnimStarterPack/Stand_To_Prone.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:941a964b3e9719080b23614eefc330b9afb274117b28c825ccb4675f8ce10364 -size 1539 +oid sha256:3e655c0c2591aca79a102dbefa6a5601842ace7c50bc5d95754759a2d3996f35 +size 168564 diff --git a/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Hip.uasset b/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Hip.uasset index 51f7a1f2..f5967c97 100644 --- a/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Hip.uasset +++ b/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Hip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6640db0e4857c95714a0574ed1719feeb1c0b800ab2b51b7ed40ff6a2b83ddfa -size 1627 +oid sha256:0bfaa7ffa204083bc240b6206cf29a65db644286cede481d9fc7ec925c3b0192 +size 127675 diff --git a/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset index 25459196..37eb4c82 100644 --- a/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b0c56320fcb0d435d6caf691c192c2b79a1d43a2edecc4ffcefcdf7a17de30d -size 1683 +oid sha256:804097d045f7d027f079b131c69b975e9754d7400fab2fb564f2a8a293e0a452 +size 127794 diff --git a/Content/AnimStarterPack/UE4ASP_HeroTPP_AnimBlueprint.uasset b/Content/AnimStarterPack/UE4ASP_HeroTPP_AnimBlueprint.uasset index 179db3fc..3e1a3f08 100644 --- a/Content/AnimStarterPack/UE4ASP_HeroTPP_AnimBlueprint.uasset +++ b/Content/AnimStarterPack/UE4ASP_HeroTPP_AnimBlueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d45914d3f392313fbb0bdf6de9f1d414ab1a827992c8fc5368a63ceb38c0cae0 -size 2855 +oid sha256:fe65460d053b0435b1dbc73806b568700d43dae34356262f59b9ae16e29005bd +size 667920 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset index a3417c46..8f56c584 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6046cfd2bd7cf35a49d3e3625e735d0e8a8cc5e984c5f6397c30c315f263fd98 -size 1619 +oid sha256:0e7dc2aac13bc396d864d48966ced83f016de6252ac57b8459897a35ecd25edc +size 136551 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset index 13c58053..67593ff2 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04498dc18c03528abeb80c572ce995fd6da83902493b22b0523058ea89dc1c6b -size 1691 +oid sha256:8801d51f97a4dfc56658c363eb0ed5e130477ee4ac557747cfa05296266c222b +size 93350 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset index 7ba27989..11dc0f10 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a359673cd26111e0e7a8c9b173209339266f68e8b18f4f4add20619b71f77bf -size 1783 +oid sha256:95f2c723b40140562c0444e4d2f70733a258456b2a0262a7336d0e5e3791aa45 +size 102542 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset index d7446bde..bb28da9e 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c58af11890cd4eb0d766a9431c7d0b063a134862718bb148f89a8a37a03859c -size 1767 +oid sha256:72bda1590e3bfcad57591bf50b8d8ae097c4f850fb52e0c23a4c2b6840b90760 +size 98451 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset index ad1a0edc..c96d31e4 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d021aef93d7195c0d9a309ba728d34c2af463b868bbc7b70be0f2187e30ae23 -size 1807 +oid sha256:8d10cd7b5142d353af6bd24570012579f3f1beb308963bc98e0fcdc3f901c77e +size 99691 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset index 7cbb2f33..630e7511 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1708393e163bef8dcf295e3731b80b9415b9fac80498a462afbbd7a1012c5c -size 1719 +oid sha256:5cb52705080f12d988a392e714b28dc70ec8b822fa5f8e46fa8eef9165f9f9c5 +size 102371 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset index 3698cff5..cdd5192c 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba94613395cbf7b4b8bde20ad54e5c88d925a32f7eaaac4db2b32838261436ab -size 1697 +oid sha256:45e7b43dea85d3711ef6808fad9bb858e8f3f9a0d9826a8bf09021e1fb3ea815 +size 434410 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset index 0cea5217..ad40a411 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d680898bc33690f5547c5b938c26f54049e6fca039c6469621ee659f533f1e73 -size 1713 +oid sha256:a262e93cfdd3be852153233ee2c2aedb77d43c3e0b50829ebb6bf0f68a6651d5 +size 405256 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset index fba75595..c8689d67 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a2dc2d416725857aa6683d8b02a7847ad15c6a81725ef6eb3f6ba2f38f41249 -size 1745 +oid sha256:ac61a9228475e0cf244927c3d34de1fa13a7f780484f6f2b5e7d5bd1ff4dba68 +size 470771 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset index c4d14ae9..080f1b97 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ecf086cdfb2d595d596e7fe1e76c6cacdf8b6ef496b62abbd03fabf9fc4ea7 -size 1745 +oid sha256:133271aa7e759618764af75f8ceec83f9bf54796bf7039cce6973e6998b2f9e6 +size 362117 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset b/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset index f27d67d5..73286950 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6394a48cf28c754a95af0bcf4490ed9030e81d9690080066863a9c34898dd92 -size 1599 +oid sha256:6e559f8b1e8cb28d67209da38221aaeab6c11b84f923adca0c7ed7d35f194c46 +size 3774704 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset b/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset index 8ca9c01d..4ab164c0 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:452683c257b17b83030c9e827b13d82bac296cebc16540037e7cb5784a6a2bc0 -size 1703 +oid sha256:04d2c0af2f6704b68837b3b319446ed434ee46883c1b941f830fdebb88b3ab9b +size 26064 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset b/Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset index 4f847ec7..1c59f65d 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a3e96d535fb6ea18d8e704b0a8a547e7b0c9cc3fddfd1fe0f2ab9c885a6a060 -size 1671 +oid sha256:761f089534b0ab816720025e598c7bd5b157a41ae7b95b70f14b7c8b1d915a2f +size 11140 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset index 73d72530..c4b62f0d 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8247e0cb11ac547a44008f663153c88c20260e8015277cacc2abe16b0b0f6dd1 -size 1617 +oid sha256:b43184512611058b0346db0fbfe0a462a6907fa633fdda1c5347e357fc6ab806 +size 161770 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset index f4a1075c..faad1e83 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a37314c4779e226d38da8d1f326ab22e4ea5f5a3f971dd5cb0001717c08d3f5 -size 1617 +oid sha256:f80139b3e5b3ca64233cfc172a67cf81fc664f8d1a992328ea30dee940cc1cb2 +size 95173 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset index 17b0e1b8..62972963 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b381db351e1ede4a3445df1fa5be1aec3f20c146e54edb9c4a93476262fff6c -size 1697 +oid sha256:f8c7a994e8f33fad29cc5b487b443fd63e0d7fdccba4e25ec767bd37e61062ff +size 274906 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset index 1fd1466c..e3787d7f 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d6d8cc7d9f4ed3831f832f424594dd61745fc6edf29b6019ec2f6983f896b01 -size 1689 +oid sha256:2d438f828c2bbc041ba3a24c6dc74ce2cd64c2c86fabae1865dde87750c3872a +size 5481078 diff --git a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset index b79f8989..d06bddea 100644 --- a/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset +++ b/Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:044a982278ee104078c77a03ea48a0b9364dbd6f2fde61b4f149b46146b5aaec -size 1753 +oid sha256:34f645adb6574f4959b783854c7e5ab4058b481150886637cd2a93de355a4d9e +size 362358 diff --git a/Content/AnimStarterPack/Ue4ASP_Character.uasset b/Content/AnimStarterPack/Ue4ASP_Character.uasset index cb3007da..2a128a1d 100644 --- a/Content/AnimStarterPack/Ue4ASP_Character.uasset +++ b/Content/AnimStarterPack/Ue4ASP_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e12f2c9d94bd2651347060d2fcf6fb823d6e39c52b473f700aebf5e9befcccf9 -size 2599 +oid sha256:8873b80d47adf2b3d83ea7bec65a2144d85cfbbc73ee811cf2a0b81e3edfbb32 +size 295665 diff --git a/Content/AnimStarterPack/Walk_Bwd_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Walk_Bwd_Rifle_Ironsights.uasset index bd51f292..62d5f1de 100644 --- a/Content/AnimStarterPack/Walk_Bwd_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Walk_Bwd_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7510e8bfe434866e4b54cb7126a9b22f9485e02bdd6bf81e065b36797805f46d -size 1627 +oid sha256:5698df9de8f4738fa3807319c167ff6c68d4fc36385d0adc5f099e9d16847744 +size 161122 diff --git a/Content/AnimStarterPack/Walk_Fwd_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Walk_Fwd_Rifle_Ironsights.uasset index ac956168..00494420 100644 --- a/Content/AnimStarterPack/Walk_Fwd_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Walk_Fwd_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6155bd6dfb54e895c438eaaf01a3116fca272118170b8fc870b5c8a7ff1082f1 -size 1627 +oid sha256:f4a78f3a7a995b2199b46abfd72e3f4d2268e0b8c3a9b1df3f7df28a3caa6109 +size 158106 diff --git a/Content/AnimStarterPack/Walk_Lt_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Walk_Lt_Rifle_Ironsights.uasset index f496dade..4096a6b7 100644 --- a/Content/AnimStarterPack/Walk_Lt_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Walk_Lt_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a3972b723af6ea80735e83588379779392a3f3d77ee43528f282479edf35779 -size 1619 +oid sha256:ff97db22bc1c7191cfa4028d478ce392d56ad093d9a3da9de01d112830684845 +size 159464 diff --git a/Content/AnimStarterPack/Walk_Rt_Rifle_Ironsights.uasset b/Content/AnimStarterPack/Walk_Rt_Rifle_Ironsights.uasset index ef6199a5..4d9d0a33 100644 --- a/Content/AnimStarterPack/Walk_Rt_Rifle_Ironsights.uasset +++ b/Content/AnimStarterPack/Walk_Rt_Rifle_Ironsights.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e26211fd35d6dabd8005ff8dccc7eec0ab84bcab0e0693ea76931ee9c4b9c7c5 -size 1619 +oid sha256:05aede850c4a0e64e844434acd82eec224482ea69e371edc32bff7e7ae34da87 +size 160150 diff --git a/Content/_Game/Ammo/Ammo9mmBP.uasset b/Content/_Game/Ammo/Ammo9mmBP.uasset index 31c64492..9a518769 100644 --- a/Content/_Game/Ammo/Ammo9mmBP.uasset +++ b/Content/_Game/Ammo/Ammo9mmBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fe361a9c8705ae9bd274f4ef3430a8764046794e7886d51fd9f8696036b72f3 -size 51743 +oid sha256:05f876d97d0d2d3d6d8a5e808b71d3707744f61922af7fa2ea07edfea20f7e46 +size 50936 diff --git a/Content/_Game/Character/Animations/EquipMontage.uasset b/Content/_Game/Character/Animations/EquipMontage.uasset new file mode 100644 index 00000000..2e7768d6 --- /dev/null +++ b/Content/_Game/Character/Animations/EquipMontage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:776c9ad757e6869aba4ab331be36a21221e3ad8c11c9a4c32623bf4aa002907c +size 10267 diff --git a/Content/_Game/Character/Animations/Retargeted/Equip_Rifle_Standing.uasset b/Content/_Game/Character/Animations/Retargeted/Equip_Rifle_Standing.uasset new file mode 100644 index 00000000..722fe227 --- /dev/null +++ b/Content/_Game/Character/Animations/Retargeted/Equip_Rifle_Standing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b296a08441b597c98ca622d7b4e4424bea2977d0da2d36cc146c43e2d8f17bd +size 270089 diff --git a/Content/_Game/Character/ShooterAnimBP.uasset b/Content/_Game/Character/ShooterAnimBP.uasset index cb78ed5f..2972f5a2 100644 --- a/Content/_Game/Character/ShooterAnimBP.uasset +++ b/Content/_Game/Character/ShooterAnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90bbe4e59a95739b8c4c0281d725fcd10bfaeba276a402f43dda4560f4c4bceb -size 1327850 +oid sha256:12ae5c68f3c3fcca3647f3b4d130b726ba8c7618e79972080342154b60149a72 +size 1355465 diff --git a/Content/_Game/Character/ShooterCharacterBP.uasset b/Content/_Game/Character/ShooterCharacterBP.uasset index b7a8ec71..a5e8febb 100644 --- a/Content/_Game/Character/ShooterCharacterBP.uasset +++ b/Content/_Game/Character/ShooterCharacterBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d4dab08311e3296b428f4c86b02a039ea3546d0e0a07146274f8f5cd6d53bb3 -size 44695 +oid sha256:6a9a0d944472f9b96778caf4c49acf9a93fe9bbb98511efcbe3bbba220af1df6 +size 44856 diff --git a/Content/_Game/HUD/PickupWidgetBP.uasset b/Content/_Game/HUD/PickupWidgetBP.uasset index 174d3654..16f3e3c4 100644 --- a/Content/_Game/HUD/PickupWidgetBP.uasset +++ b/Content/_Game/HUD/PickupWidgetBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d23e00ad49871001c14ee345ad0d8df2d48c24c26edc9d047b6ed0e54867abd3 -size 181060 +oid sha256:de1476ef3036c397c96db9c4fff414d3b703bcd99178337720405e7119b639a2 +size 212287 diff --git a/Content/_Game/Maps/DefaultMap.umap b/Content/_Game/Maps/DefaultMap.umap index ac84d526..a756de68 100644 --- a/Content/_Game/Maps/DefaultMap.umap +++ b/Content/_Game/Maps/DefaultMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2a8bc583394dc1c9bd699e5d5e6d5f392ea17beada0006c38b3bde2a9b04ee2 -size 98133 +oid sha256:db7f0d65dbcc43086f8875cccce50e0f15f77c26e5000ecb41545f58f8321a17 +size 97981 diff --git a/Content/_Game/Weapons/BaseWeapon/BaseWeaponBP.uasset b/Content/_Game/Weapons/BaseWeapon/BaseWeaponBP.uasset index a13cae59..7f5a40e3 100644 --- a/Content/_Game/Weapons/BaseWeapon/BaseWeaponBP.uasset +++ b/Content/_Game/Weapons/BaseWeapon/BaseWeaponBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9f42a6201674a713536a81c5f52ad271b0d849d84f05a112ecbb85470a23201 -size 53929 +oid sha256:30b64b0c82ae7237b4c02006e662c29909a69f15d97b5573eeff30801944ac47 +size 53974 diff --git a/Source/Shooter/Item.cpp b/Source/Shooter/Item.cpp index 4ea435a5..03277b2a 100644 --- a/Source/Shooter/Item.cpp +++ b/Source/Shooter/Item.cpp @@ -35,7 +35,8 @@ AItem::AItem() : GlowAmount(150.f), FresnelExponent(3.f), FresnelReflectFraction(4.f), - SlotIndex(0) + SlotIndex(0), + bCharacterInventoryFull(false) { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; @@ -129,11 +130,18 @@ void AItem::setActiveStars() } } -void AItem::PlayPickupSound() +void AItem::PlayPickupSound(bool bForcePlaySound) { if (Character) { - if (Character->ShouldPlayPickupSound()) + if (bForcePlaySound) + { + if (PickupSound) + { + UGameplayStatics::PlaySound2D(this, PickupSound); + } + } + else if (Character->ShouldPlayPickupSound()) { Character->StartPickupSoundTimer(); if (PickupSound) @@ -219,11 +227,15 @@ void AItem::DisableGlowMaterial() } } -void AItem::PlayEquipSound() +void AItem::PlayEquipSound(bool bForcePlaySound) { if (Character) { - if (Character->ShouldPlayEquipSound()) + if (bForcePlaySound) + { + UGameplayStatics::PlaySound2D(this, EquipSound); + } + else if (Character->ShouldPlayEquipSound()) { Character->StartEquipSoundTimer(); if (EquipSound) @@ -462,7 +474,7 @@ void AItem::SetItemProperties(EItemState State) } } -void AItem::StartItemCurve(AShooterCharacter* Char) +void AItem::StartItemCurve(AShooterCharacter* Char, bool bForcePlaySound) { // Store a handle to the Character Character = Char; @@ -473,7 +485,7 @@ void AItem::StartItemCurve(AShooterCharacter* Char) // Add 1 to the Item Count for this interp location struct Character->IncrementInterpLocItemCount(InterpLocIndex, 1); - PlayPickupSound(); + PlayPickupSound(bForcePlaySound); // Store the initial locatino of the Item ItemInterpStartLocation = GetActorLocation(); diff --git a/Source/Shooter/Item.h b/Source/Shooter/Item.h index 1063bdab..2e924df0 100644 --- a/Source/Shooter/Item.h +++ b/Source/Shooter/Item.h @@ -81,7 +81,7 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Item Properties", meta = (AllowPrivateAccess = true)) USphereComponent* AreaSphere; - void PlayPickupSound(); + void PlayPickupSound(bool bForcePlaySound = false); virtual void InitializeCustomDepth(); @@ -113,7 +113,7 @@ public: FVector GetInterpLocation(); // Called in AShooterCharacter::GetPickupItem - void PlayEquipSound(); + void PlayEquipSound(bool bForcePlaySound = false); private: /* Skeletal mesh for the item */ @@ -252,6 +252,10 @@ private: UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = true)) int32 SlotIndex; + /** True when the character's inventory is full */ + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = true)) + bool bCharacterInventoryFull; + public: FORCEINLINE UWidgetComponent* GetPickupWidget() const { return PickupWidget; } @@ -273,8 +277,12 @@ public: FORCEINLINE int32 GetSlotIndex() const { return SlotIndex; } FORCEINLINE void SetSlotIndex(int32 Index) { SlotIndex = Index; } + FORCEINLINE void SetCharacter(AShooterCharacter* Char) { Character = Char; } + + FORCEINLINE void SetCharacterInventoryFull(bool bFull) { bCharacterInventoryFull = bFull; } + /** Called from the AShooterCharacter class */ - void StartItemCurve(AShooterCharacter* Char); + void StartItemCurve(AShooterCharacter* Char, bool bForcePlaySound = false); virtual void EnableCustomDepth(); virtual void DisableCustomDepth(); diff --git a/Source/Shooter/ShooterAnimInstance.cpp b/Source/Shooter/ShooterAnimInstance.cpp index e179fdda..47e37581 100644 --- a/Source/Shooter/ShooterAnimInstance.cpp +++ b/Source/Shooter/ShooterAnimInstance.cpp @@ -62,6 +62,7 @@ void UShooterAnimInstance::UpdateAnimationProperties(float DeltaTime) bAiming = ShooterCharacter->GetAiming(); bReloading = ShooterCharacter->GetCombatState() == ECombatState::ECS_Reloading; bCrouching = ShooterCharacter->IsCrouching(); + bEquipping = ShooterCharacter->GetCombatState() == ECombatState::ECS_Equipping; if (bReloading) { @@ -148,7 +149,7 @@ void UShooterAnimInstance::TurnInPlace() // Set the recoil weight if (bTurningInPlace) { - if (bReloading) + if (bReloading || bEquipping) { RecoilWeight = 1.f; } @@ -161,7 +162,7 @@ void UShooterAnimInstance::TurnInPlace() { if (bCrouching) { - if (bReloading) + if (bReloading || bEquipping) { RecoilWeight = 1.f; } @@ -172,7 +173,7 @@ void UShooterAnimInstance::TurnInPlace() } else { - if (bAiming || bReloading) + if (bAiming || bReloading || bEquipping) { RecoilWeight = 1.f; } diff --git a/Source/Shooter/ShooterAnimInstance.h b/Source/Shooter/ShooterAnimInstance.h index 321f9444..2c983dfe 100644 --- a/Source/Shooter/ShooterAnimInstance.h +++ b/Source/Shooter/ShooterAnimInstance.h @@ -112,11 +112,15 @@ private: UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Crouching", meta = (AllowPrivateAccess = true)) bool bCrouching; + /** True when equipping */ + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Combat", meta = (AllowPrivateAccess = true)) + bool bEquipping; + /** Change the recoil weight based on turning in place and aiming */ UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Combat", meta = (AllowPrivateAccess = true)) float RecoilWeight; /** True when turning in place */ - UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Combat", meta = (AllowPrivateAccess = true)) + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Turn In Place", meta = (AllowPrivateAccess = true)) bool bTurningInPlace; }; diff --git a/Source/Shooter/ShooterCharacter.cpp b/Source/Shooter/ShooterCharacter.cpp index f2a34270..4452db81 100644 --- a/Source/Shooter/ShooterCharacter.cpp +++ b/Source/Shooter/ShooterCharacter.cpp @@ -152,6 +152,7 @@ void AShooterCharacter::BeginPlay() EquipWeapon(SpawnDefaultWeapon()); Inventory.Add(EquippedWeapon); EquippedWeapon->SetSlotIndex(0); + EquippedWeapon->SetCharacter(this); InitializeAmmoMap(); @@ -413,7 +414,10 @@ void AShooterCharacter::Key5Pressed() void AShooterCharacter::ExchangeInventoryItems(int32 CurrentItemIndex, int32 NewItemIndex) { - if (CurrentItemIndex == NewItemIndex || NewItemIndex >= Inventory.Num()) return; + if (CurrentItemIndex == NewItemIndex + || NewItemIndex >= Inventory.Num() + || CombatState != ECombatState::ECS_Unoccupied) + return; auto OldEquippedWeapon = EquippedWeapon; auto NewWeapon = Cast(Inventory[NewItemIndex]); @@ -422,6 +426,15 @@ void AShooterCharacter::ExchangeInventoryItems(int32 CurrentItemIndex, int32 New OldEquippedWeapon->SetItemState(EItemState::EIS_PickedUp); NewWeapon->SetItemState(EItemState::EIS_Equipped); + + CombatState = ECombatState::ECS_Equipping; + UAnimInstance* AnimInstance = GetMesh()->GetAnimInstance(); + if (AnimInstance && EquipMontage) + { + AnimInstance->Montage_Play(EquipMontage, 1.0f); + AnimInstance->Montage_JumpToSection(FName("Equip")); + } + NewWeapon->PlayEquipSound(true); } int32 AShooterCharacter::GetInterpLocationIndex() @@ -762,6 +775,16 @@ void AShooterCharacter::TraceForItems() TraceHitItem = nullptr; SetItemPickupWidgetVisibility(TraceHitItem, true); + + if (Inventory.Num() >= INVENTORY_CAPACITY) + { + // Inventory is full + TraceHitItem->SetCharacterInventoryFull(true); + } + else + { + TraceHitItem->SetCharacterInventoryFull(false); + } } else if (OldTraceHitItem) // Hide widget for the item from last frame { @@ -841,9 +864,11 @@ void AShooterCharacter::DropWeapon() void AShooterCharacter::SelectButtonPressed() { + if (CombatState != ECombatState::ECS_Unoccupied) return; + if (TraceHitItem) { - TraceHitItem->StartItemCurve(this); + TraceHitItem->StartItemCurve(this, true); TraceHitItem = nullptr; } } @@ -1001,6 +1026,11 @@ void AShooterCharacter::FinishReloading() } } +void AShooterCharacter::FinishEquipping() +{ + CombatState = ECombatState::ECS_Unoccupied; +} + bool AShooterCharacter::CarryingAmmo() { if (!EquippedWeapon) return false; diff --git a/Source/Shooter/ShooterCharacter.h b/Source/Shooter/ShooterCharacter.h index 6cfd14bd..bede7c80 100644 --- a/Source/Shooter/ShooterCharacter.h +++ b/Source/Shooter/ShooterCharacter.h @@ -24,6 +24,7 @@ enum class ECombatState : uint8 ECS_Unoccupied UMETA(DisplayName = "Unoccupied"), ECS_FireTimerInProgress UMETA(DisplayName = "FireTimerInProgress"), ECS_Reloading UMETA(DisplayName = "Reloading"), + ECS_Equipping UMETA(DisplayName = "Equipping"), ECS_MAX UMETA(DisplayName = "DefaultMax") }; @@ -167,6 +168,9 @@ protected: UFUNCTION(BlueprintCallable) void FinishReloading(); + + UFUNCTION(BlueprintCallable) + void FinishEquipping(); /** Check to see if we have ammo of the EquippedWeapon's ammo type */ bool CarryingAmmo(); @@ -382,6 +386,10 @@ private: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Combat, meta = (AllowPrivateAccess = true)) UAnimMontage* ReloadMontage; + /* Montage for reloading the weapon */ + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Combat, meta = (AllowPrivateAccess = true)) + UAnimMontage* EquipMontage; + /* Transform of the clip when we first grab the clip during reloading */ UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Combat, meta = (AllowPrivateAccess = true)) FTransform ClipTransform;