From c3c1eee87dd7feae983ce827d33a3dde5efb93e0 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Wed, 24 Jan 2024 16:03:03 +0000 Subject: [PATCH 01/16] Fixed sniper model being gone --- .../.idea.EndlessVendetta/.idea/workspace.xml | 41 ++++++++++--------- .../BaseWeapons/Snipers/BaseSniper.uasset | 4 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 8fc20d53..9af72f96 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,7 +8,7 @@ - + - { - "keyToString": { - "C++ Project.EndlessVendetta.executor": "Run", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "git-widget-placeholder": "HomeHub-Tutorial", - "ignore.virus.scanning.warn.message": "true", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -126,6 +126,7 @@ + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset index 9c558f37..658f6c74 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f96592b4b4a601faa17cc21653226506c222259441097ed328b9775d5f12a37b -size 127654 +oid sha256:cf3cb3f1c18d9cef57e27220662bc04a7cfb0de1aff48d810eaefeed37c29d20 +size 127332 From f402fde148683b6002e61b4fe04464d6cb90dd53 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Fri, 26 Jan 2024 18:34:14 +0000 Subject: [PATCH 02/16] Created Temp Silencer Mesh --- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../Content/StarterContent/Shapes/TempSilencer.uasset | 3 +++ .../Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset | 4 ++-- .../Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset | 4 ++-- .../Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..a2222591 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:61d130e2bfe7d6048f25eb87b7a0936a887ed73ad7fdc29737bbd57569345cac +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 2b39b316..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9832eb25780c5b708bc83a7162412745945be1c9a66822dbfc547ea46fba15a2 -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 diff --git a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset new file mode 100644 index 00000000..fbc6d821 --- /dev/null +++ b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61c0b03ac13ff095d5e52f5551a54cadb54e669e33e5a6a1ee4f8e4e233e50f2 +size 26923 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset index acadf3cb..a5e2facf 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd163ab11d986d221c1b1ce955970bdf5df7a4ee26a0c3cd0fa374c1bab5574e -size 7069 +oid sha256:84b30818e9bae891d6c94279a7ca4f0fc7de1ef3432141d4a7adc9057459595e +size 6503 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset index 35a7b628..0d782ca2 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b51d0369a65741c96d3499c1feac5146358708f5dc169e0f26d829accc474e91 -size 7159 +oid sha256:f97293c8252b81250776e74e7637a467ec93628edeac54773472326b7bd45303 +size 6593 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset index b8758f85..3932fca7 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eba44b03ff058bd86a49a05814cbb134bd5c24beb99148a7b8e7c2c7e71eb21 -size 5152 +oid sha256:78fd95a6d4b39f9f33ff776202ca1ffd9c24e4bc7fed9dd1ebf7e8bb596667ec +size 5213 From 1edfa037a150ce2ad0b17e04a240c3eb4bb3bf24 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Fri, 26 Jan 2024 18:35:03 +0000 Subject: [PATCH 03/16] Changed Actor Tags & Removed Manual Mesh Attachment --- .../Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 4 ++-- .../FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset | 4 ++-- .../BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset | 4 ++-- .../Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset index 5cd48aa7..8aa30a2f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55d9774b1be0067976e247efb9c0924028d8e6f104a2356fc3c244d0ca0bcbab -size 40721 +oid sha256:5dd6f9f711da54c221a1be010a47ff7bb53d5f37f0afa26a30cfde85d9d8d8d9 +size 41696 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index a67cfd74..23e228bc 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddfeb9078755b405062e9752c733edef8a3ffbb8b12189ef5aee0e306dbf83ac -size 127463 +oid sha256:1e0ab8a1e0763724c9f778d26fc39f9e2ec80dc2a63cc99d23a4edf1d5ceb6c6 +size 126609 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset index d493546a..bcdca35f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce09071644a22e6b7450df39c54ef3c4741209a5401376534740dc7d76298276 -size 128111 +oid sha256:27baa0566dff77e1a10c6ad16334355882c66dc68bddb90cd8790af23918a24c +size 126225 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset index 9df6634f..b98fc270 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de2933666cc939d964639b58e5bf9e846486cdeb275977e0112b8e28299168ba -size 964821 +oid sha256:7c875b5a56660d1175d197651084a60f82e244678cb44b7ed2354937caced1c0 +size 964880 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset index cc8853fa..48081b3a 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:014ad9c5325cbb86903bde65b93706b130e86ca2fef712a46486f1a58c6ca43d -size 6330 +oid sha256:79ec958f43b4dbf811aa3ba3b8f419f0644a0cb05134c87e0c6f8e9ac5ad7fdc +size 6852 From 57c55fb7628685bd447acc44c608ee398fd15522 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Fri, 26 Jan 2024 18:35:24 +0000 Subject: [PATCH 04/16] Fixed Bench Not recognizing secondary weapon only --- .../Workbench_UI/WBP_Workbench.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset index 26b8081a..c66d079d 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b0b18849fe2fb41c53b6835e8c1d882a5ed56dfa96a403797277280ffd3067b -size 136669 +oid sha256:42b23c0682e4a1b831dd351463fd812cc9e445143e2c0857327ae8c38acc458f +size 203702 From e3af853bdd69ac672e521535f3b42c5a574f7acb Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Fri, 26 Jan 2024 18:35:44 +0000 Subject: [PATCH 05/16] Re-Worked Workbench code to use sockets instead of mesh loc --- .../WeaponSystem/BaseWeaponClass.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index dde8cb8c..891eabc8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -257,13 +257,20 @@ void ABaseWeaponClass::InteractPrompt() void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh) { + GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("SETTING UP SILENCER ATTACHMENTS")); FTransform emptytransform; UActorComponent* SilencerComponent = AddComponentByClass(USilencerAttachmentClass::StaticClass(), true, emptytransform, false); - Cast(SilencerComponent)->AttachToComponent(RootComponent, FAttachmentTransformRules::SnapToTargetIncludingScale); - TArray SilencerMeshSocketArray (GetComponentsByTag(UStaticMeshComponent::StaticClass(), FName("SilencerMeshSocket"))); - Cast(SilencerMeshSocketArray[0])->SetStaticMesh(SilencerMesh); + UStaticMeshComponent* SilencerMeshComponent = Cast(AddComponentByClass(UStaticMeshComponent::StaticClass(), true, emptytransform, false)); + SilencerMeshComponent->SetStaticMesh(SilencerMesh); + SilencerMeshComponent->AttachToComponent(Cast(GetComponentByClass(USkeletalMeshComponent::StaticClass())), FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerMeshSocket"))); + Cast(SilencerComponent)->AttachToComponent(SilencerMeshComponent, FAttachmentTransformRules::SnapToTargetIncludingScale); + FTransform SilencerSocketTransform = SilencerMeshComponent->GetSocketTransform(FName(TEXT("SilencerMeshSocket")), RTS_Component); + FRotator SilencerSocketRotation = SilencerMeshComponent->GetSocketRotation(FName(TEXT("SilencerMeshSocket"))); + SilencerMeshComponent->SetRelativeTransform(SilencerSocketTransform); + SilencerMeshComponent->SetRelativeRotation(this->GetActorRotation()); + } - + \ No newline at end of file From 3990cefbc0addd73d80fb26784d88c671e45744f Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Fri, 26 Jan 2024 18:36:03 +0000 Subject: [PATCH 06/16] Added Sockets to weapons for Silencer Attachment --- EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset | 4 ++-- .../Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset | 4 ++-- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset index 0f1eb268..ecd32d01 100644 --- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset +++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67c8259a243d5c66d35b91458da2dd7e9e860224052098ba554eba470cee4a2a -size 2162660 +oid sha256:e5172de6da2ddc3a299ae29807f3c468faa1f5eadd7202e6e94688b92206faa8 +size 2113814 diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset index 3a6c6898..aa861853 100644 --- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset +++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af19d0a66ac93ccb5502fa57f0fa608709a59cffe2cc9157e8aa8bed3d43b5f9 -size 7712 +oid sha256:e1a0785430701e8ad4da18841226e2e18dd72d825c6a10cf28e7d73f1216ed28 +size 9013 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 173b36fe..8c7852ab 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b0713a508a47897e5751ea178e02c2d9627e12f34565f3a08f9a605b4ea2736 -size 455809 +oid sha256:de066ac492c967521893c0a1b64f49a4872fd72e09e68a230b50100e3a22a2cc +size 469312 From 9329454318664738f162f2b679cbc74fdc341071 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 14:24:31 +0000 Subject: [PATCH 07/16] Reworked Attachment spawning code to be more universal --- .../.idea.EndlessVendetta/.idea/workspace.xml | 48 +++++++++++-------- .../FPWeapon/Mesh/SK_FPGun_Skeleton.uasset | 4 +- .../AssaultRifles/BP_ARTEST1.uasset | 4 +- .../BaseWeapons/BP_BaseWeapon.uasset | 4 +- .../StarterContent/Shapes/TempSilencer.uasset | 4 +- .../9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset | 4 +- .../WeaponSystem/BaseWeaponClass.cpp | 35 +++++++++----- .../SilencerAttachmentClass.cpp | 2 - 8 files changed, 61 insertions(+), 44 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 9af72f96..e297b877 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,6 +9,13 @@ + + + + + + + - { + "keyToString": { + "C++ Project.EndlessVendetta.executor": "Run", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "attachment-bug-fix", + "ignore.virus.scanning.warn.message": "true", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" }, - "keyToStringList": { - "rider.external.source.directories": [ - "C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache", - "C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache", - "C:\\Users\\mhara\\AppData\\Local\\Symbols\\src" + "keyToStringList": { + "rider.external.source.directories": [ + "C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache", + "C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache", + "C:\\Users\\mhara\\AppData\\Local\\Symbols\\src" ] } -}]]> +} @@ -127,6 +134,9 @@ + + + diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset index aa861853..37e39f6f 100644 --- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset +++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1a0785430701e8ad4da18841226e2e18dd72d825c6a10cf28e7d73f1216ed28 -size 9013 +oid sha256:8924c723b3b8eaf0a1a580f215de2a547d9118851c617ad590199910fa2f48c9 +size 9020 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset index 8aa30a2f..f2ca1773 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dd6f9f711da54c221a1be010a47ff7bb53d5f37f0afa26a30cfde85d9d8d8d9 -size 41696 +oid sha256:da280a53ff9a19fc5698a2e4e87a2f0b6e4fd81c95fb5929a659cdb507b0d446 +size 41581 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index 23e228bc..201ac1f9 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e0ab8a1e0763724c9f778d26fc39f9e2ec80dc2a63cc99d23a4edf1d5ceb6c6 -size 126609 +oid sha256:f4d4c8728c6346fed52e60b7b56fa54a6492180815d2cee29d8d8730ac624947 +size 125545 diff --git a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset index fbc6d821..b857d8a4 100644 --- a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset +++ b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61c0b03ac13ff095d5e52f5551a54cadb54e669e33e5a6a1ee4f8e4e233e50f2 -size 26923 +oid sha256:cb6b37e3900f88fd3a4a94643d255ddb765f6cacefc1b8adc92c5fb97e7393a8 +size 28238 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset index b2990eba..11295e10 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb7fd3b17bbcc170b84fda39c7712b526f201a4a45ea48d1ac36415e0ca366ee -size 7007 +oid sha256:4d53dac7e3e749916ed5e5802c3c3495f2895827dcb66e9b2f49a8cac9a4ecb5 +size 6664 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 891eabc8..0e458497 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -258,19 +258,28 @@ void ABaseWeaponClass::InteractPrompt() void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh) { GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("SETTING UP SILENCER ATTACHMENTS")); - FTransform emptytransform; - UActorComponent* SilencerComponent = AddComponentByClass(USilencerAttachmentClass::StaticClass(), true, emptytransform, false); - UStaticMeshComponent* SilencerMeshComponent = Cast(AddComponentByClass(UStaticMeshComponent::StaticClass(), true, emptytransform, false)); - SilencerMeshComponent->SetStaticMesh(SilencerMesh); - SilencerMeshComponent->AttachToComponent(Cast(GetComponentByClass(USkeletalMeshComponent::StaticClass())), FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerMeshSocket"))); - Cast(SilencerComponent)->AttachToComponent(SilencerMeshComponent, FAttachmentTransformRules::SnapToTargetIncludingScale); - FTransform SilencerSocketTransform = SilencerMeshComponent->GetSocketTransform(FName(TEXT("SilencerMeshSocket")), RTS_Component); - FRotator SilencerSocketRotation = SilencerMeshComponent->GetSocketRotation(FName(TEXT("SilencerMeshSocket"))); - SilencerMeshComponent->SetRelativeTransform(SilencerSocketTransform); - SilencerMeshComponent->SetRelativeRotation(this->GetActorRotation()); + FTransform EmptyTransform; + USceneComponent* SilencerAttachmentClass = Cast(AddComponentByClass(USilencerAttachmentClass::StaticClass(), false, EmptyTransform, false)); + USkeletalMeshComponent* WeaponSkeletonMesh = FindComponentByClass(); + if (IsValid(SilencerAttachmentClass)) + { + if (IsValid(WeaponSkeletonMesh)) + { + SilencerAttachmentClass->AttachToComponent(WeaponSkeletonMesh, FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerSocketMesh"))); + UE_LOG(LogTemp, Display, TEXT("All Attachment is valid")); + //this makes it showup in editor for better debugging + SilencerAttachmentClass->CreationMethod = EComponentCreationMethod::Instance; + SilencerAttachmentClass->RegisterComponent(); + UStaticMeshComponent* StaticMeshComp = NewObject(SilencerAttachmentClass, UStaticMeshComponent::StaticClass()); + if (IsValid(StaticMeshComp)) + { + StaticMeshComp->AttachToComponent(SilencerAttachmentClass, FAttachmentTransformRules::SnapToTargetIncludingScale); + StaticMeshComp->SetStaticMesh(SilencerMesh); + StaticMeshComp->CreationMethod = EComponentCreationMethod::Instance; + StaticMeshComp->RegisterComponent(); + } + } + } } - - - \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp index 7f31f73b..50b63063 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/SilencerAttachmentClass.cpp @@ -29,7 +29,5 @@ void USilencerAttachmentClass::BeginPlay() void USilencerAttachmentClass::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) { Super::TickComponent(DeltaTime, TickType, ThisTickFunction); - - // ... } From cec0b54b1aebfa405d3df722ddcc10624ac4d50e Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 15:49:52 +0000 Subject: [PATCH 08/16] Fixed Silencer for Rifles not positioned and rotated properly --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 7 ++----- EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset | 4 ++-- .../Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset | 2 +- .../Content/StarterContent/Shapes/TempSilencer.uasset | 4 ++-- .../EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 5 ++++- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index e297b877..21fe1158 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,13 +9,10 @@ + - - - - diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset index ecd32d01..28e6c3fd 100644 --- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset +++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5172de6da2ddc3a299ae29807f3c468faa1f5eadd7202e6e94688b92206faa8 -size 2113814 +oid sha256:388390c8d51429942976c17d06b5e4084e652f9b2554782794c1dad2d766438c +size 2113778 diff --git a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset index 37e39f6f..8a95da14 100644 --- a/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset +++ b/EndlessVendetta/Content/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8924c723b3b8eaf0a1a580f215de2a547d9118851c617ad590199910fa2f48c9 +oid sha256:a791858557c1d4a2c87aefc7d0cff0cb191cb6d496ec518f602ce3db92323815 size 9020 diff --git a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset index b857d8a4..05ac52df 100644 --- a/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset +++ b/EndlessVendetta/Content/StarterContent/Shapes/TempSilencer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb6b37e3900f88fd3a4a94643d255ddb765f6cacefc1b8adc92c5fb97e7393a8 -size 28238 +oid sha256:09bd5fb96ee510542e6f9c5439748cae1542863fd4909d649bf76be51e9d4468 +size 28225 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 0e458497..2c2b3c73 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -266,7 +266,7 @@ void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh) { if (IsValid(WeaponSkeletonMesh)) { - SilencerAttachmentClass->AttachToComponent(WeaponSkeletonMesh, FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerSocketMesh"))); + SilencerAttachmentClass->AttachToComponent(WeaponSkeletonMesh, FAttachmentTransformRules::SnapToTargetIncludingScale, FName(TEXT("SilencerMeshSocket"))); UE_LOG(LogTemp, Display, TEXT("All Attachment is valid")); //this makes it showup in editor for better debugging SilencerAttachmentClass->CreationMethod = EComponentCreationMethod::Instance; @@ -276,6 +276,9 @@ void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh) { StaticMeshComp->AttachToComponent(SilencerAttachmentClass, FAttachmentTransformRules::SnapToTargetIncludingScale); StaticMeshComp->SetStaticMesh(SilencerMesh); + StaticMeshComp->SetRelativeRotation(FRotator(0,90,0)); + StaticMeshComp->SetCollisionEnabled(ECollisionEnabled::NoCollision); + //Making it show in editor for debugging StaticMeshComp->CreationMethod = EComponentCreationMethod::Instance; StaticMeshComp->RegisterComponent(); } From 98bf5288ed9153967b59c7d36e1dac64a06e95cb Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 16:30:10 +0000 Subject: [PATCH 09/16] Added Widget Vars and UI State Checks to stop Idle Anims --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 8c7852ab..0af08e0f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de066ac492c967521893c0a1b64f49a4872fd72e09e68a230b50100e3a22a2cc -size 469312 +oid sha256:2d41b2c5102edb2c0a1bed1a861b3bc77a6d16ae2745eb70061f949a3cdedb4d +size 481838 From eaf5f6ca4610ab7a9bfc597a95bb1b8444b51135 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 16:30:27 +0000 Subject: [PATCH 10/16] Added Camera to Workbench for creating better UI --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 11 +++++++---- .../BaseWeapons/Shotguns/BP_BaseShotgun.uasset | 4 ++-- .../BP_WeaponWorkbench.uasset | 4 ++-- .../Workbench_UI/WBP_Workbench.uasset | 4 ++-- .../DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset | 4 ++-- .../DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset | 4 ++-- .../DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset | 3 --- 7 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 21fe1158..603ac0b0 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,10 +9,12 @@ - - - - + + + + + + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset index b82510b8..2a158809 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77fc87f2895edafaa9d2192aae11f1d401bd041ac27c83283bcacee09e495bf1 -size 127352 +oid sha256:362a64d67da0cb91a66300f81b87b5482e4cd9a1058aafb5b012ed79a835ba07 +size 125596 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset index 0bcff90c..0c431d5a 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:298d24e922076c08990a077430f8dd16ec7b014029547591be8b7658eb0ec17b -size 48331 +oid sha256:9b6cd073a799bfdbe0a6adcc32c3cc6863bd43e708c46a4ae1d2a120c3fedd5d +size 86927 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset index c66d079d..84de909f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42b23c0682e4a1b831dd351463fd812cc9e445143e2c0857327ae8c38acc458f -size 203702 +oid sha256:069937c26777acf4b123302ab3bc3445c2cac96bc5aa5828462f810b3e193456 +size 29122 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset index eae0f773..50f5595b 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e1d15b8a2648519fcec0059b248d90fc57e5a576bad5418d6c81220017272b7 -size 7082 +oid sha256:8c4ce0647a5c6be70b5b2078d285a9d14a8a6eb0264271d36931b66c7a7904b6 +size 6516 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset index 3932fca7..78c5b82a 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78fd95a6d4b39f9f33ff776202ca1ffd9c24e4bc7fed9dd1ebf7e8bb596667ec -size 5213 +oid sha256:447c4b18a696c536364a125e3b19676a81b4e0603b13e9691b3b93b270ca1efa +size 5650 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset deleted file mode 100644 index e0940ef3..00000000 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f37bd6fd21d44596891c4bd6763bd936b1ff98425033925bbed475ee4d2f5b9 -size 7302 From 9ae158b4e80859a68e4c2f6d6cd7e9e380242e20 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 17:24:33 +0000 Subject: [PATCH 11/16] Fixed BaseWeapon Recoil Crash Bug --- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 2c2b3c73..81cc1fcf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -101,6 +101,7 @@ void ABaseWeaponClass::GenerateRecoilVector() void ABaseWeaponClass::ApplyRecoil(float DeltaTime) { + if (!endlessVendettaChar->bHasRifle) return; if (recoilTime < 0.3) { float amplitude = RecoilCurve->GetFloatValue(recoilTime); //get current value of curve in time From 8aa0b694363d0329749d95b049cd57c86196985a Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 17:26:02 +0000 Subject: [PATCH 12/16] Added Primary and Secondary weapon meshes to workbench --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 8 ++++---- .../Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset | 4 ++-- .../Workbench_UI/WBP_Workbench.uasset | 4 ++-- .../DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 603ac0b0..07895a58 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,12 +9,11 @@ - - + - + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset index 0c431d5a..6b840d03 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b6cd073a799bfdbe0a6adcc32c3cc6863bd43e708c46a4ae1d2a120c3fedd5d -size 86927 +oid sha256:b0231b90e1bc63aa6be3d8cc7e9d60228cc45370950dac6b295601652606dd58 +size 131038 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset index 84de909f..a7df4f37 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:069937c26777acf4b123302ab3bc3445c2cac96bc5aa5828462f810b3e193456 -size 29122 +oid sha256:de06dbb9771982ac62383f3a8367b6549cdda7a66f35b0ac06dcd403b47227ed +size 48048 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset index 78c5b82a..e48a8c3c 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:447c4b18a696c536364a125e3b19676a81b4e0603b13e9691b3b93b270ca1efa -size 5650 +oid sha256:0838582169a0f3308168a5c30769fddd96adc3c89fd2a6b6a336d6c0f0b88f4d +size 6374 From 64fa82b2da4e729ca3250317bdc2aebf87bcd6ed Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 18:48:15 +0000 Subject: [PATCH 13/16] Created Attachment Tag to all attachments --- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 81cc1fcf..a3d1b18b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -262,6 +262,7 @@ void ABaseWeaponClass::SetupSilencerAttachment(UStaticMesh* SilencerMesh) FTransform EmptyTransform; USceneComponent* SilencerAttachmentClass = Cast(AddComponentByClass(USilencerAttachmentClass::StaticClass(), false, EmptyTransform, false)); + SilencerAttachmentClass->ComponentTags.Add(FName("AttachmentType")); USkeletalMeshComponent* WeaponSkeletonMesh = FindComponentByClass(); if (IsValid(SilencerAttachmentClass)) { From e218a28e22a2d105286f9a9902cce8ac6266230a Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 18:48:28 +0000 Subject: [PATCH 14/16] Created SilencerImage placeholder for UI --- .../Workbench_UI/WBP_SilencerImage.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset new file mode 100644 index 00000000..e4bcc0c7 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_SilencerImage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6541b0e884663dee959f9484786850d0a8dc7727b41a2fc8a063ac28381ee851 +size 22763 From e59fa152c845d530395fb5f9365229466552da24 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 18:48:45 +0000 Subject: [PATCH 15/16] Fixed rotation and positioning of silencer on pistols --- .../Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset index 48081b3a..33067b99 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79ec958f43b4dbf811aa3ba3b8f419f0644a0cb05134c87e0c6f8e9ac5ad7fdc -size 6852 +oid sha256:224fd066e908fdcb82c95df41d433787f45507d56387cb8978feaf6f2d759125 +size 7075 From c0dadec878cceb4d89ee28b5a686a475a818f1e7 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 1 Feb 2024 18:49:11 +0000 Subject: [PATCH 16/16] Added Silencer Equip Functionality to new workbench --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 4 ++-- .../Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset | 4 ++-- .../Workbench_UI/WBP_Workbench.uasset | 4 ++-- .../Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 07895a58..ad59c6ef 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,9 +9,9 @@ + - @@ -136,7 +136,7 @@ - + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset index 6b840d03..9ed6e4f1 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0231b90e1bc63aa6be3d8cc7e9d60228cc45370950dac6b295601652606dd58 -size 131038 +oid sha256:a90f10864a9825562cc3a8bb9972d912211f53477d808ae9252142fb3b197a85 +size 146446 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset index a7df4f37..e02c45b6 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de06dbb9771982ac62383f3a8367b6549cdda7a66f35b0ac06dcd403b47227ed -size 48048 +oid sha256:cd7b744f17e4d12932b8bc8d1452dcc9d3e54cc83c20d46cd3e8e063a96f11a3 +size 227800 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset index e48a8c3c..86bd9ab5 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0838582169a0f3308168a5c30769fddd96adc3c89fd2a6b6a336d6c0f0b88f4d +oid sha256:1a02acdaa622152fe92278f5c6bcfa93a1f8831cee568902f7fde1b519ae6f6f size 6374