From ea7aeaf66710e9bfdce579aa55d196f9ad897b4a Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sun, 3 Oct 2021 15:28:01 -0500 Subject: [PATCH] Fixing muzzle flashes; Put gun in right hand and sword in left [git-p4: depot-paths = "//depot/main/": change = 132] --- .../Enemies/TestEnemy/BP_TestEnemy.uasset | 4 ++-- .../Protagonist/BP_Protagonist.uasset | 4 ++-- .../Character/Mesh/SK_Mannequin.uasset | 4 ++-- .../Mesh/UE4_Mannequin_Skeleton.uasset | 4 ++-- SwordNGun/Content/Maps/Test.umap | 4 ++-- SwordNGun/Content/Maps/Test_BuiltData.uasset | 2 +- .../Weapons/Revolver/Mesh/SM_Revolver.uasset | 4 ++-- .../Revolver/Mesh/SM_Revolver_Skeleton.uasset | 4 ++-- .../Shotgun/Mesh/Prototype_Shotgun.uasset | 4 ++-- .../Private/Weapons/SNGRangedWeaponBase.cpp | Bin 5308 -> 5374 bytes 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset index 2a4556c..9f9b39b 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/BP_TestEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc1e9b764d51fdf26f1cca5d23d24776e18dc5c34afdaa52804747854da3022d -size 166255 +oid sha256:20b32160372f846369f0478e77b0448b7634e1ee17ee838fea5d26c6d44c1187 +size 166045 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index c424a91..385ca77 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:ffdcedc3ba44c771fdfecd4e08aae249b1d870fd4a22a54ec0a92c01f1895e12 -size 171177 +oid sha256:bd211f42b17ae569b0b6fa4170cc0bad584ecd878047869ade305926f7c0fdcf +size 172548 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin.uasset index 22f077d..15d3085 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/SK_Mannequin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7c0c55e34cff0b67b80e0aa4f94a94e7ad864e9c8a2f0f2d1e3f254f8595834 -size 5668338 +oid sha256:f4b44044d2191c69b8913b60480e9b68366f7f39e47c62bf2f48774c14ade74c +size 5666842 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset index 6017bb0..eb87d59 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d78d99dbeb23951bec8435f2a5a06206e4340409c093c200b6d3b5e5f9c32981 -size 30725 +oid sha256:2a12aee6a2a5520cb7c6c5ae33ab267199544a4cb047c677c126f44fa9f14ba9 +size 30571 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index a33a9ce..dcf527c 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:41c4185755e312aae8805498ae386758aa2068067054b62bcd15011122591cec -size 685766 +oid sha256:ebe7ea123818e3ef70631a94f08a6b7f742ccff3c27663dffce54793b7003235 +size 685776 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 59df0c9..74c6ccc 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:00b12ece10185c4f4bd339844e75af1d8e964c1b1bfcbc28f53b3e311de4a156 +oid sha256:358ee504d2945f86856d3d9eee12eab758bcca98d28af946631d1ca997cb2410 size 2330061 diff --git a/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver.uasset b/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver.uasset index e09adc4..4c24e48 100644 --- a/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver.uasset +++ b/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fab90f58a61432c6d231ff64f1ef35dc26cc44df13978badc8531e717685b6e2 -size 7751664 +oid sha256:a1f191248bd7ee355699f6874743fc9b8260c06f9e868e2f4546c9a54b0fc75b +size 7750847 diff --git a/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver_Skeleton.uasset b/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver_Skeleton.uasset index 2d1c94a..2803abc 100644 --- a/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver_Skeleton.uasset +++ b/SwordNGun/Content/Weapons/Revolver/Mesh/SM_Revolver_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82ff41476eb333d0252606c4e06606682a741fb0355d6f497562ba2054c2df17 -size 2450 +oid sha256:77ac0271f62457af13d7ecee0ee040d58737e2ecba33c5992f36178c6faab582 +size 2445 diff --git a/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset index cc6f1e0..d2f9b75 100644 --- a/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset +++ b/SwordNGun/Content/Weapons/Shotgun/Mesh/Prototype_Shotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:549e2f923ad9db999a09dadc5c93a98eefd584fdd5ef824f7cdc209f8a7c5329 -size 423017 +oid sha256:380ae4e464d7d38928bd21a56f0abaf535f38b52356bb27f7b9fffea556af7c5 +size 422608 diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp index e9a9c1246c025fd187faa43ef30c365e30355484..5b1236c6893b44d4a362900981963fac7bcce9b7 100644 GIT binary patch delta 28 kcmdm^`A>7hJAuhT{92R$2pCKj;PaaNh(BQS0znyO0J2XC`Tzg` delta 40 wcmeyTxkq!uI|1$zhD3&Bh75*OhLp*T0@9NW1SObt7!)QqGAeGKB$&et01CMaqyPW_