From a770fc47f1d3352ec355ab9e0109231e9ba370b3 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Mon, 24 Apr 2023 18:43:22 +0100 Subject: [PATCH 1/6] Started working on sparks for gun --- Content/Blueprints/Combat_UI/NS_GunEffect.uasset | 4 ++-- .../Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset | 4 ++-- Content/Levels/Testing/SneakMechanicTesting.umap | 4 ++-- Content/Particles/P_Test1.uasset | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 Content/Particles/P_Test1.uasset diff --git a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset index 03af678..2170866 100644 --- a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset +++ b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e3af6c5e971235d1d8c645347e7d3911c34cee65b25215a10528a71ab500130 -size 1218407 +oid sha256:3c3246e69aa967f66a246c9a99dca9cad80876d86df2ca73c052f87aee98c01c +size 1748378 diff --git a/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset b/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset index d1d4ede..1b1da05 100644 --- a/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset +++ b/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc9eb13d6d72b8b0ed0e1ffa48c052e1a6d579087fd566fd400dbe2b4d9636f8 -size 79436 +oid sha256:b77f07b9858216a540e19596790b090b199647c3b7e81cf53ef005f2fc1f3d29 +size 35705 diff --git a/Content/Levels/Testing/SneakMechanicTesting.umap b/Content/Levels/Testing/SneakMechanicTesting.umap index e2cea40..20b2892 100644 --- a/Content/Levels/Testing/SneakMechanicTesting.umap +++ b/Content/Levels/Testing/SneakMechanicTesting.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d44e1d44549e6cd4deb70fd46d4a804ad1ca3081b495b51f9258da3d741d6ab6 -size 36264 +oid sha256:a0dcc1aa448721c9ac1a7945d93cb86c4045487a3b8bf182abe8cbb2c6a3918b +size 38205 diff --git a/Content/Particles/P_Test1.uasset b/Content/Particles/P_Test1.uasset new file mode 100644 index 0000000..1ad6352 --- /dev/null +++ b/Content/Particles/P_Test1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:542e16afbe3a392135d57040bbac9eb744c98dd967a3d8cd3242198adba760a3 +size 467357 From 70b8c41c996fa61e14bc51aeccf359eacdcc6594 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 26 Apr 2023 12:12:30 +0100 Subject: [PATCH 2/6] Imported Smoke Texture and created smoke mat --- Content/Particles/P_Test1.uasset | 3 --- Content/Particles/Smoke-Alpha02.uasset | 3 +++ Content/Particles/SmokeMaterial.uasset | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 Content/Particles/P_Test1.uasset create mode 100644 Content/Particles/Smoke-Alpha02.uasset create mode 100644 Content/Particles/SmokeMaterial.uasset diff --git a/Content/Particles/P_Test1.uasset b/Content/Particles/P_Test1.uasset deleted file mode 100644 index 1ad6352..0000000 --- a/Content/Particles/P_Test1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:542e16afbe3a392135d57040bbac9eb744c98dd967a3d8cd3242198adba760a3 -size 467357 diff --git a/Content/Particles/Smoke-Alpha02.uasset b/Content/Particles/Smoke-Alpha02.uasset new file mode 100644 index 0000000..90d5618 --- /dev/null +++ b/Content/Particles/Smoke-Alpha02.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:949c6328734982a9d613afd232ab54cd4abb05976a1437c9846ecfe6d5a4bf4a +size 423650 diff --git a/Content/Particles/SmokeMaterial.uasset b/Content/Particles/SmokeMaterial.uasset new file mode 100644 index 0000000..3ad7f50 --- /dev/null +++ b/Content/Particles/SmokeMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de0b7a3389b3397e5baf4d75c7a60b8b1e17be8c8aea750737abe13f0378f160 +size 11353 From a90fccd72ea9b630a005c839c70bbcae91038514 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 26 Apr 2023 12:12:50 +0100 Subject: [PATCH 3/6] Updated Gun Effects to add smoke and sparks added smoke and spark effects to the gun upon firing --- Content/Assets/Objects/Counter/Material.uasset | 4 ++-- Content/Blueprints/Combat_UI/NS_GunEffect.uasset | 4 ++-- .../MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset | 4 ++-- .../M_MS_Imperfection_Material.uasset | 4 ++-- .../M_MS_Imperfection_Material_Var.uasset | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Content/Assets/Objects/Counter/Material.uasset b/Content/Assets/Objects/Counter/Material.uasset index ca59e69..5d7cdf5 100644 --- a/Content/Assets/Objects/Counter/Material.uasset +++ b/Content/Assets/Objects/Counter/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a9859bf6341bd066083721e57c92086308eaf1b00efda6c52fa5742b00ce856 -size 13808 +oid sha256:5de97ee921b78bbcf0a6698a2c9662b452ea6f251f2c431ff5ae564f741be9a9 +size 11777 diff --git a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset index 2170866..022d042 100644 --- a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset +++ b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c3246e69aa967f66a246c9a99dca9cad80876d86df2ca73c052f87aee98c01c -size 1748378 +oid sha256:402949b9b24bb68fafd5b53632e909498fd14e6a37635e93c3ce6dd9146e655e +size 2327370 diff --git a/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset b/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset index 639827f..5e047ec 100644 --- a/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset +++ b/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24944ffbfb9b0f9a3ce0effdf8f0cecbd7a9c82072e430666e5d60cd13bd8e97 -size 25115 +oid sha256:891fa66c3e8e901af662589756b9768e99ed239a360c65bb77d34ebae21810ec +size 23736 diff --git a/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset b/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset index 5128600..0ad440a 100644 --- a/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset +++ b/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a1abcd66444c05291a4ec88a86d0e6054540182633b3158139418a78ea1e628 -size 102359 +oid sha256:250a38741dfcb64d000cbe79c814d308dea54adb07d8d79505a6bdb6a6b0dd18 +size 24732 diff --git a/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset b/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset index c7bb5bf..690d7d4 100644 --- a/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset +++ b/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06159d8967807ba3d3fc703b5ed1fbfa7f944788b9e6e56c131f8292ce41eb4e -size 148356 +oid sha256:1fd08443268bfc87fb968d7cc1a897c3776eeb2162ab6dc2f50be9ad607b7455 +size 23265 From be31b90112bbf407f1d47db450b3fd7d6896e80e Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 26 Apr 2023 12:55:38 +0100 Subject: [PATCH 4/6] Updated Gun FX to making smoke more realistic and emission change Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene --- Content/Blueprints/Combat_UI/NS_GunEffect.uasset | 4 ++-- Content/Levels/Testing/SneakMechanicTesting.umap | 2 +- Content/Particles/Break.uasset | 4 ++-- Content/Particles/Smoke-Alpha02.uasset | 4 ++-- Content/Particles/SmokeEmisisonLower.uasset | 3 +++ Content/Particles/SmokeMaterial.uasset | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 Content/Particles/SmokeEmisisonLower.uasset diff --git a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset index 022d042..48f79c6 100644 --- a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset +++ b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:402949b9b24bb68fafd5b53632e909498fd14e6a37635e93c3ce6dd9146e655e -size 2327370 +oid sha256:a8bdfd99863fdac3872b17aeaf1d9f12f6097cd986664b387c41c32df0591a14 +size 2412861 diff --git a/Content/Levels/Testing/SneakMechanicTesting.umap b/Content/Levels/Testing/SneakMechanicTesting.umap index 20b2892..d03d5bc 100644 --- a/Content/Levels/Testing/SneakMechanicTesting.umap +++ b/Content/Levels/Testing/SneakMechanicTesting.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0dcc1aa448721c9ac1a7945d93cb86c4045487a3b8bf182abe8cbb2c6a3918b +oid sha256:28cf4d02ed1f503e4a0eea83f56ca42cd8a2c0406d2eb8cb756f77e1834db6e1 size 38205 diff --git a/Content/Particles/Break.uasset b/Content/Particles/Break.uasset index 318adbd..6f5a368 100644 --- a/Content/Particles/Break.uasset +++ b/Content/Particles/Break.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d524bb22058492c3e37fb6a2e26b2b6b2ed808d13b5b0188cd7b6bebf03faef6 -size 3543898 +oid sha256:76023c45488805c545ecf3c729c7a36eb89f59f7f0df0ff12b42802d33d023d4 +size 4251958 diff --git a/Content/Particles/Smoke-Alpha02.uasset b/Content/Particles/Smoke-Alpha02.uasset index 90d5618..8f2a4b6 100644 --- a/Content/Particles/Smoke-Alpha02.uasset +++ b/Content/Particles/Smoke-Alpha02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:949c6328734982a9d613afd232ab54cd4abb05976a1437c9846ecfe6d5a4bf4a -size 423650 +oid sha256:e4edfc428b1a4edd1fdfdcde2a6637207be7aba30d650c816dd769c7f45cc603 +size 420112 diff --git a/Content/Particles/SmokeEmisisonLower.uasset b/Content/Particles/SmokeEmisisonLower.uasset new file mode 100644 index 0000000..345273d --- /dev/null +++ b/Content/Particles/SmokeEmisisonLower.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60052ff0c4e24f9a3db8a9b23b04f9bfddb6e575fe969d0d84e9327b52ed5c8c +size 7885 diff --git a/Content/Particles/SmokeMaterial.uasset b/Content/Particles/SmokeMaterial.uasset index 3ad7f50..a7c1f6f 100644 --- a/Content/Particles/SmokeMaterial.uasset +++ b/Content/Particles/SmokeMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de0b7a3389b3397e5baf4d75c7a60b8b1e17be8c8aea750737abe13f0378f160 -size 11353 +oid sha256:361c5f108b85d07f1a8df64a2653536c3493804cdc74e31d0514ae17c7b13b14 +size 10170 From 8d20b563e7c7227a589d114ebd2d18716192047c Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 26 Apr 2023 12:59:44 +0100 Subject: [PATCH 5/6] Updated Gun FX to make smoke smaller --- Content/Blueprints/Combat_UI/NS_GunEffect.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset index 48f79c6..82e3abb 100644 --- a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset +++ b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8bdfd99863fdac3872b17aeaf1d9f12f6097cd986664b387c41c32df0591a14 -size 2412861 +oid sha256:21158f44f6eedeecd7c3f9db22e05c306e135722cb29e93cdee77a9c7ecc67d1 +size 2326094 From 873671db646e725005c385630aaa3b1bc71d04b5 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 26 Apr 2023 13:04:05 +0100 Subject: [PATCH 6/6] Updated BreakAsset to add FX --- Content/Particles/Break.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Particles/Break.uasset b/Content/Particles/Break.uasset index 6f5a368..5994e34 100644 --- a/Content/Particles/Break.uasset +++ b/Content/Particles/Break.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76023c45488805c545ecf3c729c7a36eb89f59f7f0df0ff12b42802d33d023d4 -size 4251958 +oid sha256:656992a724aabc3ae0f6e79a7797ca5075b13b8583509fb89106d6400e61e89d +size 4064184