From c6575a21e22dd632d2e7a64727cf6b9844490e14 Mon Sep 17 00:00:00 2001 From: KRISTIAN CHARNLEY-PARR Date: Thu, 9 Nov 2023 15:59:27 +0000 Subject: [PATCH 01/44] Asset addition Added target and modular --- Assets/Modular_pieces/SM_Doorway.fbx | 3 +++ Assets/Modular_pieces/SM_Floor.fbx | 3 +++ Assets/Modular_pieces/SM_Floor_Small.fbx | 3 +++ Assets/Modular_pieces/SM_Pillar_1.fbx | 3 +++ Assets/Modular_pieces/SM_Pillar_2.fbx | 3 +++ Assets/Modular_pieces/SM_Wall.fbx | 3 +++ Assets/Modular_pieces/SM_Wall_Short.fbx | 3 +++ Assets/Modular_pieces/SM_stairs.fbx | 3 +++ Assets/Textures/SM_Target.fbx | 3 +++ Assets/Textures/T_Target_C.png | 3 +++ Assets/Textures/T_Target_N.png | 3 +++ Assets/Textures/T_Target_ORM.png | 3 +++ 12 files changed, 36 insertions(+) create mode 100644 Assets/Modular_pieces/SM_Doorway.fbx create mode 100644 Assets/Modular_pieces/SM_Floor.fbx create mode 100644 Assets/Modular_pieces/SM_Floor_Small.fbx create mode 100644 Assets/Modular_pieces/SM_Pillar_1.fbx create mode 100644 Assets/Modular_pieces/SM_Pillar_2.fbx create mode 100644 Assets/Modular_pieces/SM_Wall.fbx create mode 100644 Assets/Modular_pieces/SM_Wall_Short.fbx create mode 100644 Assets/Modular_pieces/SM_stairs.fbx create mode 100644 Assets/Textures/SM_Target.fbx create mode 100644 Assets/Textures/T_Target_C.png create mode 100644 Assets/Textures/T_Target_N.png create mode 100644 Assets/Textures/T_Target_ORM.png diff --git a/Assets/Modular_pieces/SM_Doorway.fbx b/Assets/Modular_pieces/SM_Doorway.fbx new file mode 100644 index 00000000..5aeafc56 --- /dev/null +++ b/Assets/Modular_pieces/SM_Doorway.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9b9ac016c178ce63eccf29001bcf8efa0bd57bd6a23e0cd88f8eab9dec37257 +size 33520 diff --git a/Assets/Modular_pieces/SM_Floor.fbx b/Assets/Modular_pieces/SM_Floor.fbx new file mode 100644 index 00000000..030a7aba --- /dev/null +++ b/Assets/Modular_pieces/SM_Floor.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e0771320791ab89e40a59eb6d56392eb18f1a0b6346bbc3f47db412d3199aea +size 31696 diff --git a/Assets/Modular_pieces/SM_Floor_Small.fbx b/Assets/Modular_pieces/SM_Floor_Small.fbx new file mode 100644 index 00000000..93537a72 --- /dev/null +++ b/Assets/Modular_pieces/SM_Floor_Small.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e131e3bdec8760f912598f0716c28b30daf0d5d7c44368cf6b0f1670c2f92e4 +size 31712 diff --git a/Assets/Modular_pieces/SM_Pillar_1.fbx b/Assets/Modular_pieces/SM_Pillar_1.fbx new file mode 100644 index 00000000..6ade5eb1 --- /dev/null +++ b/Assets/Modular_pieces/SM_Pillar_1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:802363779c0819a9a17fd285a2331118f211137df8c0f619c4741302f08d257a +size 32176 diff --git a/Assets/Modular_pieces/SM_Pillar_2.fbx b/Assets/Modular_pieces/SM_Pillar_2.fbx new file mode 100644 index 00000000..17f1a378 --- /dev/null +++ b/Assets/Modular_pieces/SM_Pillar_2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48640089d1f65506bb49db4963004d5c95a084177f222c5c96a382304a81ee08 +size 34432 diff --git a/Assets/Modular_pieces/SM_Wall.fbx b/Assets/Modular_pieces/SM_Wall.fbx new file mode 100644 index 00000000..a4484001 --- /dev/null +++ b/Assets/Modular_pieces/SM_Wall.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02a573561ba156717b6dea4d23e241c6ffea79a8bfd5bc9b37a62c57e3539c76 +size 32080 diff --git a/Assets/Modular_pieces/SM_Wall_Short.fbx b/Assets/Modular_pieces/SM_Wall_Short.fbx new file mode 100644 index 00000000..910f438e --- /dev/null +++ b/Assets/Modular_pieces/SM_Wall_Short.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78545858f6b44ed63d79929f9f2b6b20f43175f1aa345510588a79bd796f8f1f +size 32112 diff --git a/Assets/Modular_pieces/SM_stairs.fbx b/Assets/Modular_pieces/SM_stairs.fbx new file mode 100644 index 00000000..86902fa5 --- /dev/null +++ b/Assets/Modular_pieces/SM_stairs.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06442e88d1ca255f81ca2b3903e5eb52b55fcfa64f581fc4e171502a8a5c6cf9 +size 33968 diff --git a/Assets/Textures/SM_Target.fbx b/Assets/Textures/SM_Target.fbx new file mode 100644 index 00000000..7bcdeffc --- /dev/null +++ b/Assets/Textures/SM_Target.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4989b9d63f20edcdcc18f1237c657b34a73d6c03508dbc288eb1e99926e8fcbc +size 50976 diff --git a/Assets/Textures/T_Target_C.png b/Assets/Textures/T_Target_C.png new file mode 100644 index 00000000..41a93715 --- /dev/null +++ b/Assets/Textures/T_Target_C.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:154fbb78a86cabc597144fa14c28c5a835dad40e648614e81981a6da3de11fd0 +size 1103029 diff --git a/Assets/Textures/T_Target_N.png b/Assets/Textures/T_Target_N.png new file mode 100644 index 00000000..fe638fa6 --- /dev/null +++ b/Assets/Textures/T_Target_N.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:823781437ee46f2d1eb685df4605daebe95e8f2ca13f29ff284d20541d6ebb1c +size 1699660 diff --git a/Assets/Textures/T_Target_ORM.png b/Assets/Textures/T_Target_ORM.png new file mode 100644 index 00000000..5da40ea0 --- /dev/null +++ b/Assets/Textures/T_Target_ORM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dccc81414d07512b696c6142b8c319cee228f07e902f687a2c45a7501745d61 +size 717679 From 81c9df4940f89ad382b9f4d044e82a9428b0d400 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 13 Nov 2023 12:43:44 +0000 Subject: [PATCH 02/44] Update Inventory to Update Size During Runtime --- .../EndlessVendetta/EndlessVendettaCharacter.cpp | 14 ++++++++++++++ .../EndlessVendetta/EndlessVendettaCharacter.h | 3 +++ .../Inventory/InventoryComponent.cpp | 4 ++-- .../EndlessVendetta/Inventory/InventoryComponent.h | 6 ++++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 97bbe387..b47528cf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -12,6 +12,7 @@ #include "GameFramework/CharacterMovementComponent.h" #include "Kismet/GameplayStatics.h" #include "GameFramework/MovementComponent.h" +#include "Inventory/InventoryComponent.h" ////////////////////////////////////////////////////////////////////////// @@ -486,3 +487,16 @@ bool AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGad } return true; } + +void AEndlessVendettaCharacter::UpdateInventorySize(int Cols, int Rows) +{ + UInventoryComponent* Inventory = Cast(GetComponentByClass(UInventoryComponent::StaticClass())); + if (IsValid(Inventory)) + { + Inventory->UpdateInventorySize(Cols, Rows); + } + else + { + UE_LOG(LogTemp, Warning, TEXT("No Vaild Inventory")); + } +} diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 258c5c21..a20cde35 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -194,4 +194,7 @@ public: // Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used bool UpdateGadgetType(TSubclassOf NewGadgetClass); + + UFUNCTION(Exec) + void UpdateInventorySize(int Cols, int Rows); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 2d09885f..8f08b362 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -23,7 +23,6 @@ void UInventoryComponent::InitializeComponent() ItemToPickup = nullptr; } - // Called when the game starts void UInventoryComponent::BeginPlay() { @@ -181,11 +180,12 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { } -void UInventoryComponent::UpdateInventorySize_Implementation(const int _Columns, const int _Rows) +void UInventoryComponent::UpdateInventorySize(const int _Columns, const int _Rows) { Columns = _Columns; Rows = _Rows; InventoryItems.SetNum(Columns * Rows); + OnInventorySizeUpdated.Broadcast(); } bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index 813a181b..124d0de0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -38,6 +38,9 @@ public: DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnInventoryUpdated); UPROPERTY(BlueprintAssignable, Category="Inventory") FOnInventoryUpdated OnInventoryUpdated; + DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnInventorySizeUpdated); + UPROPERTY(BlueprintAssignable, Category = "Inventory") + FOnInventorySizeUpdated OnInventorySizeUpdated; UFUNCTION(BlueprintCallable, Category="Inventory") bool AddItem(class UBaseItem* Item); @@ -60,9 +63,8 @@ public: void RemoveItem(class UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") void SpawnItem(class UBaseItem* Item, FVector Location); - UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Exec, Category = "Inventory") + UFUNCTION(BlueprintCallable, Category = "Inventory") void UpdateInventorySize(const int _Columns, const int _Rows); - virtual void UpdateInventorySize_Implementation(const int _Columns, const int _Rows); private: bool IsTileValid(const FInventoryTile InventoryTile) const; From 2b238e240a5bde204c029d3965e67a5a51849a30 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 13 Nov 2023 12:44:33 +0000 Subject: [PATCH 03/44] Update Inventory UI for Hover Over Effects --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../Content/Inventory/UI/SB_HoverOverEffect.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 4 ++-- EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 EndlessVendetta/Content/Inventory/UI/SB_HoverOverEffect.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 8e4ecbd1..1736f776 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:722ad362b974f8cd884e1852c963e27f75f4ed6f285759adbd3c3571b1f477c0 -size 57740 +oid sha256:5638a7d36fdefd534f08fd87513f00101bbef802b568f7d02267395b47d88f54 +size 61089 diff --git a/EndlessVendetta/Content/Inventory/UI/SB_HoverOverEffect.uasset b/EndlessVendetta/Content/Inventory/UI/SB_HoverOverEffect.uasset new file mode 100644 index 00000000..e48fca0c --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/SB_HoverOverEffect.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbcc00b36495ff3f694825bbd8d0db67fe62ab2e6d8ba445c64f107e0e507014 +size 3410 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset index 3b397eac..22eecbbe 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02676d43ab06d6fe84a89f2c8c147415615e84ab3474cb59e75888dae53f5711 -size 96823 +oid sha256:4cd7be63032f84db0d2605e6a947b312d838ccdc78d3779a8e8fa4db5010726a +size 99676 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset index fc14eb3f..844f829e 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cce77e4317282a52477d49365a307a4673915f14b6013ee32ed2ef26800fa37 -size 563097 +oid sha256:e94764e44d695aab2a01b2db5c7a4803fb05b7b66c50c0ea07f685d09a1a9656 +size 575459 From f9b0bc74c6ecb988c9f55cae2c0845b487c17a75 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 13 Nov 2023 14:18:50 +0000 Subject: [PATCH 04/44] Update Inventory UI for Locaton & Hover Colour --- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 4 ++-- EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset index 22eecbbe..450cd25d 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cd7be63032f84db0d2605e6a947b312d838ccdc78d3779a8e8fa4db5010726a -size 99676 +oid sha256:f306ec19fdcdaba05a906d675469fb39ee1ef090bce28e81370ceccfab928cf8 +size 99522 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset index 844f829e..8749721a 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e94764e44d695aab2a01b2db5c7a4803fb05b7b66c50c0ea07f685d09a1a9656 -size 575459 +oid sha256:0ac0d205797514c644e8fb68330f8e6584ede2692e695d438193a2164ce7373f +size 572083 From 6ff29fa551db4a601630a828b72f3579e048fb9a Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 16 Nov 2023 10:52:19 +0000 Subject: [PATCH 05/44] Add UI for Weapon Slots --- EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset | 4 ++-- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 4 ++-- .../Content/Inventory/UI/UI_InventoryEquipSlots.uasset | 3 +++ EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 2 +- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_InventoryEquipSlots.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset index 0422e8b5..cf9c312e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64c5c7438cb4287bc4df51b9393981eb8155dc5f14525c600d6725960dce6bfd -size 108419 +oid sha256:4d7d24aa46e86ffeb47791c341c30c4f33c5a475f33a822fc3aee599f0f6e481 +size 111954 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset index 450cd25d..90a56d6e 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f306ec19fdcdaba05a906d675469fb39ee1ef090bce28e81370ceccfab928cf8 -size 99522 +oid sha256:30934348f5157159d8dc38af0d02d8d5063b0a1592c6391ba80c26b584f5a5eb +size 108245 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_InventoryEquipSlots.uasset b/EndlessVendetta/Content/Inventory/UI/UI_InventoryEquipSlots.uasset new file mode 100644 index 00000000..ed25e697 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_InventoryEquipSlots.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff6108b154c40bc8fdb49f4e7ee1d414bd9871ede0b9096858487ebc390556bd +size 79543 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 173b21c6..56e20653 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:025f2af1652f9d8f05c2bd2d98e928643385f8df9fdd12b974730607629f7053 +oid sha256:1b17da4a8cd650bc78f83060778fd1914ad2718ea49221064df83238d807b04f size 623170 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 6ac09198..0251256c 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:f634452f028c77c71b9d61b2d0ac3caf78a37970f4b34476380c93954a49d110 +oid sha256:4af6aecc61e392985b714111a84b075675b97664b4a9a5883846dac4e312f3d4 size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index 6719d427..eafee70c 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41bfb48c7a239c34eb153525ca3d75153a3ece4f998ce436719ee09cf78517d2 -size 31309 +oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 +size 31142 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2ba242c0..2e926194 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7490d679035d0f517908112f047e9db2dd7243b56f40d6957089d95d49c912ba -size 20635 +oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 +size 20495 From ba11c7f12fb126b8be6bac1e585e8a65f21b9793 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Nov 2023 12:06:24 +0000 Subject: [PATCH 06/44] Added Door Testing Level --- EndlessVendetta/Content/Levels/DoorTestLevel.umap | 3 +++ .../Content/StarterContent/Architecture/Floor_400x400.uasset | 2 +- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- .../Levels/DoorTestLevel/0/41/3FZYKAJO60E8F4WVT8FV88.uasset | 3 +++ .../Levels/DoorTestLevel/0/9Q/HY8HJRQIKTVOF3OHX80G7R.uasset | 3 +++ .../Levels/DoorTestLevel/0/FO/HZW6GENZ4ORQO32631F0NM.uasset | 3 +++ .../Levels/DoorTestLevel/0/QL/Q19K1NBEG07WR9W65AY9D3.uasset | 3 +++ .../Levels/DoorTestLevel/0/TK/733U54K7KZMUP4ETP0ISSO.uasset | 3 +++ .../Levels/DoorTestLevel/0/UA/I2LCWFRMQSUPVR801L9OCF.uasset | 3 +++ .../Levels/DoorTestLevel/2/68/WB21XHTYJYO4O9RIZ55LNU.uasset | 3 +++ .../Levels/DoorTestLevel/2/86/2G0VVLAV19SLSWJ4KQ4NHI.uasset | 3 +++ .../Levels/DoorTestLevel/2/GX/7KM4BQ68V5XZ7CLTNOGM9L.uasset | 3 +++ .../Levels/DoorTestLevel/2/H3/OM1G439X65VZCEFTI9OEHP.uasset | 3 +++ .../Levels/DoorTestLevel/2/MS/733DH0ELXQT8G5L1XOMMA4.uasset | 3 +++ .../Levels/DoorTestLevel/2/ZZ/E5QNRIOCH1LB7TO3X7A10I.uasset | 3 +++ .../Levels/DoorTestLevel/3/8O/4NGU86V83TDFZ9PR4JFLKS.uasset | 3 +++ .../Levels/DoorTestLevel/3/QN/3YUXM3TARBR8EMM9RBE1UN.uasset | 3 +++ .../Levels/DoorTestLevel/3/VI/1GV0CM91M7ZLMDNBGA0CFL.uasset | 3 +++ .../Levels/DoorTestLevel/3/YK/B2392CL9CGCIC5QBAUAS7A.uasset | 3 +++ .../Levels/DoorTestLevel/4/94/QOZIO4M7R3C35BN159S088.uasset | 3 +++ .../Levels/DoorTestLevel/4/WH/YF1JMCP85KDQ5DDMSIOLP7.uasset | 3 +++ .../Levels/DoorTestLevel/5/5D/XN72HGN7LXFVTIJUV7K0ZE.uasset | 3 +++ .../Levels/DoorTestLevel/6/A1/KNXMGC8O8536H90M97PMJQ.uasset | 3 +++ .../Levels/DoorTestLevel/6/LW/HVQ3CV59MZD3N4KI9MTZWC.uasset | 3 +++ .../Levels/DoorTestLevel/7/7I/5TADMXBKY6NUNEKHGSTX6B.uasset | 3 +++ .../Levels/DoorTestLevel/7/86/PG1MR3CJ778U2GAWR6H2H7.uasset | 3 +++ .../Levels/DoorTestLevel/7/R7/4NH9MSWXUQWD5FGKP5F5P2.uasset | 3 +++ .../Levels/DoorTestLevel/7/SE/38C003G8A2H9SHFN2J70NE.uasset | 3 +++ .../Levels/DoorTestLevel/8/EN/L5SY2ZN2G43LU47ZPXJBIN.uasset | 3 +++ .../Levels/DoorTestLevel/8/NN/MCFQLOBSBH3CTKZVGBRLNE.uasset | 3 +++ .../Levels/DoorTestLevel/8/PN/34KINR4833RXERMT00775M.uasset | 3 +++ .../Levels/DoorTestLevel/8/VK/UFDDP1CDKKS3FA1TVOUSDQ.uasset | 3 +++ .../Levels/DoorTestLevel/9/F4/U86JU0TBAGRXGL6I4ZNJT8.uasset | 3 +++ .../Levels/DoorTestLevel/9/HJ/4X8V7XC1GD63O280W63IES.uasset | 3 +++ .../Levels/DoorTestLevel/9/LN/BRA0AO6W6V6X09OD73FHHZ.uasset | 3 +++ .../Levels/DoorTestLevel/9/M4/1IP5JBA78O4C0ENI05WH14.uasset | 3 +++ .../Levels/DoorTestLevel/9/OH/ODUV9002HNF6YWQD6POVGZ.uasset | 3 +++ .../Levels/DoorTestLevel/9/PK/PDUZP4QDZC13GXE96TD60O.uasset | 3 +++ .../Levels/DoorTestLevel/A/EC/HT2V27XFCNQFZ5PM314D76.uasset | 3 +++ .../Levels/DoorTestLevel/A/HQ/QJBYLDM8XHJ6CSH2AEWFR7.uasset | 3 +++ .../Levels/DoorTestLevel/B/32/UTTYU5FIUXFYRU3CTFHFTJ.uasset | 3 +++ .../Levels/DoorTestLevel/B/AH/JVO30XDUQQ1X58C4F89MDD.uasset | 3 +++ .../Levels/DoorTestLevel/B/PY/NKQOBV4YL74I23R81XKXIS.uasset | 3 +++ .../Levels/DoorTestLevel/B/VG/5W9ZC19AUZGP1VF6T80SEM.uasset | 3 +++ .../Levels/DoorTestLevel/B/VI/JW7M6CJ361UGJ2KK9FFY5I.uasset | 3 +++ .../Levels/DoorTestLevel/B/ZB/EYUVKNCPV5ZP9BIUQ8MUIT.uasset | 3 +++ .../Levels/DoorTestLevel/C/3C/X3EYHY4TH4GZLREPOCGFN8.uasset | 3 +++ .../Levels/DoorTestLevel/C/GM/RJFJNWQJGMD7Z14FHJ6FZE.uasset | 3 +++ .../Levels/DoorTestLevel/C/JC/62NU1O0LRZQNCFM83HQSZ3.uasset | 3 +++ .../Levels/DoorTestLevel/C/PR/91ACGEGQ3TUY2GM83T1LA0.uasset | 3 +++ .../Levels/DoorTestLevel/C/YX/SPJPI8FJ3MP1KJD8CNACRN.uasset | 3 +++ .../Levels/DoorTestLevel/D/8A/KB30TN5PQU5G14UF1W1K0Q.uasset | 3 +++ .../Levels/DoorTestLevel/D/CZ/9VP49T6R7HWSMKHUQP850K.uasset | 3 +++ .../Levels/DoorTestLevel/D/PF/UG8E8S5E7CQ0GZ1ZSUDDJ1.uasset | 3 +++ .../Levels/DoorTestLevel/D/S5/BJZX2JLRNPQS3EVUH2DCYW.uasset | 3 +++ .../Levels/DoorTestLevel/E/4J/8YWIMY05OJ2Y1DGK8PMKP0.uasset | 3 +++ .../Levels/DoorTestLevel/E/9K/3VARP3QP75N20DNN7UCY86.uasset | 3 +++ .../Levels/DoorTestLevel/E/DC/MV1KASGAB1O6WEFICJIPN3.uasset | 3 +++ .../Levels/DoorTestLevel/E/J1/GHMWJIB7O177BVZVJGIADO.uasset | 3 +++ .../Levels/DoorTestLevel/E/MS/IVTTQ7BCZ82SOA73GZNC3Z.uasset | 3 +++ .../Levels/DoorTestLevel/E/PI/XVBLOUEI4OEU8BKXJ6AKQ5.uasset | 3 +++ .../Levels/DoorTestLevel/E/R3/OBL1FU3EXXCNB1RER3X16N.uasset | 3 +++ .../Levels/DoorTestLevel/E/V4/CTAGEMSM2Z0POE6BN30CCF.uasset | 3 +++ .../Levels/DoorTestLevel/0/0Z/Z7DEW00KA4KF5ITDUIVS79.uasset | 3 +++ .../Levels/DoorTestLevel/0/7J/Q25T94TVL9BUY1YH1XYR6X.uasset | 3 +++ .../Levels/DoorTestLevel/0/UA/HVLR0V19GQM275A51F502K.uasset | 3 +++ .../Levels/DoorTestLevel/3/CT/UF0LCI1CWZSB1MSEK78M7D.uasset | 3 +++ .../Levels/DoorTestLevel/5/S4/PQDA2B67LDSL1APAO5A4H2.uasset | 3 +++ .../Levels/DoorTestLevel/6/89/JEZRXH0R0VUHPVHL3U1KXO.uasset | 3 +++ .../Levels/DoorTestLevel/C/FN/21BE62UZKOXF2RQ964FW2M.uasset | 3 +++ .../Levels/DoorTestLevel/C/ZV/P658RJB92RLN548HKN82XA.uasset | 3 +++ 72 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 EndlessVendetta/Content/Levels/DoorTestLevel.umap create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/41/3FZYKAJO60E8F4WVT8FV88.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/9Q/HY8HJRQIKTVOF3OHX80G7R.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/FO/HZW6GENZ4ORQO32631F0NM.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/QL/Q19K1NBEG07WR9W65AY9D3.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/TK/733U54K7KZMUP4ETP0ISSO.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/UA/I2LCWFRMQSUPVR801L9OCF.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/68/WB21XHTYJYO4O9RIZ55LNU.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/86/2G0VVLAV19SLSWJ4KQ4NHI.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/GX/7KM4BQ68V5XZ7CLTNOGM9L.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/H3/OM1G439X65VZCEFTI9OEHP.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/MS/733DH0ELXQT8G5L1XOMMA4.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/ZZ/E5QNRIOCH1LB7TO3X7A10I.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/8O/4NGU86V83TDFZ9PR4JFLKS.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/QN/3YUXM3TARBR8EMM9RBE1UN.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/VI/1GV0CM91M7ZLMDNBGA0CFL.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/YK/B2392CL9CGCIC5QBAUAS7A.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/94/QOZIO4M7R3C35BN159S088.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/WH/YF1JMCP85KDQ5DDMSIOLP7.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/5D/XN72HGN7LXFVTIJUV7K0ZE.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/A1/KNXMGC8O8536H90M97PMJQ.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/LW/HVQ3CV59MZD3N4KI9MTZWC.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/7I/5TADMXBKY6NUNEKHGSTX6B.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/86/PG1MR3CJ778U2GAWR6H2H7.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/R7/4NH9MSWXUQWD5FGKP5F5P2.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/SE/38C003G8A2H9SHFN2J70NE.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/EN/L5SY2ZN2G43LU47ZPXJBIN.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/NN/MCFQLOBSBH3CTKZVGBRLNE.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/PN/34KINR4833RXERMT00775M.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/VK/UFDDP1CDKKS3FA1TVOUSDQ.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/F4/U86JU0TBAGRXGL6I4ZNJT8.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/HJ/4X8V7XC1GD63O280W63IES.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/LN/BRA0AO6W6V6X09OD73FHHZ.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/M4/1IP5JBA78O4C0ENI05WH14.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/OH/ODUV9002HNF6YWQD6POVGZ.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PK/PDUZP4QDZC13GXE96TD60O.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/EC/HT2V27XFCNQFZ5PM314D76.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/HQ/QJBYLDM8XHJ6CSH2AEWFR7.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/32/UTTYU5FIUXFYRU3CTFHFTJ.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/AH/JVO30XDUQQ1X58C4F89MDD.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/PY/NKQOBV4YL74I23R81XKXIS.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VG/5W9ZC19AUZGP1VF6T80SEM.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VI/JW7M6CJ361UGJ2KK9FFY5I.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/ZB/EYUVKNCPV5ZP9BIUQ8MUIT.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/3C/X3EYHY4TH4GZLREPOCGFN8.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/GM/RJFJNWQJGMD7Z14FHJ6FZE.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/JC/62NU1O0LRZQNCFM83HQSZ3.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/PR/91ACGEGQ3TUY2GM83T1LA0.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/YX/SPJPI8FJ3MP1KJD8CNACRN.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/8A/KB30TN5PQU5G14UF1W1K0Q.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/CZ/9VP49T6R7HWSMKHUQP850K.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/PF/UG8E8S5E7CQ0GZ1ZSUDDJ1.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/S5/BJZX2JLRNPQS3EVUH2DCYW.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/4J/8YWIMY05OJ2Y1DGK8PMKP0.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/9K/3VARP3QP75N20DNN7UCY86.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/DC/MV1KASGAB1O6WEFICJIPN3.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/J1/GHMWJIB7O177BVZVJGIADO.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/MS/IVTTQ7BCZ82SOA73GZNC3Z.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/PI/XVBLOUEI4OEU8BKXJ6AKQ5.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/R3/OBL1FU3EXXCNB1RER3X16N.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/V4/CTAGEMSM2Z0POE6BN30CCF.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/0Z/Z7DEW00KA4KF5ITDUIVS79.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/7J/Q25T94TVL9BUY1YH1XYR6X.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/UA/HVLR0V19GQM275A51F502K.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/3/CT/UF0LCI1CWZSB1MSEK78M7D.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/5/S4/PQDA2B67LDSL1APAO5A4H2.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/6/89/JEZRXH0R0VUHPVHL3U1KXO.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/FN/21BE62UZKOXF2RQ964FW2M.uasset create mode 100644 EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/ZV/P658RJB92RLN548HKN82XA.uasset diff --git a/EndlessVendetta/Content/Levels/DoorTestLevel.umap b/EndlessVendetta/Content/Levels/DoorTestLevel.umap new file mode 100644 index 00000000..4421c400 --- /dev/null +++ b/EndlessVendetta/Content/Levels/DoorTestLevel.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2943d11286f0fe5199956829c50f4c143255de490d6854d443df6956b6aaed9 +size 19237 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 6ac09198..9e791280 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:f634452f028c77c71b9d61b2d0ac3caf78a37970f4b34476380c93954a49d110 +oid sha256:700ed88e0d0d5ea5f66e69543fa858c40822e833a6c147ec16a86a435194ad43 size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index 6719d427..eafee70c 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41bfb48c7a239c34eb153525ca3d75153a3ece4f998ce436719ee09cf78517d2 -size 31309 +oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 +size 31142 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2ba242c0..2e926194 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7490d679035d0f517908112f047e9db2dd7243b56f40d6957089d95d49c912ba -size 20635 +oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 +size 20495 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/41/3FZYKAJO60E8F4WVT8FV88.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/41/3FZYKAJO60E8F4WVT8FV88.uasset new file mode 100644 index 00000000..d3a29f6e --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/41/3FZYKAJO60E8F4WVT8FV88.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38db77ace56f5c01580258f8b8034c21886130b0059ea7526c995d1a32a0d6f2 +size 4665 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/9Q/HY8HJRQIKTVOF3OHX80G7R.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/9Q/HY8HJRQIKTVOF3OHX80G7R.uasset new file mode 100644 index 00000000..c4206f15 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/9Q/HY8HJRQIKTVOF3OHX80G7R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3d49d3acf5ddbb4faf58032356b1caa6350999a97b54820828cc043e7a7a115 +size 5226 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/FO/HZW6GENZ4ORQO32631F0NM.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/FO/HZW6GENZ4ORQO32631F0NM.uasset new file mode 100644 index 00000000..6fd2130a --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/FO/HZW6GENZ4ORQO32631F0NM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4db011426e24e59c7995c8f96ab0e2f12c78ac8588f50b038bfa633d1c06a3f2 +size 4702 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/QL/Q19K1NBEG07WR9W65AY9D3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/QL/Q19K1NBEG07WR9W65AY9D3.uasset new file mode 100644 index 00000000..872200a4 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/QL/Q19K1NBEG07WR9W65AY9D3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47d30708c7f5a1fd7a4cd5c4355baec9a7a0b2af51668b8a77d8cee7a0a86c93 +size 4725 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/TK/733U54K7KZMUP4ETP0ISSO.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/TK/733U54K7KZMUP4ETP0ISSO.uasset new file mode 100644 index 00000000..b3cf5a1e --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/TK/733U54K7KZMUP4ETP0ISSO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea323755e936b41d7fa1262dc5e1887c163302dd9c7a209523b18e91b893ff4 +size 3609 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/UA/I2LCWFRMQSUPVR801L9OCF.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/UA/I2LCWFRMQSUPVR801L9OCF.uasset new file mode 100644 index 00000000..59b71e1f --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/UA/I2LCWFRMQSUPVR801L9OCF.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50a3c9e48067804ba1916788ea0889a87e34d43223befd0f902726e96005466a +size 4665 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/68/WB21XHTYJYO4O9RIZ55LNU.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/68/WB21XHTYJYO4O9RIZ55LNU.uasset new file mode 100644 index 00000000..bea37f68 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/68/WB21XHTYJYO4O9RIZ55LNU.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b6c572a333f56df512aa18a8ec72d9f92b856472dbf920f34bd0f8d6363bfb1 +size 4725 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/86/2G0VVLAV19SLSWJ4KQ4NHI.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/86/2G0VVLAV19SLSWJ4KQ4NHI.uasset new file mode 100644 index 00000000..f0cc0f43 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/86/2G0VVLAV19SLSWJ4KQ4NHI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44cacec8a7e338104b79d871c750463c0f5ac2bda79520a62a68f4ba541cd3c1 +size 4727 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/GX/7KM4BQ68V5XZ7CLTNOGM9L.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/GX/7KM4BQ68V5XZ7CLTNOGM9L.uasset new file mode 100644 index 00000000..69b7f168 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/GX/7KM4BQ68V5XZ7CLTNOGM9L.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9b58ace4a03fcaa34cbd5d515b3d5cff52b7266ec53f9c9ba0b8025e27c105c +size 4727 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/H3/OM1G439X65VZCEFTI9OEHP.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/H3/OM1G439X65VZCEFTI9OEHP.uasset new file mode 100644 index 00000000..75bfff20 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/H3/OM1G439X65VZCEFTI9OEHP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b8a895e140505f47a4c0199070bb2486f971a03f058a3f0f333c43c3b0a34e6 +size 3971 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/MS/733DH0ELXQT8G5L1XOMMA4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/MS/733DH0ELXQT8G5L1XOMMA4.uasset new file mode 100644 index 00000000..421875c3 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/MS/733DH0ELXQT8G5L1XOMMA4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81d542d74ea6449b399a360108b6b2de5d7642fcfe4d5d5a0067f187783aed21 +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/ZZ/E5QNRIOCH1LB7TO3X7A10I.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/ZZ/E5QNRIOCH1LB7TO3X7A10I.uasset new file mode 100644 index 00000000..cf9df666 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/ZZ/E5QNRIOCH1LB7TO3X7A10I.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66b246dd28d41029f8670284e88aa47fa859da1b3f7f8fdb15fa3c24937889cb +size 27133 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/8O/4NGU86V83TDFZ9PR4JFLKS.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/8O/4NGU86V83TDFZ9PR4JFLKS.uasset new file mode 100644 index 00000000..5617378d --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/8O/4NGU86V83TDFZ9PR4JFLKS.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a631bf9bc3529a0286870dd7616e8fe6fee0512f9f0618893f6dd03408982a2c +size 4667 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/QN/3YUXM3TARBR8EMM9RBE1UN.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/QN/3YUXM3TARBR8EMM9RBE1UN.uasset new file mode 100644 index 00000000..469f0b3b --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/QN/3YUXM3TARBR8EMM9RBE1UN.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f432cac4f1ad40d062e8e4f3ca9612228103c472914c5ddace63c1c18a69859b +size 4799 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/VI/1GV0CM91M7ZLMDNBGA0CFL.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/VI/1GV0CM91M7ZLMDNBGA0CFL.uasset new file mode 100644 index 00000000..e73cbcf2 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/VI/1GV0CM91M7ZLMDNBGA0CFL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0652c687a45ddfadd8d236abcfcd5aebd0d913ea22a18ae853ed5c1f61b0f17 +size 2454 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/YK/B2392CL9CGCIC5QBAUAS7A.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/YK/B2392CL9CGCIC5QBAUAS7A.uasset new file mode 100644 index 00000000..5449a565 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/YK/B2392CL9CGCIC5QBAUAS7A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34625313e95f3edc431ce5cdd33227818d58b59ea45ba0735275e49c3f6dd517 +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/94/QOZIO4M7R3C35BN159S088.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/94/QOZIO4M7R3C35BN159S088.uasset new file mode 100644 index 00000000..34d278fc --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/94/QOZIO4M7R3C35BN159S088.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb46f4c96106ee544a181dc896c34b5cb972276d5c0300f31afdc46ce43f6032 +size 10411 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/WH/YF1JMCP85KDQ5DDMSIOLP7.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/WH/YF1JMCP85KDQ5DDMSIOLP7.uasset new file mode 100644 index 00000000..3550f949 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/4/WH/YF1JMCP85KDQ5DDMSIOLP7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b46510273da29d69e41016a56cff68a92f5dfa5b92013c4600638392faa6ba +size 4702 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/5D/XN72HGN7LXFVTIJUV7K0ZE.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/5D/XN72HGN7LXFVTIJUV7K0ZE.uasset new file mode 100644 index 00000000..847a06c0 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/5D/XN72HGN7LXFVTIJUV7K0ZE.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:891589f4ea96925ee8ac1ace7feb40b0709855fd69b9bc98787075f9feff2dad +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/A1/KNXMGC8O8536H90M97PMJQ.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/A1/KNXMGC8O8536H90M97PMJQ.uasset new file mode 100644 index 00000000..94e189bd --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/A1/KNXMGC8O8536H90M97PMJQ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99f979dddff65324728e1e35031375addbc64c75961ecd54fb935180c65853ae +size 4662 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/LW/HVQ3CV59MZD3N4KI9MTZWC.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/LW/HVQ3CV59MZD3N4KI9MTZWC.uasset new file mode 100644 index 00000000..8970e656 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/6/LW/HVQ3CV59MZD3N4KI9MTZWC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7b742df088f74781947b9f94d26555e360908df2289baf6ede2d6de560c1ff7 +size 4799 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/7I/5TADMXBKY6NUNEKHGSTX6B.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/7I/5TADMXBKY6NUNEKHGSTX6B.uasset new file mode 100644 index 00000000..206b8215 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/7I/5TADMXBKY6NUNEKHGSTX6B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe08d4a6429660cf7e3d73bee8fece1110fe843e73cdad2dbb3e7d10def2c006 +size 4550 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/86/PG1MR3CJ778U2GAWR6H2H7.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/86/PG1MR3CJ778U2GAWR6H2H7.uasset new file mode 100644 index 00000000..45f677a6 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/86/PG1MR3CJ778U2GAWR6H2H7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc0935b6775a2b661c5d5587e7fc1d46da5d023427c8022c70aa113f67c296c9 +size 12458 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/R7/4NH9MSWXUQWD5FGKP5F5P2.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/R7/4NH9MSWXUQWD5FGKP5F5P2.uasset new file mode 100644 index 00000000..f03a9194 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/R7/4NH9MSWXUQWD5FGKP5F5P2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ced87aaf5de84e02d2cb8be38610bfd580d1d964b51126badfb41a79045df10 +size 2406 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/SE/38C003G8A2H9SHFN2J70NE.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/SE/38C003G8A2H9SHFN2J70NE.uasset new file mode 100644 index 00000000..2439a600 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/7/SE/38C003G8A2H9SHFN2J70NE.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7529fd7d773357be2640538f765a4c78abc2147e878ef13feb62fd317906dd3b +size 4553 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/EN/L5SY2ZN2G43LU47ZPXJBIN.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/EN/L5SY2ZN2G43LU47ZPXJBIN.uasset new file mode 100644 index 00000000..86be83f2 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/EN/L5SY2ZN2G43LU47ZPXJBIN.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69d0b62d57c106db401950e730b2d2b1651ff57b2496628db0f62692f2210978 +size 4667 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/NN/MCFQLOBSBH3CTKZVGBRLNE.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/NN/MCFQLOBSBH3CTKZVGBRLNE.uasset new file mode 100644 index 00000000..a10c8057 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/NN/MCFQLOBSBH3CTKZVGBRLNE.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84b617f5403baa86fa0191bc0b2a4270be088072a7e71c44160011d4803e472e +size 4551 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/PN/34KINR4833RXERMT00775M.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/PN/34KINR4833RXERMT00775M.uasset new file mode 100644 index 00000000..bcd12c8b --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/PN/34KINR4833RXERMT00775M.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8ed411683ed71a9cee6fce50a84426a09a5c1731f21408d6e1814d4815a6daf +size 4450 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/VK/UFDDP1CDKKS3FA1TVOUSDQ.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/VK/UFDDP1CDKKS3FA1TVOUSDQ.uasset new file mode 100644 index 00000000..b9ee3f93 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/8/VK/UFDDP1CDKKS3FA1TVOUSDQ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ee786d03d74661bcdb7afc75e7139022b32a063dcc95fadbcd07601545fbab5 +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/F4/U86JU0TBAGRXGL6I4ZNJT8.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/F4/U86JU0TBAGRXGL6I4ZNJT8.uasset new file mode 100644 index 00000000..23f50a5d --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/F4/U86JU0TBAGRXGL6I4ZNJT8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0facf59ff5194848c5da1e613851e597d4cc8d1f787d84b7fd690bbbd20584c +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/HJ/4X8V7XC1GD63O280W63IES.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/HJ/4X8V7XC1GD63O280W63IES.uasset new file mode 100644 index 00000000..d5a85b62 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/HJ/4X8V7XC1GD63O280W63IES.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36b850e78b0a4d777fba81c402241ea5c26fa6184cbb0bfad1399a215bc58ccf +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/LN/BRA0AO6W6V6X09OD73FHHZ.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/LN/BRA0AO6W6V6X09OD73FHHZ.uasset new file mode 100644 index 00000000..3382fe26 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/LN/BRA0AO6W6V6X09OD73FHHZ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a26bf5326220e5e62c28daa382ac0036ef68774276527b49eab8bd1fdbbe2a60 +size 4727 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/M4/1IP5JBA78O4C0ENI05WH14.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/M4/1IP5JBA78O4C0ENI05WH14.uasset new file mode 100644 index 00000000..3f5fc0bf --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/M4/1IP5JBA78O4C0ENI05WH14.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aa8ed4ccc49ddd1ed06b91d4f0b664d2d24d33a6a1f1e895081aa71b3759abd +size 4548 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/OH/ODUV9002HNF6YWQD6POVGZ.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/OH/ODUV9002HNF6YWQD6POVGZ.uasset new file mode 100644 index 00000000..9000e49c --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/OH/ODUV9002HNF6YWQD6POVGZ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:498673e9cf4114d417c76aa7d8b0b1a90df895daf2a6292a00f01f9ea8954cac +size 3589 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PK/PDUZP4QDZC13GXE96TD60O.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PK/PDUZP4QDZC13GXE96TD60O.uasset new file mode 100644 index 00000000..bcebb8e1 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PK/PDUZP4QDZC13GXE96TD60O.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5130056b78d4fd7c384e151576850523f9b32ca935765e357f533048e9ef8545 +size 4438 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/EC/HT2V27XFCNQFZ5PM314D76.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/EC/HT2V27XFCNQFZ5PM314D76.uasset new file mode 100644 index 00000000..e8bef7d8 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/EC/HT2V27XFCNQFZ5PM314D76.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b562a4d975773add3ed3c3def963495c53fba99bc7758d8df98859970e763a7 +size 4725 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/HQ/QJBYLDM8XHJ6CSH2AEWFR7.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/HQ/QJBYLDM8XHJ6CSH2AEWFR7.uasset new file mode 100644 index 00000000..db1e2972 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/A/HQ/QJBYLDM8XHJ6CSH2AEWFR7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a46f6946f1cf45379ee681b80a2870c1459c3a9017ae51d1fed598c736562a +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/32/UTTYU5FIUXFYRU3CTFHFTJ.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/32/UTTYU5FIUXFYRU3CTFHFTJ.uasset new file mode 100644 index 00000000..5807e072 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/32/UTTYU5FIUXFYRU3CTFHFTJ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e568581ed0480c2b5c6a39e0940253313c06f2839866bf83ea72fe300d6538c +size 4725 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/AH/JVO30XDUQQ1X58C4F89MDD.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/AH/JVO30XDUQQ1X58C4F89MDD.uasset new file mode 100644 index 00000000..bb7bef5c --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/AH/JVO30XDUQQ1X58C4F89MDD.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:848570b90e937270488afadef90e98ba576d7d3998ad7e74b53a929ff3949b2f +size 4605 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/PY/NKQOBV4YL74I23R81XKXIS.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/PY/NKQOBV4YL74I23R81XKXIS.uasset new file mode 100644 index 00000000..06a7d937 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/PY/NKQOBV4YL74I23R81XKXIS.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5101ee0b29f53cbe917a7f4fbf9d52db53df4dbf01e2d788c1ac192318fd5775 +size 4727 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VG/5W9ZC19AUZGP1VF6T80SEM.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VG/5W9ZC19AUZGP1VF6T80SEM.uasset new file mode 100644 index 00000000..781dae24 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VG/5W9ZC19AUZGP1VF6T80SEM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feadc648efb6d13a2bb423642f05806eeae75f4199612fd6d9acc833a7da47db +size 4546 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VI/JW7M6CJ361UGJ2KK9FFY5I.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VI/JW7M6CJ361UGJ2KK9FFY5I.uasset new file mode 100644 index 00000000..6e93d584 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/VI/JW7M6CJ361UGJ2KK9FFY5I.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a622f65f897eb7d975c5639a4e0514272dd91808e66941a7d0ab9c78a38b620a +size 4667 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/ZB/EYUVKNCPV5ZP9BIUQ8MUIT.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/ZB/EYUVKNCPV5ZP9BIUQ8MUIT.uasset new file mode 100644 index 00000000..5c1d34b6 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/B/ZB/EYUVKNCPV5ZP9BIUQ8MUIT.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f991a8ae42c092c8205225dfd6a14ee8d6370b1989be66700d61d2d5006a3f8 +size 4664 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/3C/X3EYHY4TH4GZLREPOCGFN8.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/3C/X3EYHY4TH4GZLREPOCGFN8.uasset new file mode 100644 index 00000000..e48cb8fa --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/3C/X3EYHY4TH4GZLREPOCGFN8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91aaf8c024ac294ae826c0f97a7421eac778fa36d7b3264817b8831a41129ac2 +size 4613 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/GM/RJFJNWQJGMD7Z14FHJ6FZE.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/GM/RJFJNWQJGMD7Z14FHJ6FZE.uasset new file mode 100644 index 00000000..80da5f41 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/GM/RJFJNWQJGMD7Z14FHJ6FZE.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aada53bea78e9c4d08bc9301b4e9d38b6634c0a683d220aedd36116d14f66d33 +size 4799 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/JC/62NU1O0LRZQNCFM83HQSZ3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/JC/62NU1O0LRZQNCFM83HQSZ3.uasset new file mode 100644 index 00000000..d2ffe24d --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/JC/62NU1O0LRZQNCFM83HQSZ3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea0932e4470d9e6e627e00f77ee75162b4d513aa3065998f33c2bbe09b240aed +size 3818 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/PR/91ACGEGQ3TUY2GM83T1LA0.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/PR/91ACGEGQ3TUY2GM83T1LA0.uasset new file mode 100644 index 00000000..42a6b57c --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/PR/91ACGEGQ3TUY2GM83T1LA0.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d49cf5c14fa52de710cd291ac4e8d983dc6ef3af0f6daded8ead10bcc4d7b53f +size 4662 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/YX/SPJPI8FJ3MP1KJD8CNACRN.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/YX/SPJPI8FJ3MP1KJD8CNACRN.uasset new file mode 100644 index 00000000..9cf1c894 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/C/YX/SPJPI8FJ3MP1KJD8CNACRN.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02999e2bcc65d8aca7bec4822d5754c719940560f5e60d95d16c5f907d7e5661 +size 4665 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/8A/KB30TN5PQU5G14UF1W1K0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/8A/KB30TN5PQU5G14UF1W1K0Q.uasset new file mode 100644 index 00000000..9f241dc0 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/8A/KB30TN5PQU5G14UF1W1K0Q.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bf8643aeedcc92cf3d18e2664b5511b1fea63ac6dd4b4bf1f556217de2c0196 +size 4550 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/CZ/9VP49T6R7HWSMKHUQP850K.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/CZ/9VP49T6R7HWSMKHUQP850K.uasset new file mode 100644 index 00000000..6dfae344 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/CZ/9VP49T6R7HWSMKHUQP850K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92196b26ed2f29f5c3d4ba1a4195bb882bfd0a2ed1ffa506691208a0a1fe66c6 +size 4832 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/PF/UG8E8S5E7CQ0GZ1ZSUDDJ1.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/PF/UG8E8S5E7CQ0GZ1ZSUDDJ1.uasset new file mode 100644 index 00000000..0c52954a --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/PF/UG8E8S5E7CQ0GZ1ZSUDDJ1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f58a2ea3ca628463c9a72a20d327621b162971fc5c4c9b201b09e607d562f51 +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/S5/BJZX2JLRNPQS3EVUH2DCYW.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/S5/BJZX2JLRNPQS3EVUH2DCYW.uasset new file mode 100644 index 00000000..9ab917bf --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/S5/BJZX2JLRNPQS3EVUH2DCYW.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b019615e004bc5b01d17ce14951d84e897b6b8bce103a169f3f034a182e6b892 +size 4553 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/4J/8YWIMY05OJ2Y1DGK8PMKP0.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/4J/8YWIMY05OJ2Y1DGK8PMKP0.uasset new file mode 100644 index 00000000..8080ba75 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/4J/8YWIMY05OJ2Y1DGK8PMKP0.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d1b35a06653dfe74624b238150ae521defe33d71658757ece87a29a80b0a4cd +size 4553 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/9K/3VARP3QP75N20DNN7UCY86.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/9K/3VARP3QP75N20DNN7UCY86.uasset new file mode 100644 index 00000000..13c5a859 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/9K/3VARP3QP75N20DNN7UCY86.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e17922e625c0aa470e5d6cadf032f23d373f2c262878fcb837dfdfd7c87306de +size 3603 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/DC/MV1KASGAB1O6WEFICJIPN3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/DC/MV1KASGAB1O6WEFICJIPN3.uasset new file mode 100644 index 00000000..25f81707 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/DC/MV1KASGAB1O6WEFICJIPN3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e72ef673bc6abc5b57d932e1791439a298f21a6539aefb7e293e2bff760afc0 +size 4667 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/J1/GHMWJIB7O177BVZVJGIADO.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/J1/GHMWJIB7O177BVZVJGIADO.uasset new file mode 100644 index 00000000..04ca4243 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/J1/GHMWJIB7O177BVZVJGIADO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fde283028c1f312f8925e7a892c0eab4be9d8afe2f1594d3f994e9b5a47d96c +size 4725 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/MS/IVTTQ7BCZ82SOA73GZNC3Z.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/MS/IVTTQ7BCZ82SOA73GZNC3Z.uasset new file mode 100644 index 00000000..7d222dc5 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/MS/IVTTQ7BCZ82SOA73GZNC3Z.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdc9b3b5e2671a2c319dfdac5984297f4643be85a571fbd9bf03fd8e1fa6e639 +size 4798 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/PI/XVBLOUEI4OEU8BKXJ6AKQ5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/PI/XVBLOUEI4OEU8BKXJ6AKQ5.uasset new file mode 100644 index 00000000..3af822fb --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/PI/XVBLOUEI4OEU8BKXJ6AKQ5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7456785a2ec032c8b3b1c5fbb2a6ca673248479c03aa90181f6cb8030bf5e07 +size 4725 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/R3/OBL1FU3EXXCNB1RER3X16N.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/R3/OBL1FU3EXXCNB1RER3X16N.uasset new file mode 100644 index 00000000..ce371a08 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/R3/OBL1FU3EXXCNB1RER3X16N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93ebf5660c1830f0750d7680824ccddd147414a14b7843645610cfd35f377bf0 +size 4704 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/V4/CTAGEMSM2Z0POE6BN30CCF.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/V4/CTAGEMSM2Z0POE6BN30CCF.uasset new file mode 100644 index 00000000..95dab768 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/V4/CTAGEMSM2Z0POE6BN30CCF.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f65f96705aa09a7b7dbbb917fd5cd8363904f7a485d205a956dd7ca566245806 +size 4695 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/0Z/Z7DEW00KA4KF5ITDUIVS79.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/0Z/Z7DEW00KA4KF5ITDUIVS79.uasset new file mode 100644 index 00000000..35d96ee8 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/0Z/Z7DEW00KA4KF5ITDUIVS79.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c14590a5ecf379724ee5037e236bd92a5bb2cca894b6a5925255bbdd909f34f4 +size 2204 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/7J/Q25T94TVL9BUY1YH1XYR6X.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/7J/Q25T94TVL9BUY1YH1XYR6X.uasset new file mode 100644 index 00000000..de2f8893 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/7J/Q25T94TVL9BUY1YH1XYR6X.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7b02313291eb3bfa85c92e53fa90e277e5e1823d74cad1e325eae0ab3bf29fe +size 2202 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/UA/HVLR0V19GQM275A51F502K.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/UA/HVLR0V19GQM275A51F502K.uasset new file mode 100644 index 00000000..4ea0a575 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/0/UA/HVLR0V19GQM275A51F502K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba6afab4cc59d9f1929494ac04040c26d8c7709629999693ad378fec1d7d30cd +size 2208 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/3/CT/UF0LCI1CWZSB1MSEK78M7D.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/3/CT/UF0LCI1CWZSB1MSEK78M7D.uasset new file mode 100644 index 00000000..e8f87080 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/3/CT/UF0LCI1CWZSB1MSEK78M7D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2c3e7507f7a926858d8c7b9453f5da770745945aa7840ca5e78864db628c462 +size 2202 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/5/S4/PQDA2B67LDSL1APAO5A4H2.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/5/S4/PQDA2B67LDSL1APAO5A4H2.uasset new file mode 100644 index 00000000..a5f5203a --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/5/S4/PQDA2B67LDSL1APAO5A4H2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e914bb2bffcfac5423f48d69c41988f2960c3da875ca46058979a74bfd3cf943 +size 2202 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/6/89/JEZRXH0R0VUHPVHL3U1KXO.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/6/89/JEZRXH0R0VUHPVHL3U1KXO.uasset new file mode 100644 index 00000000..427187ee --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/6/89/JEZRXH0R0VUHPVHL3U1KXO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b07d41739741c4c1ca6655620ec2680d35d9c121c83bc049edbbdb3855e74458 +size 2216 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/FN/21BE62UZKOXF2RQ964FW2M.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/FN/21BE62UZKOXF2RQ964FW2M.uasset new file mode 100644 index 00000000..fcdc7009 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/FN/21BE62UZKOXF2RQ964FW2M.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:819b82e21ccbcf8b6c4e23a4d67bd39e6f4c9801303426ba1faba1ab3542ee72 +size 2204 diff --git a/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/ZV/P658RJB92RLN548HKN82XA.uasset b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/ZV/P658RJB92RLN548HKN82XA.uasset new file mode 100644 index 00000000..d65387d8 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalObjects__/Levels/DoorTestLevel/C/ZV/P658RJB92RLN548HKN82XA.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68ca8ee53211c31c6083728ccdd7632214e8140caccfebb68ae033808d0381e3 +size 2202 From 0cf77cbcde20d8aa70de7e1e277cc9270b72f6b7 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Nov 2023 14:30:33 +0000 Subject: [PATCH 07/44] Got rid of old Logs in BaseWeapon --- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index f743b5ef..deb98237 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -241,7 +241,6 @@ void ABaseWeaponClass::WeaponReload() void ABaseWeaponClass::Interact() { if(!IsValid(this)) return; - GLog->Log("Interact Called"); endlessVendettaChar->WeaponSwitcher(this); } From 59f813050d5353e2564f862a35162a041a265d87 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Nov 2023 14:31:19 +0000 Subject: [PATCH 08/44] Added Base Door Functionality --- .../Source/EndlessVendetta/DoorClass.cpp | 40 +++++++++++++++++++ .../Source/EndlessVendetta/DoorClass.h | 36 +++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/DoorClass.h diff --git a/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp b/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp new file mode 100644 index 00000000..5f69bf2a --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp @@ -0,0 +1,40 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "DoorClass.h" + +// Sets default values +ADoorClass::ADoorClass() +{ + // 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; + +} + +// Called when the game starts or when spawned +void ADoorClass::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void ADoorClass::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + +} + +void ADoorClass::Interact() +{ + if (!IsValid(this)) return; + GLog->Log("Door has been interacted"); +} + +void ADoorClass::InteractPrompt() +{ + DoorPrompt(); +} + + + diff --git a/EndlessVendetta/Source/EndlessVendetta/DoorClass.h b/EndlessVendetta/Source/EndlessVendetta/DoorClass.h new file mode 100644 index 00000000..8d321772 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/DoorClass.h @@ -0,0 +1,36 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "EndlessVendetta/InteractionInterface.h" +#include "DoorClass.generated.h" + +class AEndlessVendettaCharacter; + +UCLASS() +class ENDLESSVENDETTA_API ADoorClass : public AActor, public IInteractionInterface +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + ADoorClass(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + + void Interact() override; + + void InteractPrompt() override; + + UFUNCTION(BlueprintImplementableEvent) + void DoorPrompt(); + +}; From 83beb696f268f7960224eb8d8e79377a02d41e87 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Nov 2023 14:31:47 +0000 Subject: [PATCH 09/44] Added Door Interact UI with FadeIns --- .../Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- .../Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset | 3 +++ .../FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index dde4061d..2e99cff0 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ead2d32698cc8f6f60af3405fa3b9f5f1452791c2c759e631744a26cebf6749e -size 185820 +oid sha256:91ac6fb94624f653a7486d1307aaf136e4a1a81559c15e167eb887e3f8cb5f9a +size 191860 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset new file mode 100644 index 00000000..47e35fc6 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:185519beac036cd87f1e6c3eca083f0f4e369c2370400598ad8547cda299b5c8 +size 42979 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset new file mode 100644 index 00000000..7dc4b401 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5df8144e689a0c6abffa1f71e8bcbb707cd668b26db1c4a663ce50ee116b26b +size 82712 From bbcf052b0473d0cea7675c21056df0717ef5c27d Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Nov 2023 14:32:17 +0000 Subject: [PATCH 10/44] Added Basic Door to Level --- .../Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset new file mode 100644 index 00000000..28e25423 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72dff7deac9313b375261db497609576184aff35f38e491dcc72a3d264d0d5a4 +size 5148 From 14c1874c53da03bb557b962c26303de5f42c5a62 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 20 Nov 2023 14:58:09 +0000 Subject: [PATCH 11/44] Added Cutout to doorwall to test door opening --- .../FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset | 4 ++-- .../Levels/_GENERATED/mh261677/Trim_1B41F361.uasset | 3 +++ .../DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset | 3 +++ .../DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset | 3 +++ .../DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset | 3 --- EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp | 10 ++++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 EndlessVendetta/Content/Levels/_GENERATED/mh261677/Trim_1B41F361.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset delete mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset index 47e35fc6..5d28527c 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185519beac036cd87f1e6c3eca083f0f4e369c2370400598ad8547cda299b5c8 -size 42979 +oid sha256:e2f1074b45a94221f63a446c72d393090ed47a8c08ea3f146768e03595937c21 +size 43976 diff --git a/EndlessVendetta/Content/Levels/_GENERATED/mh261677/Trim_1B41F361.uasset b/EndlessVendetta/Content/Levels/_GENERATED/mh261677/Trim_1B41F361.uasset new file mode 100644 index 00000000..0483e812 --- /dev/null +++ b/EndlessVendetta/Content/Levels/_GENERATED/mh261677/Trim_1B41F361.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71ece93182a6eda6c83f57491f7a92ce8a96fc6c552aacfe96b0fe7424041f57 +size 15349 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset new file mode 100644 index 00000000..b43bdf00 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:162297ec59b7e47b42f34b19c64b0cbca86fcf80168764e5047cc45910cfe7da +size 4366 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset new file mode 100644 index 00000000..54648ba0 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc292d8f45c5187522d0333e3854a43a00a1ae233a8eedc97cdfc032f925c0ce +size 5476 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset deleted file mode 100644 index 28e25423..00000000 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/E/XZ/7H1ZSM42VCO2OX3GD3U6CY.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72dff7deac9313b375261db497609576184aff35f38e491dcc72a3d264d0d5a4 -size 5148 diff --git a/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp b/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp index 5f69bf2a..6811b02e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp @@ -29,6 +29,16 @@ void ADoorClass::Interact() { if (!IsValid(this)) return; GLog->Log("Door has been interacted"); + bool bIsDoorOpen = false; + if (!bIsDoorOpen) + { + + bIsDoorOpen = true; + } + else + { + bIsDoorOpen = false; + } } void ADoorClass::InteractPrompt() From 799022433450515806cdfcb25467a27a216b5f69 Mon Sep 17 00:00:00 2001 From: LOUIS HORNE Date: Mon, 20 Nov 2023 15:38:34 +0000 Subject: [PATCH 12/44] Added Kirstians modular kit, started putting it together --- .../Objects/Tutorial-Level/ModularPieces/SM_Doorway.uasset | 3 +++ .../Objects/Tutorial-Level/ModularPieces/SM_Floor.uasset | 3 +++ .../Tutorial-Level/ModularPieces/SM_Floor_Small.uasset | 3 +++ .../Objects/Tutorial-Level/ModularPieces/SM_Pillar_1.uasset | 3 +++ .../Objects/Tutorial-Level/ModularPieces/SM_Pillar_2.uasset | 3 +++ .../Objects/Tutorial-Level/ModularPieces/SM_Wall.uasset | 3 +++ .../Objects/Tutorial-Level/ModularPieces/SM_Wall_Short.uasset | 3 +++ .../Objects/Tutorial-Level/ModularPieces/SM_stairs.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset | 4 ++-- EndlessVendetta/Content/Levels/Training_Put_Together.umap | 3 +++ 10 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Doorway.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor_Small.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_2.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall_Short.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_stairs.uasset create mode 100644 EndlessVendetta/Content/Levels/Training_Put_Together.umap diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Doorway.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Doorway.uasset new file mode 100644 index 00000000..5834f011 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Doorway.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3907faff211de099949e9d8dfb0cf414dd85ad373e34a16d7e8acd7a54359463 +size 18380 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor.uasset new file mode 100644 index 00000000..50ddcc11 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb95010b6c16f43ab9a37563b46aadf6f6adabfcb30f83081eabe81c25f9f95f +size 16802 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor_Small.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor_Small.uasset new file mode 100644 index 00000000..c112c1d9 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Floor_Small.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7991516230809cf84d733a2e0bdf6abcbf1944c5c0d5969e91f8acde70369b8e +size 16776 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_1.uasset new file mode 100644 index 00000000..d8df5ee5 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:346230dd808b2c0613338ca9709ccec48c413d2276d15986b89a01a9c8f2730f +size 16749 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_2.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_2.uasset new file mode 100644 index 00000000..9bcd6ec6 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Pillar_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f96833b1e48a68180dad6a284d71ca273b3934ab53b4f8f097cb1dab973196f +size 21133 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall.uasset new file mode 100644 index 00000000..db4e1bb6 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78687ad41432bc6d5d959a2fc06716045b8a37495131a55afd6ebe328c3e10d6 +size 16764 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall_Short.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall_Short.uasset new file mode 100644 index 00000000..a765ce8e --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_Wall_Short.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:505c136b032d6b35f760733612d0291652019eab67ce3f4a3608c40c69589532 +size 16728 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_stairs.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_stairs.uasset new file mode 100644 index 00000000..777760b6 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ModularPieces/SM_stairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5341ce903979056dcef377e88a5cc893bd5953c4f587b461515fcf4cf54c1a07 +size 20263 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset index 15ffec2e..372c7525 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76986ee4471d33ce4239f900ec8ba81ca2d514c500a19633881965ad5904067a -size 11672 +oid sha256:f0c03bea7638b90df30171066477cf6ea55b8320336f4770b18916b20a6689e2 +size 11875 diff --git a/EndlessVendetta/Content/Levels/Training_Put_Together.umap b/EndlessVendetta/Content/Levels/Training_Put_Together.umap new file mode 100644 index 00000000..eb1a92db --- /dev/null +++ b/EndlessVendetta/Content/Levels/Training_Put_Together.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7baade0471d441750698871fc61d636f566a0fe1af31c07d9922b10ac70271f +size 228862 From 55e160eb80cae613ef5775d58f1ad640831e52a1 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 21 Nov 2023 14:31:33 +0000 Subject: [PATCH 13/44] Finished Door opening mechanic --- .../Blueprints/DoorPrompt/BP_Door.uasset | 4 ++-- .../DoorPrompt/WBP_DoorPrompt.uasset | 4 ++-- .../3/C5/NXF52EAUAGH5ETW1R053H8.uasset | 3 --- .../D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset | 4 ++-- .../Source/EndlessVendetta/DoorClass.cpp | 22 +++++++++++++++---- .../Source/EndlessVendetta/DoorClass.h | 15 +++++++++++++ 6 files changed, 39 insertions(+), 13 deletions(-) delete mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset index 5d28527c..2e39669d 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f1074b45a94221f63a446c72d393090ed47a8c08ea3f146768e03595937c21 -size 43976 +oid sha256:03cc628cc4a9ab85f3fb7754903bb0b4f5cbf3db50b0cb2044f6812aec991c82 +size 71627 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset index 7dc4b401..5608096e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5df8144e689a0c6abffa1f71e8bcbb707cd668b26db1c4a663ce50ee116b26b -size 82712 +oid sha256:dd2cc6201da826cdd7357a5f683f0c9d0638cd2c44ebaab60b6585f1c2659159 +size 81251 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset deleted file mode 100644 index b43bdf00..00000000 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/3/C5/NXF52EAUAGH5ETW1R053H8.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:162297ec59b7e47b42f34b19c64b0cbca86fcf80168764e5047cc45910cfe7da -size 4366 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset index 54648ba0..e0940ef3 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/X5/OKD54JHXNGXNVF4JEBBMVP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc292d8f45c5187522d0333e3854a43a00a1ae233a8eedc97cdfc032f925c0ce -size 5476 +oid sha256:4f37bd6fd21d44596891c4bd6763bd936b1ff98425033925bbed475ee4d2f5b9 +size 7302 diff --git a/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp b/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp index 6811b02e..c1961191 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DoorClass.cpp @@ -3,6 +3,10 @@ #include "DoorClass.h" +#include "EndlessVendettaCharacter.h" +#include "Components/ArrowComponent.h" +#include "Kismet/GameplayStatics.h" + // Sets default values ADoorClass::ADoorClass() { @@ -16,33 +20,43 @@ void ADoorClass::BeginPlay() { Super::BeginPlay(); + // Attempt to find the player character + APlayerController* PlayerController = UGameplayStatics::GetPlayerController(this, 0); + playerInWorld = Cast(PlayerController->GetCharacter()); + + endlessVendettaChar = Cast(playerInWorld); + + for (UActorComponent* actorComp : playerInWorld->GetComponentsByTag(UArrowComponent::StaticClass(), FName("FrontOfDoor"))) + { + FrontOfDoor = Cast(actorComp); + break; + } } // Called every frame void ADoorClass::Tick(float DeltaTime) { Super::Tick(DeltaTime); - } void ADoorClass::Interact() { if (!IsValid(this)) return; - GLog->Log("Door has been interacted"); - bool bIsDoorOpen = false; if (!bIsDoorOpen) { - + DoorOpeningAnim(); bIsDoorOpen = true; } else { + DoorCloseAnim(); bIsDoorOpen = false; } } void ADoorClass::InteractPrompt() { + if(bIsDoorOpen) return; DoorPrompt(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/DoorClass.h b/EndlessVendetta/Source/EndlessVendetta/DoorClass.h index 8d321772..8d5671e5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DoorClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/DoorClass.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "Components/ArrowComponent.h" #include "GameFramework/Actor.h" #include "EndlessVendetta/InteractionInterface.h" #include "DoorClass.generated.h" @@ -21,6 +22,12 @@ public: protected: // Called when the game starts or when spawned virtual void BeginPlay() override; + + ACharacter* playerInWorld; + + AEndlessVendettaCharacter* endlessVendettaChar; + + UArrowComponent* FrontOfDoor; public: // Called every frame @@ -33,4 +40,12 @@ public: UFUNCTION(BlueprintImplementableEvent) void DoorPrompt(); + UFUNCTION(BlueprintImplementableEvent) + void DoorOpeningAnim(); + + UFUNCTION(BlueprintImplementableEvent) + void DoorCloseAnim(); + + bool bIsDoorOpen = false; + }; From a88faa3ef8a3f81d6aba473f336f917d7bd23f1c Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 21 Nov 2023 14:35:54 +0000 Subject: [PATCH 14/44] Changed Weapon Values to their True Values --- .../Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 4 ++-- .../BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset | 4 ++-- .../Blueprints/BaseWeapons/Snipers/BaseSniper.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 72bf5492..895e9e1f 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:a2ca717051fe7d099dca0780b2bc1e2890d890f2c173bbc87fd7f1420814ee3c -size 40675 +oid sha256:987a4e9d5c25f997a75e654527036ae30b5f2657db8317e10a8c5d10c28bfe8e +size 40669 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index fb594b5a..db396f72 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a83920cd356c97e673d767c3d6403b2110837ef3fd8190fd64b51db881c5c671 -size 40139 +oid sha256:a5fdbc6cb67c6ec9d80147c3321ff6ad03bc64b283039537ab274631bec01f74 +size 40173 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset index ea135ca2..4b1c45a0 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:ef2dd94a48adfeef8b55638e66b8b5cc909abcde2d5894fa27599ce72c09145c -size 125780 +oid sha256:6f31b971cc0237138a2bd8e0aa68d0ac68cac907b0a05aa9617c69883a711cd5 +size 125774 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset index 755a57d5..8e445757 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:7b90c849ef1a75f78d3184f90d754ff07234f5680c57c4ca2799b9fe9bac7679 -size 124505 +oid sha256:d4bcd23aa245c0819235be1d2d992930fed4440aabdafba514d6a1f99a418fcb +size 124531 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset index 1a5cd4f9..881c555d 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:bd52fbcb08bd5b44907400090cd7a9a82d5b3374fcb68fb81a8bc4d36cbc9154 -size 124696 +oid sha256:d3335a1091802c5f484bcc99a573e0cbd388e3cbb586147614ede78c274a14fc +size 124510 From 84df2436da92a54b0aef55bd1e8bf2330b7ab836 Mon Sep 17 00:00:00 2001 From: MADELINE SPRUCE Date: Thu, 23 Nov 2023 09:43:38 +0000 Subject: [PATCH 15/44] Added bathroom assets to assets folder --- Assets/Bathroom/Shower_Export.fbx | 3 +++ Assets/Bathroom/Sink_Export.fbx | 3 +++ Assets/Bathroom/Tap_Export.fbx | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 Assets/Bathroom/Shower_Export.fbx create mode 100644 Assets/Bathroom/Sink_Export.fbx create mode 100644 Assets/Bathroom/Tap_Export.fbx diff --git a/Assets/Bathroom/Shower_Export.fbx b/Assets/Bathroom/Shower_Export.fbx new file mode 100644 index 00000000..080af4e7 --- /dev/null +++ b/Assets/Bathroom/Shower_Export.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ced75f4d00b18c33e56aaed43a1b18911c6367c9f1d106827c7fc82b321f147e +size 87904 diff --git a/Assets/Bathroom/Sink_Export.fbx b/Assets/Bathroom/Sink_Export.fbx new file mode 100644 index 00000000..508bda17 --- /dev/null +++ b/Assets/Bathroom/Sink_Export.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:519863d2f09c704b853a3ad7ccc570d4e0d98d2174cac75abc85da24ab56ffae +size 49136 diff --git a/Assets/Bathroom/Tap_Export.fbx b/Assets/Bathroom/Tap_Export.fbx new file mode 100644 index 00000000..65c4831f --- /dev/null +++ b/Assets/Bathroom/Tap_Export.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1c3f1fcdc7a7f674a7b31cad7c030e791b89ec6e39c190ecd9afc338a1d8146 +size 31616 From 39e71ac8f71e39d662cb940ca04b115f4b7474d5 Mon Sep 17 00:00:00 2001 From: MADELINE SPRUCE Date: Thu, 23 Nov 2023 09:47:32 +0000 Subject: [PATCH 16/44] Added mirror to assets folder --- Assets/Bathroom/Mirror.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Assets/Bathroom/Mirror.fbx diff --git a/Assets/Bathroom/Mirror.fbx b/Assets/Bathroom/Mirror.fbx new file mode 100644 index 00000000..296d1b73 --- /dev/null +++ b/Assets/Bathroom/Mirror.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ae7e83189f22856fc1d5530bacb9e371073ad5d42837269567c7b75744fc5dc +size 26144 From db50bd002f1ef2dbae9a77908661aa1aee1b5a9a Mon Sep 17 00:00:00 2001 From: MADELINE SPRUCE Date: Thu, 23 Nov 2023 10:44:38 +0000 Subject: [PATCH 17/44] Put bathroomassets in --- .../Assets/Objects/Tutorial-Level/Bathroom/Button.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset | 3 +++ .../Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset | 3 +++ .../Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/Shower_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/standardSurface5.uasset | 3 +++ EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 2 +- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- 16 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset new file mode 100644 index 00000000..a6aac258 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06c1d10c0ae9c282545d7cb0fa8e3f57c0422bfc013efddd9b862ed6b750cbf1 +size 8079 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset new file mode 100644 index 00000000..e9323d78 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:001039603d515a2275590ca7e9f5c8b5d04f151911df52be5952e524e62a768c +size 23113 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset new file mode 100644 index 00000000..1064ebab --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:015c7e340108697b530b6c765281df940528f55231bc0c9ba6932757830840ef +size 21560 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset new file mode 100644 index 00000000..a3b1dc09 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:905cd7474a033deaf0af950c1bf3f98f15a40f8f0add6b1fac4d054440391bfb +size 23961 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset new file mode 100644 index 00000000..4c78149b --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e144ca56ad2e65433ce9ddf54594b6cafd8fd709848703eb84c4194d281886cc +size 164255 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset new file mode 100644 index 00000000..a2a6b046 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52b1986a1e5fe508ca3c161423d2e991260fa229145719c32596b703020c9410 +size 8074 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset new file mode 100644 index 00000000..8af25233 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21116a8d95beb64c1308b3cdfe44b942b47c7a351442fb1d4ef590f355cdf4f7 +size 95535 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset new file mode 100644 index 00000000..b7285322 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d836513a7bbec906d9f4ce2f8518e2862b74d75fc5bc738b6b495015f935364f +size 51749 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset new file mode 100644 index 00000000..5095cc21 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf58f7020f4d029056da97041cc4d29089edbea2e6dc81e4669aa030df1fafff +size 29568 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset new file mode 100644 index 00000000..64d89846 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3c45925c925cc4bb179a872a2cf157f76117fee5c192a7e3dfe93ff7e4f784 +size 8078 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset new file mode 100644 index 00000000..b0314815 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a3c1c643022c43b138f2a071856fb60c1df1c511c6e6c8862984a7010e002a1 +size 8095 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset new file mode 100644 index 00000000..fe5e845c --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc55b1a8b638c9ccc397b98b396c092a0e084603e68bcd10fb1729379c47852b +size 8146 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 37596dba..8a7ef9a0 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04e19f6714beb76a66600fc3c8ea8e68d8ab2f9102ba687caa263a29e4ea5ae0 -size 637103 +oid sha256:9570ebbe70165da7d1c1cf54047bdb8b6e76905568015ff38ec3eeb5d283b66b +size 652471 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 6ac09198..f8769a53 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:f634452f028c77c71b9d61b2d0ac3caf78a37970f4b34476380c93954a49d110 +oid sha256:eca4bd5afff8d7c21e9999809703964bd6ae24b950bcc8fae3755370d47a4bca size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index 6719d427..eafee70c 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41bfb48c7a239c34eb153525ca3d75153a3ece4f998ce436719ee09cf78517d2 -size 31309 +oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 +size 31142 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2ba242c0..2e926194 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7490d679035d0f517908112f047e9db2dd7243b56f40d6957089d95d49c912ba -size 20635 +oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 +size 20495 From ad2d62dc73fc3f2cd4835215b606f5f023dc048e Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 23 Nov 2023 12:03:15 +0000 Subject: [PATCH 18/44] Added Start Functionality for weapons to inventory --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../EndlessVendettaCharacter.cpp | 2 ++ .../EndlessVendettaCharacter.h | 3 +++ .../Inventory/InventoryComponent.cpp | 22 ++++++++++++++++++- .../Inventory/InventoryComponent.h | 10 +++++++-- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 8e4ecbd1..0fe23856 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:722ad362b974f8cd884e1852c963e27f75f4ed6f285759adbd3c3571b1f477c0 -size 57740 +oid sha256:c3117b45f4b1be99dd1bd0cdd1cb1d167237a1105a9c1ce14bc1c6f15a095551 +size 58414 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 601240df..7ea63865 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -65,6 +65,8 @@ void AEndlessVendettaCharacter::BeginPlay() GadgetManager->SpawnGadgetsOnBeginPlay(Cast(PlayersCamera)); break; } + + InventoryComponent = Cast(GetWorld()->GetFirstPlayerController()->GetComponentByClass(UInventoryComponent::StaticClass())); } void AEndlessVendettaCharacter::Tick(float DeltaTime) diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 106416a8..33a2d04b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -8,6 +8,7 @@ #include "InputActionValue.h" #include "Components/ArrowComponent.h" #include "GadgetSystem/GadgetManager.h" + #include "EndlessVendettaCharacter.generated.h" class UWeaponInventory; @@ -200,4 +201,6 @@ public: // Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used bool UpdateGadgetType(TSubclassOf NewGadgetClass); + + UInventoryComponent* InventoryComponent; }; diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 2d09885f..ff316f09 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -19,7 +19,7 @@ UInventoryComponent::UInventoryComponent() void UInventoryComponent::InitializeComponent() { Super::InitializeComponent(); - PlayerCharacter = Cast(GetOwner()); + PlayerCharacter = GetOwner(); ItemToPickup = nullptr; } @@ -188,6 +188,26 @@ void UInventoryComponent::UpdateInventorySize_Implementation(const int _Columns, InventoryItems.SetNum(Columns * Rows); } +void UInventoryComponent::SetPrimaryWeapon(AActor* const _PrimaryWeapon) +{ + PrimaryWeapon = _PrimaryWeapon; +} + +AActor* UInventoryComponent::GetPrimaryWeapon() const +{ + return PrimaryWeapon; +} + +void UInventoryComponent::SetSecondaryWeapon(AActor* const _SecondaryWeapon) +{ + SecondaryWeapon = _SecondaryWeapon; +} + +AActor* UInventoryComponent::GetSecondaryWeapon() const +{ + return SecondaryWeapon; +} + bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.X < Columns && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index 813a181b..84810c30 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -5,7 +5,6 @@ #include "CoreMinimal.h" #include "Components/ActorComponent.h" #include "InventoryStructs.h" -#include "EndlessVendetta/EndlessVendettaCharacter.h" #include "InventoryComponent.generated.h" @@ -64,14 +63,21 @@ public: void UpdateInventorySize(const int _Columns, const int _Rows); virtual void UpdateInventorySize_Implementation(const int _Columns, const int _Rows); + void SetPrimaryWeapon(AActor* const _PrimaryWeapon); + AActor* GetPrimaryWeapon() const; + void SetSecondaryWeapon(AActor* const _SecondaryWeapon); + AActor* GetSecondaryWeapon() const; + private: bool IsTileValid(const FInventoryTile InventoryTile) const; UPROPERTY() - AEndlessVendettaCharacter* PlayerCharacter; + AActor* PlayerCharacter; UPROPERTY() AActor* ItemToPickup; bool IsDirty = false; UPROPERTY() TArray InventoryItems; + AActor* PrimaryWeapon; + AActor* SecondaryWeapon; }; From f4deb1500fb6942b9ad0bb79147415528d1a298f Mon Sep 17 00:00:00 2001 From: LOUIS HORNE Date: Thu, 23 Nov 2023 12:05:54 +0000 Subject: [PATCH 19/44] Added door. Colour can can be changed in the mat Open the material, change the value from 1 - 3 to change the colour (whole numbers) --- .../Assets/Objects/Tutorial-Level/Bathroom/Button.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset | 3 +++ .../Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset | 3 +++ .../Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/Shower_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/standardSurface5.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset | 3 +++ .../Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset | 3 +++ .../Textures/Doors/Doors_01-04_low_Doors_Normal.uasset | 3 +++ .../Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset | 3 +++ .../Objects/Tutorial-Level/Textures/Doors/M_Door.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset | 3 +++ .../Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 4 ++-- .../BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- 23 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset new file mode 100644 index 00000000..a6aac258 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06c1d10c0ae9c282545d7cb0fa8e3f57c0422bfc013efddd9b862ed6b750cbf1 +size 8079 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset new file mode 100644 index 00000000..e9323d78 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:001039603d515a2275590ca7e9f5c8b5d04f151911df52be5952e524e62a768c +size 23113 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset new file mode 100644 index 00000000..1064ebab --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:015c7e340108697b530b6c765281df940528f55231bc0c9ba6932757830840ef +size 21560 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset new file mode 100644 index 00000000..a3b1dc09 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:905cd7474a033deaf0af950c1bf3f98f15a40f8f0add6b1fac4d054440391bfb +size 23961 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset new file mode 100644 index 00000000..4c78149b --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e144ca56ad2e65433ce9ddf54594b6cafd8fd709848703eb84c4194d281886cc +size 164255 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset new file mode 100644 index 00000000..a2a6b046 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52b1986a1e5fe508ca3c161423d2e991260fa229145719c32596b703020c9410 +size 8074 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset new file mode 100644 index 00000000..8af25233 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21116a8d95beb64c1308b3cdfe44b942b47c7a351442fb1d4ef590f355cdf4f7 +size 95535 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset new file mode 100644 index 00000000..b7285322 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d836513a7bbec906d9f4ce2f8518e2862b74d75fc5bc738b6b495015f935364f +size 51749 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset new file mode 100644 index 00000000..5095cc21 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf58f7020f4d029056da97041cc4d29089edbea2e6dc81e4669aa030df1fafff +size 29568 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset new file mode 100644 index 00000000..64d89846 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3c45925c925cc4bb179a872a2cf157f76117fee5c192a7e3dfe93ff7e4f784 +size 8078 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset new file mode 100644 index 00000000..b0314815 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a3c1c643022c43b138f2a071856fb60c1df1c511c6e6c8862984a7010e002a1 +size 8095 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset new file mode 100644 index 00000000..fe5e845c --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc55b1a8b638c9ccc397b98b396c092a0e084603e68bcd10fb1729379c47852b +size 8146 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset new file mode 100644 index 00000000..5df5287d --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8a14865171c5b65c7d8be0d46726353e8104e68683cd99357126260b55698a5 +size 34850 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset new file mode 100644 index 00000000..10b802a1 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:448c48a8287fd90a9fd71800a7087eb6e1b2bc627a3521c26bda980738caea6b +size 598632 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset new file mode 100644 index 00000000..15a294ab --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0644617ac381f191d6d72c9f86a889517c158c167463ef38789daa06aebdc4ed +size 1028057 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset new file mode 100644 index 00000000..c5a08250 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a253f3ea6a930a7b0f7ddc5c246a4df6a1a39a45825e1e9acc6a6364da29e51 +size 352971 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset new file mode 100644 index 00000000..587c6cfc --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:785ddd52d577ca4e0781a0d587f7695a0bb3a9832de221d94667ba39da4d4028 +size 17199 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset index 15ffec2e..372c7525 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76986ee4471d33ce4239f900ec8ba81ca2d514c500a19633881965ad5904067a -size 11672 +oid sha256:f0c03bea7638b90df30171066477cf6ea55b8320336f4770b18916b20a6689e2 +size 11875 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset new file mode 100644 index 00000000..3245e65a --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:591da916ae121f8e2b05185761a6bcf5f90c338c053fe2976e3f7d72f257ff1a +size 12748 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset index 895e9e1f..777ad054 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:987a4e9d5c25f997a75e654527036ae30b5f2657db8317e10a8c5d10c28bfe8e -size 40669 +oid sha256:00849c635d8e843e1520e12a92f95fd99d9b29e670718919dc847fa283ecc3c9 +size 40704 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index db396f72..14593b0f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5fdbc6cb67c6ec9d80147c3321ff6ad03bc64b283039537ab274631bec01f74 -size 40173 +oid sha256:f9481ef86ac85568b121922e82b67586cd754928de5fa47e2c8ef57066b514b3 +size 40119 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index 2e99cff0..dde4061d 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91ac6fb94624f653a7486d1307aaf136e4a1a81559c15e167eb887e3f8cb5f9a -size 191860 +oid sha256:ead2d32698cc8f6f60af3405fa3b9f5f1452791c2c759e631744a26cebf6749e +size 185820 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 37596dba..f669362d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04e19f6714beb76a66600fc3c8ea8e68d8ab2f9102ba687caa263a29e4ea5ae0 -size 637103 +oid sha256:fbcf735252e1048bb3e6b287ddd7b485ae55154e75fb84b88577b077c2428557 +size 646936 From c955020483816c68447148e668f72a4508b66aa9 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 15:25:46 +0000 Subject: [PATCH 20/44] Re-Added Bounty Director to Tutorial Level and Fixed Missing Tag on ArtTest Rifle --- .../Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset index 777ad054..5cd48aa7 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:00849c635d8e843e1520e12a92f95fd99d9b29e670718919dc847fa283ecc3c9 -size 40704 +oid sha256:55d9774b1be0067976e247efb9c0924028d8e6f104a2356fc3c244d0ca0bcbab +size 40721 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index f669362d..e06ff1a2 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbcf735252e1048bb3e6b287ddd7b485ae55154e75fb84b88577b077c2428557 -size 646936 +oid sha256:dcd44c870217e54259c4d1d8f70580c49d4ed89fb9b23ef05b894d9d4a9bd82b +size 649426 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 9e791280..c2a34afc 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:700ed88e0d0d5ea5f66e69543fa858c40822e833a6c147ec16a86a435194ad43 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..5b36e46b 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:f21bd334df638394854b87ecb58b20d6d26ba0424976e1ad027fdd6e8d7d7764 +size 66790690 From 9020cdb284fda7423bcaa8a4d652ec70eebacfa4 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 15:53:52 +0000 Subject: [PATCH 21/44] Implemented Text to Checkpoint Completed UI --- .../Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset | 4 ++-- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset | 4 ++-- .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 3 +++ .../Source/EndlessVendetta/BountySystem/CheckpointClass.h | 1 - .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 09b70476..09966a1a 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b07b293876d399dfdce186c99573c335e2e2e509856f7a67a2a463569b4f23d -size 30404 +oid sha256:b58d0ca6a59826731ad87a5a7fc10d3006d44eab8ccba7ef819e065a8c6da9c1 +size 30968 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 8e4ecbd1..5fb874ed 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:722ad362b974f8cd884e1852c963e27f75f4ed6f285759adbd3c3571b1f477c0 -size 57740 +oid sha256:87aebe0b0ade2372a24d8570aa5634a1d111bfee7a657fb15631ce0569065b4f +size 60696 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset index 3ef7c033..ece0d8c4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:845fc89fb83a130aea8498c87ed41fadd3de14e00ac010bcd5843b5a19c29f8f -size 58154 +oid sha256:64fe64e549080d0ddf002d488c0e30412912c0088e529e0895ead72f976b2dad +size 79669 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index 38d939c9..bfd9876e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -70,6 +70,7 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->Destroy(); BountyCheckpoints.RemoveAt(0); UE_LOG(LogTemp, Warning, TEXT(" You've Completed the Bounty!! Well done")); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(FString("")); return; } @@ -89,6 +90,8 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->SpawnWaypoint(); BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); + + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointDesc()); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 9c0fa9bf..2bc602b1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -34,7 +34,6 @@ protected: UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() { - Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(); CompletedCheckpoint.Broadcast(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 106416a8..5661588f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -196,7 +196,7 @@ public: void WeaponSwitcher(AActor* Outhit); UFUNCTION(BlueprintImplementableEvent) - void CheckpointCompletedUI(); + void CheckpointCompletedUI(const FString& CheckpointDesc); // Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used bool UpdateGadgetType(TSubclassOf NewGadgetClass); From 62d33c6856183c62ce4362efe4ec4f4bc076325c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 16:43:28 +0000 Subject: [PATCH 22/44] Added Tips to All Checkpoints --- .../BountySimulation/CP_ElimTutorialTarget.uasset | 4 ++-- .../CP_EnterBountySimulationFacility.uasset | 4 ++-- .../BountySimulation/CP_ExitBountySimulationFacility.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset | 4 ++-- .../GadgetTutorial/Combat/CP_CombatTraining.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset | 4 ++-- .../GadgetTutorial/Recon/CP_ReconTraining.uasset | 4 ++-- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- .../Content/BountySystem/Waypoint/TextBackground.png | 3 +++ .../Content/BountySystem/Waypoint/TextBackground.uasset | 3 +++ .../Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset | 4 ++-- .../FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 2 +- .../Source/EndlessVendetta/BountySystem/CheckpointClass.h | 6 ++++++ 18 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset index 5883a4f1..6f3dcce1 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:727b8060f6720e1de8c6cc5aa95de4e3d2c18b4b6df469c5f1661679379f3054 -size 143152 +oid sha256:eafef3871610bf15d90d680c56e28c40ec4e54d5b735a02ae83706187362aed0 +size 144071 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index a42c2499..597ba32f 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09f78d33c2a88b48b438f3382f6db685a54203b9036a09f80f768b17e0c9d77d -size 74030 +oid sha256:cb5d6652ffbeb2dffe9d2c7bf7250396d62c63f29b58fafce029a1ee444d976a +size 74754 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset index 478f5860..82b10472 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e7b67b89169f8856643fa54ad3ee70088d8e57278dda3eae8a67cebae80fc4d -size 49564 +oid sha256:5f20d01e14668043ceba3f5121d5441f9b10bf53ae9b329a67bc52ca2c23abe5 +size 50569 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset index 5d9c77b0..c1b4c121 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:760080e3e99953e11230e2d0611fe20c01daa1e6ea7ef3dd4c5923beb8fbc6a9 -size 38487 +oid sha256:20c146ca9121d08cc486f1d15b935101e2faad580974b40b32144f4f3cf466b6 +size 38506 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset index 9d450f09..80f6d632 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:285081531c73e061d3e6bc5def297852b57b5e3622c3e947cc0b8ceed5752f85 -size 61443 +oid sha256:c983ac6f5ed8e39f4fd28d0d35a06fc6b1d4569f0448a3e6672a1cc664e91175 +size 60950 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset index 0fdaf894..b7080ef7 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fccc1eabe3bc902abe338f8980b6f249f2578be80c1c8096a5232a132ba42c6 -size 148461 +oid sha256:9a329b5461ac74c60fb7e33cc1369d9985dfb5cf33c1f85ddf207a36f94e3fb8 +size 147979 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset index 8ed828fc..ffe2f671 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76ea44d21affaf349e16f27cb6cb3684c9c14ae417f1096846b45711de2a8a3e -size 156411 +oid sha256:e035f7ddd3dcf755fb0ed071ba8d162c3a8b17bb9e5fe788443a35df5a0f5b21 +size 156499 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset index af179740..36b8ab99 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f7376ac38e90dacafa36fd1b16bbf2227d0b577ba5ad53d43ce0d8df47bbf07 -size 46961 +oid sha256:e05c2b2a67900f795bea030cd060cb7ce55f4801f5573c5e4b5ab22ff5aa4198 +size 47609 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset index a545465a..0edb31b5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0cfa2881e250992ba5cc2fff1a9597d00531cb2732df8405f6b53d76ab675a7 -size 38882 +oid sha256:9f83c02b2613872e32f795c91ce190d44c2cfdf83785965105ed43d9e326ec7e +size 38762 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset index c32db353..90dbb721 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52fa6f6a84ca059b3f9b57959ee3cfa352d0feb833b8a5d1603bae568c4d4d7d -size 46993 +oid sha256:8c6becce8ef63d5920459cc97049122bbd5c56ff7886c49fbbccd06f2f24d8f1 +size 47510 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index ba8534c6..c1359493 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04143e23cb9403f9ae001e7ab261a6c90a890df16f81eb00c35ae1e7305ed249 -size 49046 +oid sha256:5b3d88e0df1c929eb1c4bc13653d6a152930dc9ba8575709ea070bc05c3c26c7 +size 49098 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png new file mode 100644 index 00000000..d5781e4c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d3cccd91fdbe7e0090f451048771e56d36dbe24c3cb716b63d99261f414f868 +size 2232177 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset new file mode 100644 index 00000000..2bc1ea2a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f709567521d482b2a611eeb383dde9b4b80fde46087b1e4687da6ef382afcdbb +size 1854378 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 09966a1a..cd5166a9 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b58d0ca6a59826731ad87a5a7fc10d3006d44eab8ccba7ef819e065a8c6da9c1 -size 30968 +oid sha256:deb3a67c2bba412bab8428522bf65087efd0927529eeafbb678dda460b6993ab +size 30376 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset index ece0d8c4..0a4f058e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64fe64e549080d0ddf002d488c0e30412912c0088e529e0895ead72f976b2dad -size 79669 +oid sha256:1a92359cc39feb0549f88beb0aa498c448b67afac995e88ffa2de837ad2024ec +size 80434 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index e06ff1a2..752da19b 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcd44c870217e54259c4d1d8f70580c49d4ed89fb9b23ef05b894d9d4a9bd82b -size 649426 +oid sha256:35b3811ccb41bda48b54e51242d49687d08149d0c9440b4c4ddb7ff58aec8d25 +size 654848 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index bfd9876e..1170079d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -91,7 +91,7 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); - Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointDesc()); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointTip()); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 2bc602b1..2797e996 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -19,6 +19,8 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FString CheckpointDescription; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") + FString CheckpointTip; + UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FVector WaypointLoc; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") UTexture2D* WaypointIcon; @@ -60,6 +62,10 @@ public: { return CheckpointDescription; } + FString GetCheckpointTip() + { + return CheckpointTip; + } FVector GetWaypointLoc() { return WaypointLoc; From 012328b34c8aabffab1a1ee4be2def96ce32b5dd Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 19:29:07 +0000 Subject: [PATCH 23/44] Implemented Basic Screen Space UI For Checkpoint Icon --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index c1359493..9aedebc5 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b3d88e0df1c929eb1c4bc13653d6a152930dc9ba8575709ea070bc05c3c26c7 -size 49098 +oid sha256:3af83e78f0fcbb476ea6933cb4debfec09012efd50783dd0f80cb67ff4cddc0e +size 119603 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset new file mode 100644 index 00000000..6644c0ac --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f84c5b5a563c7c12488e102545b7848020e19736adf81ea4f7b70b40d16f9902 +size 37666 From 4c2ba9b3e58e19229b5add3fd7348dfa18098fec Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 15:14:48 +0000 Subject: [PATCH 24/44] Added New Object Collision Channel Waypoint --- EndlessVendetta/Config/DefaultEngine.ini | 61 ++++++++++++++++++- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +- .../Content/Levels/TrainingFacility.umap | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../BountySystem/WaypointActor.cpp | 26 +++++++- .../BountySystem/WaypointActor.h | 6 +- 6 files changed, 91 insertions(+), 12 deletions(-) diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index 89d6c838..505db906 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -1,7 +1,62 @@ [/Script/Engine.CollisionProfile] -+Profiles=(Name="Projectile",CollisionEnabled=QueryOnly,ObjectTypeName="Projectile",CustomResponses=,HelpMessage="Preset for projectiles",bCanModify=True) -+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,Name="Projectile",DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False) -+EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) +-Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) +-Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ",bCanModify=False) +-Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ",bCanModify=False) +-Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic",Response=ECR_Block),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.",bCanModify=False) +-Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors",bCanModify=False) +-Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors",bCanModify=False) +-Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.",bCanModify=False) +-Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.",bCanModify=False) +-Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="UI",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Block),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) ++Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision") ++Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.") ++Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ") ++Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ") ++Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic"),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.") ++Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.") ++Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors") ++Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors") ++Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.") ++Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.") ++Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.") ++Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.") ++Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") ++Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="Projectile",CollisionEnabled=QueryOnly,bCanModify=True,ObjectTypeName="Projectile",CustomResponses=,HelpMessage="Preset for projectiles") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Projectile") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Waypoint") ++EditProfiles=(Name="Trigger",CustomResponses=((Channel="Projectile",Response=ECR_Ignore))) +-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") +-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") +-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") +-ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") +-ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") ++ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") ++ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") ++ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") ++ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") ++ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") +-CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") +-CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") +-CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +-CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") ++CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") ++CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") ++CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") ++CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") [/Script/EngineSettings.GameMapsSettings] EditorStartupMap=/Game/Levels/TrainingFacility.TrainingFacility diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 9aedebc5..24e94150 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3af83e78f0fcbb476ea6933cb4debfec09012efd50783dd0f80cb67ff4cddc0e -size 119603 +oid sha256:a6f84a0cd87a71d9e7634262974d939d9bf178a746ede7eaa63dbccd172691bd +size 102150 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 752da19b..1f195d7d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35b3811ccb41bda48b54e51242d49687d08149d0c9440b4c4ddb7ff58aec8d25 -size 654848 +oid sha256:7538c6b68b4473d388aaad70e1e43e13d21cd55e0aad078df0ca437ad6f81782 +size 654898 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 5b36e46b..073fc784 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f21bd334df638394854b87ecb58b20d6d26ba0424976e1ad027fdd6e8d7d7764 +oid sha256:c247df32a59590cde6089e45f176abfa9fec3dd67b5c4e370067412895eb2bc6 size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 0c9320cb..b5b82015 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -31,14 +31,34 @@ void AWaypointActor::Tick(float DeltaTime) { Super::Tick(DeltaTime); - if (!PlayersCam) SetActorTickEnabled(false); + UpdateScaleAndRotation(); +} + +bool AWaypointActor::SightCheck() +{ + FHitResult OutHit; + // FCollisionQueryParams CollisionParams = FCollisionQueryParams::DefaultQueryParam; + // CollisionParams.AddIgnoredActor(PlayersCam->GetOwner()); + FCollisionObjectQueryParams CollisionParams; + ECollisionChannel CollisionChannel; + CollisionParams.AddObjectTypesToQuery(this->GetComponentsCollisionResponseToChannel()) + FVector LT_Start = PlayersCam->GetSocketLocation(); + FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * 3000); + GetWorld()->LineTraceSingleByObjectType() +} + + +void AWaypointActor::UpdateScaleAndRotation() +{ + UE_LOG(LogTemp, Warning, TEXT("Looked at? = %s"), (SightCheck ? TEXT("True") : TEXT("False"))); + if (!PlayersCam) return; FVector WaypointLoc = GetActorLocation(); FVector PlayerCamLoc = PlayersCam->GetComponentLocation(); - + FRotator NewRot = UKismetMathLibrary::FindLookAtRotation(WaypointLoc, PlayerCamLoc); SetActorRotation(NewRot); - + float DistanceToPlayer = FVector::Distance(WaypointLoc, PlayerCamLoc); // S for Scale float S = (DistanceToPlayer * ScalingMagnitude) + ScalingY_Intercept; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index cc9b5e6a..6fdff1ca 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -13,7 +13,7 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor GENERATED_BODY() UCameraComponent* PlayersCam; - + float ScalingMagnitude; float ScalingY_Intercept; @@ -29,6 +29,10 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float ScaleAtMinDist = 0.15; + + void UpdateScaleAndRotation(); + + bool SightCheck(); protected: // Called when the game starts or when spawned From 0e937e3e5ebe56b013822da89ec05ea3c459d394 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 16:14:01 +0000 Subject: [PATCH 25/44] Implemented Main Waypoint Visibility Toggle --- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +-- .../Content/Levels/TrainingFacility.umap | 2 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../BountySystem/WaypointActor.cpp | 28 +++++++++++-------- .../BountySystem/WaypointActor.h | 6 ++++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 24e94150..7069f767 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6f84a0cd87a71d9e7634262974d939d9bf178a746ede7eaa63dbccd172691bd -size 102150 +oid sha256:3ed86d1de4a3245d813c1133967be3069a04e0578f3ea55c142df21180ed2d7b +size 111529 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 1f195d7d..5efb1b8d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7538c6b68b4473d388aaad70e1e43e13d21cd55e0aad078df0ca437ad6f81782 +oid sha256:842aa6cfaae2bd2428eb51ca353b53825d15505936abd000d4d38a8ac0284305 size 654898 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 073fc784..0befbad2 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c247df32a59590cde6089e45f176abfa9fec3dd67b5c4e370067412895eb2bc6 +oid sha256:d321261b35d69be06fe122656bd29de989a8d3927aec5a410ddc9c80d1c97540 size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index b5b82015..939bbd9e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -3,6 +3,7 @@ #include "WaypointActor.h" +#include "Engine/EngineTypes.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" // Sets default values @@ -30,27 +31,32 @@ void AWaypointActor::BeginPlay() void AWaypointActor::Tick(float DeltaTime) { Super::Tick(DeltaTime); + + if (SightCheck()) + { + UpdateVisibility(true); + UpdateScaleAndRotation(); + return; + } + + UpdateVisibility(false); + - UpdateScaleAndRotation(); } bool AWaypointActor::SightCheck() { FHitResult OutHit; - // FCollisionQueryParams CollisionParams = FCollisionQueryParams::DefaultQueryParam; - // CollisionParams.AddIgnoredActor(PlayersCam->GetOwner()); - FCollisionObjectQueryParams CollisionParams; - ECollisionChannel CollisionChannel; - CollisionParams.AddObjectTypesToQuery(this->GetComponentsCollisionResponseToChannel()) - FVector LT_Start = PlayersCam->GetSocketLocation(); - FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * 3000); - GetWorld()->LineTraceSingleByObjectType() + FCollisionObjectQueryParams ObjectQueryParams; + ObjectQueryParams.AddObjectTypesToQuery(ECollisionChannel::ECC_GameTraceChannel2); + FVector LT_Start = PlayersCam->GetComponentLocation(); + FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * WaypointFocusDistance); + if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams)) return true; + return false; } - void AWaypointActor::UpdateScaleAndRotation() { - UE_LOG(LogTemp, Warning, TEXT("Looked at? = %s"), (SightCheck ? TEXT("True") : TEXT("False"))); if (!PlayersCam) return; FVector WaypointLoc = GetActorLocation(); diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index 6fdff1ca..e8936dec 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -18,6 +18,9 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor float ScalingY_Intercept; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint") + float WaypointFocusDistance = 3000; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float MaxDist = 16000.f; @@ -38,6 +41,9 @@ protected: // Called when the game starts or when spawned virtual void BeginPlay() override; + UFUNCTION(BlueprintImplementableEvent) + void UpdateVisibility(bool IsVisible); + public: // Sets default values for this actor's properties AWaypointActor(); From 787c9c76f10ab19a6ad0e7b1bb318ce772d0f36d Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 16:16:17 +0000 Subject: [PATCH 26/44] Removed Test Mini Waypoint BP --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- .../Content/BountySystem/Waypoint/TextBackground.uasset | 3 --- EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset | 3 --- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 7069f767..fea9a176 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ed86d1de4a3245d813c1133967be3069a04e0578f3ea55c142df21180ed2d7b -size 111529 +oid sha256:7f2025158a6ae81155530070b6becb40850e60358ca27e87bee12a410a19bb53 +size 100344 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset deleted file mode 100644 index 2bc1ea2a..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f709567521d482b2a611eeb383dde9b4b80fde46087b1e4687da6ef382afcdbb -size 1854378 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset deleted file mode 100644 index 6644c0ac..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f84c5b5a563c7c12488e102545b7848020e19736adf81ea4f7b70b40d16f9902 -size 37666 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0befbad2..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d321261b35d69be06fe122656bd29de989a8d3927aec5a410ddc9c80d1c97540 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..556e3c1b 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:1ca0d15344c39404b70241423c636cec9d5b0f5ef0e4251dc797d3432b3a8263 +size 53268 From 153e02635408f1ffda28006000dfe5bc031d6b4a Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 16:39:39 +0000 Subject: [PATCH 27/44] Added New Mini Waypoint Class with Visibility Toggle --- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- .../Waypoint/WBP_MiniWaypoint.uasset | 3 +++ .../BountySystem/WaypointActor.cpp | 7 +++++-- .../BountySystem/WaypointActor.h | 6 ++++++ .../UserWidgets/MiniWaypoint.cpp | 5 +++++ .../UserWidgets/MiniWaypoint.h | 21 +++++++++++++++++++ 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index fea9a176..020a3c2c 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f2025158a6ae81155530070b6becb40850e60358ca27e87bee12a410a19bb53 -size 100344 +oid sha256:a523b2149e46a3b369ca97e969d9a3f241a7af78f45b6500febbe252b9a53193 +size 100785 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset new file mode 100644 index 00000000..b4cca8c2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48aab2df957e2a9988712c7a2913d041000b8948f572298a8d8f23c759161e0a +size 39684 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 939bbd9e..ce186cbb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -16,7 +16,6 @@ AWaypointActor::AWaypointActor() // Called when the game starts or when spawned void AWaypointActor::BeginPlay() { - SetActorTickEnabled(false); Super::BeginPlay(); SetActorTickInterval(0.05); @@ -24,7 +23,9 @@ void AWaypointActor::BeginPlay() PlayersCam = Cast(PlayerActor->GetComponentByClass(UCameraComponent::StaticClass())); ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist); ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); - if (PlayersCam) SetActorTickEnabled(true); + + MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); + MiniWaypoint->AddToViewport(1); } // Called every frame @@ -36,10 +37,12 @@ void AWaypointActor::Tick(float DeltaTime) { UpdateVisibility(true); UpdateScaleAndRotation(); + MiniWaypoint->UpdateVisibility(false); return; } UpdateVisibility(false); + MiniWaypoint->UpdateVisibility(true); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index e8936dec..d86c1207 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "Camera/CameraComponent.h" +#include "EndlessVendetta/UserWidgets/MiniWaypoint.h" #include "GameFramework/Actor.h" #include "WaypointActor.generated.h" @@ -21,6 +22,11 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor UPROPERTY(EditDefaultsOnly, Category = "Waypoint") float WaypointFocusDistance = 3000; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint") + TSubclassOf MiniWaypointClass; + + UMiniWaypoint* MiniWaypoint; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float MaxDist = 16000.f; diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp new file mode 100644 index 00000000..68f8f0f4 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MiniWaypoint.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h new file mode 100644 index 00000000..a556167d --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Blueprint/UserWidget.h" +#include "MiniWaypoint.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API UMiniWaypoint : public UUserWidget +{ + GENERATED_BODY() + +public: + UFUNCTION(BlueprintImplementableEvent) + void UpdateVisibility(bool IsVisible); + +}; From 5a8d8e828454bb80b0c8abee1f12666affb25f6c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 21:23:54 +0000 Subject: [PATCH 28/44] Implemented Mini Waypoint Appearing When Main Waypoint is Out of Focus --- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +- .../Waypoint/WBP_MiniWaypoint.uasset | 4 +- .../Content/Levels/TrainingFacility.umap | 2 +- .../BountySystem/WaypointActor.cpp | 15 ++--- .../BountySystem/WaypointActor.h | 5 +- .../UserWidgets/MiniWaypoint.cpp | 60 +++++++++++++++++++ .../UserWidgets/MiniWaypoint.h | 16 +++++ 7 files changed, 88 insertions(+), 18 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 020a3c2c..d2678445 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a523b2149e46a3b369ca97e969d9a3f241a7af78f45b6500febbe252b9a53193 -size 100785 +oid sha256:adf1682c60d18b92e71347784817def276af822981b49939047b0e98e8d1d1f5 +size 105318 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset index b4cca8c2..4162142b 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48aab2df957e2a9988712c7a2913d041000b8948f572298a8d8f23c759161e0a -size 39684 +oid sha256:d3d5b6b3ec13c451b42ae7c71efdfc6878d1e4dbdb366e7256834767a8cd6364 +size 42017 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 5efb1b8d..afb2d366 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:842aa6cfaae2bd2428eb51ca353b53825d15505936abd000d4d38a8ac0284305 +oid sha256:9b6671545b77ffaff9044f90b3f250e2384252cb1d7a122617969c932a0f863e size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index ce186cbb..6c5f9674 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -13,19 +13,19 @@ AWaypointActor::AWaypointActor() PrimaryActorTick.bCanEverTick = true; } -// Called when the game starts or when spawned -void AWaypointActor::BeginPlay() +void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FString& Desc) { - Super::BeginPlay(); - SetActorTickInterval(0.05); AActor* PlayerActor = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); PlayersCam = Cast(PlayerActor->GetComponentByClass(UCameraComponent::StaticClass())); ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist); ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); - + MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); MiniWaypoint->AddToViewport(1); + MiniWaypoint->WorldLoc = this->GetActorLocation(); + MiniWaypoint->PlayerController = GetWorld()->GetFirstPlayerController(); + MiniWaypoint->SetIcon(Icon); } // Called every frame @@ -33,18 +33,15 @@ void AWaypointActor::Tick(float DeltaTime) { Super::Tick(DeltaTime); + UpdateScaleAndRotation(); if (SightCheck()) { UpdateVisibility(true); - UpdateScaleAndRotation(); MiniWaypoint->UpdateVisibility(false); return; } - UpdateVisibility(false); MiniWaypoint->UpdateVisibility(true); - - } bool AWaypointActor::SightCheck() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index d86c1207..a8957749 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -44,9 +44,6 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor bool SightCheck(); protected: - // Called when the game starts or when spawned - virtual void BeginPlay() override; - UFUNCTION(BlueprintImplementableEvent) void UpdateVisibility(bool IsVisible); @@ -57,7 +54,7 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; - UFUNCTION(BlueprintImplementableEvent) + UFUNCTION(BlueprintNativeEvent) void SetupWaypoint(UTexture2D* Icon, const FString& Desc); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index 68f8f0f4..6ee988a9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -3,3 +3,63 @@ #include "MiniWaypoint.h" + + +void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) +{ + Super::NativeTick(MyGeometry, InDeltaTime); + + if (!IsValid(IconCanvasPanelSlot) || !IsValid(PlayerController)) return; + + FVector2D ScreenLoc; + PlayerController->ProjectWorldLocationToScreen(WorldLoc, ScreenLoc); + + // Check if waypoint is outside of players vision frustum + if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) + { + //UE_LOG(LogTemp, Warning, TEXT("IconPos: %f"), IconCanvasPanelSlot->GetPosition().X); + + float PlayerYaw = PlayerController->GetControlRotation().Yaw; + float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; + if (TargetYaw < 0 ) TargetYaw += 360; + + UE_LOG(LogTemp, Warning, TEXT("Yaw: %f"), PlayerController->GetControlRotation().Yaw); + UE_LOG(LogTemp, Warning, TEXT("Look at Yaw: %f"), TargetYaw); + + // Check if waypoint is closer to the players right + bool TargetOnTheRight = false; + if (PlayerYaw >= TargetYaw) + { + TargetOnTheRight = FMath::Abs(TargetYaw - PlayerYaw) >= 180; + } + else + { + TargetOnTheRight = TargetYaw - PlayerYaw <= 180; + } + + UE_LOG(LogTemp, Warning, TEXT("On the right?...%s"), TargetOnTheRight ? TEXT("true") : TEXT("false")); + return; + } + + FVector2d ViewPortSize; + GEngine->GameViewport->GetViewportSize(ViewPortSize); + float ViewportHalfX = ViewPortSize.X / 2.f; + float ViewportHalfY = ViewPortSize.Y / 2.f; + + // Centers the icon + ScreenLoc.X -= ViewportHalfX; + ScreenLoc.Y -= ViewportHalfY; + + float ViewportMarginX = ViewportHalfX * 0.8f; + float ViewportMarginY = ViewportHalfY * 0.6f; + + ScreenLoc.X = FMath::Clamp(ScreenLoc.X, ViewportMarginX * -1.f, ViewportMarginX); + ScreenLoc.Y = FMath::Clamp(ScreenLoc.Y, ViewportMarginY * -1.f, ViewportMarginY); + + IconCanvasPanelSlot->SetPosition(ScreenLoc); +} + +void UMiniWaypoint::SetIconPanelSlot(UImage* IconImage) +{ + IconCanvasPanelSlot = Cast(IconImage->Slot); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h index a556167d..0089f226 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h @@ -4,6 +4,8 @@ #include "CoreMinimal.h" #include "Blueprint/UserWidget.h" +#include "Components/CanvasPanelSlot.h" +#include "Components/Image.h" #include "MiniWaypoint.generated.h" /** @@ -13,9 +15,23 @@ UCLASS() class ENDLESSVENDETTA_API UMiniWaypoint : public UUserWidget { GENERATED_BODY() + + void NativeTick(const FGeometry& MyGeometry, float InDeltaTime) override; + + UCanvasPanelSlot* IconCanvasPanelSlot; + +protected: + UFUNCTION(BlueprintCallable) + void SetIconPanelSlot(UImage* IconImage); public: + FVector WorldLoc = FVector(0, 0, 0); + APlayerController* PlayerController; + UFUNCTION(BlueprintImplementableEvent) void UpdateVisibility(bool IsVisible); + + UFUNCTION(BlueprintImplementableEvent) + void SetIcon(UTexture2D* Icon); }; From cbf89a2c938c0061c717a3f565b9c93a095d052b Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 22:45:21 +0000 Subject: [PATCH 29/44] Implemented Mini Waypoint Direction Toggle --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 2 +- EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- .../EndlessVendetta/UserWidgets/MiniWaypoint.cpp | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index d2678445..dc557ee3 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adf1682c60d18b92e71347784817def276af822981b49939047b0e98e8d1d1f5 +oid sha256:4d5808bd83b46d892a7321c2bad2bee7aec16fbd8b427d0b05b760fcc596c906 size 105318 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index afb2d366..2ebfb2cd 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b6671545b77ffaff9044f90b3f250e2384252cb1d7a122617969c932a0f863e +oid sha256:c4ea69a798330d981b7d72fce4e0999e306589ee7e0b3b49ce9a69adf36d6348 size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index 6ee988a9..bb2d4640 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -17,17 +17,12 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) // Check if waypoint is outside of players vision frustum if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) { - //UE_LOG(LogTemp, Warning, TEXT("IconPos: %f"), IconCanvasPanelSlot->GetPosition().X); - float PlayerYaw = PlayerController->GetControlRotation().Yaw; float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; if (TargetYaw < 0 ) TargetYaw += 360; - UE_LOG(LogTemp, Warning, TEXT("Yaw: %f"), PlayerController->GetControlRotation().Yaw); - UE_LOG(LogTemp, Warning, TEXT("Look at Yaw: %f"), TargetYaw); - // Check if waypoint is closer to the players right - bool TargetOnTheRight = false; + bool TargetOnTheRight; if (PlayerYaw >= TargetYaw) { TargetOnTheRight = FMath::Abs(TargetYaw - PlayerYaw) >= 180; @@ -37,7 +32,10 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) TargetOnTheRight = TargetYaw - PlayerYaw <= 180; } - UE_LOG(LogTemp, Warning, TEXT("On the right?...%s"), TargetOnTheRight ? TEXT("true") : TEXT("false")); + FVector2D NewPos = IconCanvasPanelSlot->GetPosition(); + if ((TargetOnTheRight && NewPos.X < 0) || (!TargetOnTheRight && NewPos.X > 0)) NewPos.X *= -1; + + IconCanvasPanelSlot->SetPosition(NewPos); return; } From c51f2ab7b6cb45aa2d5b55bfe18a24fe7a310cf8 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 23:26:01 +0000 Subject: [PATCH 30/44] Added a Directional Arrow to Mini Waypoints --- .../Waypoint/WBP_MiniWaypoint.uasset | 4 ++-- .../BountySystem/Waypoint/WaypointArrow.png | 3 +++ .../BountySystem/Waypoint/WaypointArrow.uasset | 3 +++ .../Content/Levels/TrainingFacility.umap | 2 +- .../EndlessVendetta/UserWidgets/MiniWaypoint.cpp | 16 +++++++++------- .../EndlessVendetta/UserWidgets/MiniWaypoint.h | 6 ++++-- 6 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset index 4162142b..cd79767a 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3d5b6b3ec13c451b42ae7c71efdfc6878d1e4dbdb366e7256834767a8cd6364 -size 42017 +oid sha256:432d04e87414a6a95285b4468bfe64d4631557cef349a37f6e60087e843f85d9 +size 48883 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png new file mode 100644 index 00000000..5909a350 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9cd8b801f66f1241477554f28ec764079c875e75400bf22dec42494c2807650 +size 44164 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset new file mode 100644 index 00000000..efc268bd --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd99b04a977e5fa33f966683ec783006f1289b9ea7cb856f646aafc057293fe6 +size 33619 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 2ebfb2cd..f16e3960 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4ea69a798330d981b7d72fce4e0999e306589ee7e0b3b49ce9a69adf36d6348 +oid sha256:d3943e1a064276d17b897a7a10a3c42a35c75d6c02117bd1ea962544f3576a9b size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index bb2d4640..03a7b6be 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -4,7 +4,6 @@ #include "MiniWaypoint.h" - void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) { Super::NativeTick(MyGeometry, InDeltaTime); @@ -14,13 +13,15 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) FVector2D ScreenLoc; PlayerController->ProjectWorldLocationToScreen(WorldLoc, ScreenLoc); + float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; + float PlayerYaw = PlayerController->GetControlRotation().Yaw; + if (TargetYaw < 0 ) TargetYaw += 360; + + ArrowImage->SetRenderTransformAngle(TargetYaw - PlayerYaw); + // Check if waypoint is outside of players vision frustum if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) { - float PlayerYaw = PlayerController->GetControlRotation().Yaw; - float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; - if (TargetYaw < 0 ) TargetYaw += 360; - // Check if waypoint is closer to the players right bool TargetOnTheRight; if (PlayerYaw >= TargetYaw) @@ -57,7 +58,8 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) IconCanvasPanelSlot->SetPosition(ScreenLoc); } -void UMiniWaypoint::SetIconPanelSlot(UImage* IconImage) +void UMiniWaypoint::SetIconPanelSlot(UCanvasPanel* IconParent, UImage* ArrowImageComp) { - IconCanvasPanelSlot = Cast(IconImage->Slot); + ArrowImage = ArrowImageComp; + IconCanvasPanelSlot = Cast(IconParent->Slot); } diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h index 0089f226..9f810bfd 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h @@ -5,6 +5,7 @@ #include "CoreMinimal.h" #include "Blueprint/UserWidget.h" #include "Components/CanvasPanelSlot.h" +#include "Components/CanvasPanel.h" #include "Components/Image.h" #include "MiniWaypoint.generated.h" @@ -19,10 +20,11 @@ class ENDLESSVENDETTA_API UMiniWaypoint : public UUserWidget void NativeTick(const FGeometry& MyGeometry, float InDeltaTime) override; UCanvasPanelSlot* IconCanvasPanelSlot; + UImage* ArrowImage; -protected: +protected: UFUNCTION(BlueprintCallable) - void SetIconPanelSlot(UImage* IconImage); + void SetIconPanelSlot(UCanvasPanel* IconParent, UImage* ArrowImageComp); public: FVector WorldLoc = FVector(0, 0, 0); From 797653132eb3a966a5db585eed51027c5e5e99d2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 23:59:53 +0000 Subject: [PATCH 31/44] Fixed Multiple Main Waypoints Becoming Focused When Looking at Just One --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../EndlessVendetta/BountySystem/CheckpointClass.cpp | 1 + .../EndlessVendetta/BountySystem/WaypointActor.cpp | 11 +++++++++-- .../EndlessVendetta/BountySystem/WaypointActor.h | 2 ++ 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index dc557ee3..784cbe0b 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d5808bd83b46d892a7321c2bad2bee7aec16fbd8b427d0b05b760fcc596c906 -size 105318 +oid sha256:a406c3c753428efd22e472351a913e042fd0653a7430e4ee29ae7149559d92b4 +size 62287 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index f16e3960..af04d0dd 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3943e1a064276d17b897a7a10a3c42a35c75d6c02117bd1ea962544f3576a9b -size 654898 +oid sha256:68499c0acedf4bd43fa13b5244a3900ad9850ff62e15ac85b1e337859200d06d +size 654847 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index 556e3c1b..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca0d15344c39404b70241423c636cec9d5b0f5ef0e4251dc797d3432b3a8263 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..89145d94 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:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:b7943b84a70f66da9ce4c738e5748bd6853c3af285ea2f99a76efa584cb31301 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index 5562a2b8..df618059 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -46,6 +46,7 @@ void ACheckpointClass::Tick(float DeltaTime) void ACheckpointClass::Destroyed() { if (WaypointActor) WaypointActor->Destroy(); + Super::Destroyed(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 6c5f9674..531fff83 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -22,7 +22,7 @@ void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FStrin ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); - MiniWaypoint->AddToViewport(1); + MiniWaypoint->AddToViewport(0); MiniWaypoint->WorldLoc = this->GetActorLocation(); MiniWaypoint->PlayerController = GetWorld()->GetFirstPlayerController(); MiniWaypoint->SetIcon(Icon); @@ -51,7 +51,7 @@ bool AWaypointActor::SightCheck() ObjectQueryParams.AddObjectTypesToQuery(ECollisionChannel::ECC_GameTraceChannel2); FVector LT_Start = PlayersCam->GetComponentLocation(); FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * WaypointFocusDistance); - if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams)) return true; + if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams) && OutHit.GetActor()->GetUniqueID() == this->GetUniqueID()) return true; return false; } @@ -72,3 +72,10 @@ void AWaypointActor::UpdateScaleAndRotation() SetActorScale3D(FVector(1.f, S, S)); } +void AWaypointActor::Destroyed() +{ + if (IsValid(MiniWaypoint)) MiniWaypoint->RemoveFromParent(); + Super::Destroyed(); +} + + diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index a8957749..63538881 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -47,6 +47,8 @@ protected: UFUNCTION(BlueprintImplementableEvent) void UpdateVisibility(bool IsVisible); + void Destroyed() override; + public: // Sets default values for this actor's properties AWaypointActor(); From 53c64e90f4faea9e3f2b321e80a36b011f91deb2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 27 Nov 2023 00:12:45 +0000 Subject: [PATCH 32/44] Fixed Mini Waypoint Being Stuck to Center of Screen When Main Waypoint Spawns Behind Player --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index af04d0dd..173d1ed4 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68499c0acedf4bd43fa13b5244a3900ad9850ff62e15ac85b1e337859200d06d -size 654847 +oid sha256:ce3870108ae2fe9758eaa20ecb25f73f4623f2e9acad154d2075db2ca0fc1d0f +size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index 03a7b6be..679372cb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -20,8 +20,8 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) ArrowImage->SetRenderTransformAngle(TargetYaw - PlayerYaw); // Check if waypoint is outside of players vision frustum - if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) - { + if (FMath::IsNearlyZero(ScreenLoc.X) && FMath::IsNearlyZero(ScreenLoc.Y) && !FMath::IsNearlyZero(IconCanvasPanelSlot->GetPosition().X))//(FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) + { // Check if waypoint is closer to the players right bool TargetOnTheRight; if (PlayerYaw >= TargetYaw) From 3ac6ea3a2765984f9a06ee61ab9532622331ff84 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 00:43:10 +0000 Subject: [PATCH 33/44] Updated Inventory Component for Dropping of Items --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../Content/FirstPerson/Blueprints/BP_PC.uasset | 4 ++-- .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 3 ++- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 3 +++ .../Source/EndlessVendetta/Inventory/InventoryComponent.h | 8 ++++---- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 0fe23856..5badf30e 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:c3117b45f4b1be99dd1bd0cdd1cb1d167237a1105a9c1ce14bc1c6f15a095551 -size 58414 +oid sha256:06f7d267f6ba414ed498bc56b2186910a305a15dba88ea2d74a4601c84964150 +size 51069 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset index cf9c312e..efb68ec8 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d7d24aa46e86ffeb47791c341c30c4f33c5a475f33a822fc3aee599f0f6e481 -size 111954 +oid sha256:6989a8ccd556af587954b080e488056a6a2656b2f64ee3ba9e1d7008a1f7052d +size 112172 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 79a42a93..5538d8e4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -8,7 +8,8 @@ #include "InputActionValue.h" #include "Components/ArrowComponent.h" #include "GadgetSystem/GadgetManager.h" - +#include "Inventory/InventoryComponent.h" + #include "EndlessVendettaCharacter.generated.h" class UWeaponInventory; diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 1136b557..44eed2c0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -178,6 +178,9 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { + if (!IsValid(Item)) return; + if (!IsValid(Item->ItemActor)) return; + GetWorld()->SpawnActor(Item->ItemActor, &Location); } void UInventoryComponent::UpdateInventorySize(const int _Columns, const int _Rows) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index d60a9e45..e510717e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -48,20 +48,20 @@ public: UFUNCTION(BlueprintCallable, Category="Inventory") void Pickup(); UFUNCTION(BlueprintCallable, Category="Inventory") - bool IsRoomAvailable(class UBaseItem* Item, const int TopLeftIndex); + bool IsRoomAvailable(UBaseItem* Item, const int TopLeftIndex); UFUNCTION(BlueprintCallable, Category="Inventory") FInventoryTile IndexToTile(const int Index) const; TTuple GetItemAtIndex(const int Index); UFUNCTION(BlueprintCallable, Category="Inventory") int TileToIndex(const FInventoryTile InventoryTile) const; UFUNCTION(BlueprintCallable, Category="Inventory") - void AddItemAt(class UBaseItem* Item, const int TopLeftIndex); + void AddItemAt(UBaseItem* Item, const int TopLeftIndex); UFUNCTION(BlueprintCallable, Category="Inventory") TMap GetAllItems(); UFUNCTION(BlueprintCallable, Category="Inventory") - void RemoveItem(class UBaseItem* Item); + void RemoveItem(UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") - void SpawnItem(class UBaseItem* Item, FVector Location); + void SpawnItem(UBaseItem* Item, FVector Location); UFUNCTION(BlueprintCallable, Category = "Inventory") void UpdateInventorySize(const int _Columns, const int _Rows); From 05679cc334e1989001dd738bb1511f155bef8f27 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 01:10:36 +0000 Subject: [PATCH 34/44] Bugfix Able to Equip Rifle Before Pickup --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../Materials/M_Wood_Pine.uasset | 4 ++-- .../Materials/M_Wood_Walnut.uasset | 4 ++-- .../EndlessVendettaCharacter.cpp | 23 ++++++++++--------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 5fb874ed..68f6e73f 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:87aebe0b0ade2372a24d8570aa5634a1d111bfee7a657fb15631ce0569065b4f -size 60696 +oid sha256:b0a493fd95d8b0b43306329298c058cfa2f164ec071457bc575a8eafee95f1b1 +size 53936 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index eafee70c..fb828784 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 -size 31142 +oid sha256:196eb4590144ea90058b1a8b48d4662f2ba04302d4184e5e68698a3e715cc50e +size 29377 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2e926194..1d3466c4 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 -size 20495 +oid sha256:da10621d164f621c3c598d9d293d707a2879d7caf8c0525652a06b38323820f0 +size 20139 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 1b501f22..e0d1a789 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -306,17 +306,18 @@ void AEndlessVendettaCharacter::EquipPrimary() if (GadgetManager->IsValidCombatGadget() && GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) return; bHasRifle = true; - if(!bIsPrimaryWeaponCreated) - { - //Creating a new actor object called PrimaryWeapon that is based off primaryweaponClass - //Changing PrimaryWeaponActor to ABaseWeaponClass type instead of actor and storing it into PrimaryWeapon which is a ABaseClass Object - //We do this because we need to check if PrimaryWeapon is equipped and we want primaryweapon to be ABaseWeapon type and not a generic AActor - PrimaryWeaponActor = GetWorld()->SpawnActor(PrimaryWeaponClass, spawnParams); - PrimaryWeaponActor->AttachToComponent(Mesh1P, AttachmentRules, FName("GripPoint")); - PrimaryWeapon = Cast(PrimaryWeaponActor); - PrimaryWeapon->SetActorHiddenInGame(false); - bIsPrimaryWeaponCreated = true; - } + // if(!bIsPrimaryWeaponCreated) + // { + // //Creating a new actor object called PrimaryWeapon that is based off primaryweaponClass + // //Changing PrimaryWeaponActor to ABaseWeaponClass type instead of actor and storing it into PrimaryWeapon which is a ABaseClass Object + // //We do this because we need to check if PrimaryWeapon is equipped and we want primaryweapon to be ABaseWeapon type and not a generic AActor + // PrimaryWeaponActor = GetWorld()->SpawnActor(PrimaryWeaponClass, spawnParams); + // PrimaryWeaponActor->AttachToComponent(Mesh1P, AttachmentRules, FName("GripPoint")); + // PrimaryWeapon = Cast(PrimaryWeaponActor); + // PrimaryWeapon->SetActorHiddenInGame(false); + // bIsPrimaryWeaponCreated = true; + // } + if (!IsValid(PrimaryWeaponActor)) return; PrimaryWeaponActor->AttachToComponent(Mesh1P, AttachmentRules, FName("GripPoint")); PrimaryWeapon = Cast(PrimaryWeaponActor); PrimaryWeapon->SetActorHiddenInGame(false); From ce8a870eca4b1ffd935b99c7edb0db7a2f52af70 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 01:18:52 +0000 Subject: [PATCH 35/44] Updated Waypoint UI for More Readability Added Outline and Increased Size to 65 --- .../Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index cd5166a9..422cc68a 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deb3a67c2bba412bab8428522bf65087efd0927529eeafbb678dda460b6993ab -size 30376 +oid sha256:4e4ae871d6733efb0886ca57157da73fc25729f229891052238a7b280868e241 +size 31076 From e0ac8804c7a0fd3b8349776d4c4ea5543e04df11 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 01:22:00 +0000 Subject: [PATCH 36/44] Built Lighting for Training Facility --- .../Assets/Objects/Tutorial-Level/Bathroom/Button.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset | 4 ++-- .../Objects/Tutorial-Level/Bathroom/standardSurface5.uasset | 4 ++-- .../Objects/Tutorial-Level/Textures/Doors/M_Door.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/Drawers01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Bed01.uasset | 4 ++-- .../Objects/Tutorial-Level/Textures/M_BedroomTable01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset | 4 ++-- .../Objects/Tutorial-Level/Textures/M_WallMakeupMirror.uasset | 4 ++-- .../Textures/cofffee_table/coffee_table_re.uasset | 4 ++-- .../Tutorial-Level/Textures/side_table/side_table_bl.uasset | 4 ++-- .../ceiling_light_02/ceiling_light_02_orange.uasset | 4 ++-- .../lights_textures/lamp_01/lamp_01_orange.uasset | 4 ++-- .../lights_textures/wall_light_01/wall_light_01_orange.uasset | 4 ++-- .../lights_textures/wall_light_02/wall_light_02_orange.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset index a6aac258..65a7207b 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06c1d10c0ae9c282545d7cb0fa8e3f57c0422bfc013efddd9b862ed6b750cbf1 -size 8079 +oid sha256:21a66bc4ecba6a447e9ce09d811521d7bd090c6c2f654b75b8b3ce98f0ace7e0 +size 8183 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset index a2a6b046..d9f1dbfc 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52b1986a1e5fe508ca3c161423d2e991260fa229145719c32596b703020c9410 -size 8074 +oid sha256:cbe4fbd5b7cd1d3aa2d593172f4aea9b24eb55b8b8dc4ad50b7851c79ead648f +size 8160 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset index 64d89846..450f5337 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca3c45925c925cc4bb179a872a2cf157f76117fee5c192a7e3dfe93ff7e4f784 -size 8078 +oid sha256:c6735eac8475d462e5540b52e84f2bf5993f868d34525d1ed0455d5af8d86154 +size 8177 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset index b0314815..70be0713 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a3c1c643022c43b138f2a071856fb60c1df1c511c6e6c8862984a7010e002a1 -size 8095 +oid sha256:f4fafb2910aac47042d14ea8dbdaf2759df3830baf77441b2a80d49500116ea3 +size 8186 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset index fe5e845c..4522d479 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc55b1a8b638c9ccc397b98b396c092a0e084603e68bcd10fb1729379c47852b -size 8146 +oid sha256:03a02b4e3c5314371b631d2f9cd2a07b510649c74f81b030fce72f4d2cda5cf8 +size 8233 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset index 587c6cfc..4b489b9f 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:785ddd52d577ca4e0781a0d587f7695a0bb3a9832de221d94667ba39da4d4028 -size 17199 +oid sha256:a1b4e57a312a2bef79b66c25e466b53548417c5713244b656c20f0d3727585df +size 16971 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01.uasset index 1c3c332f..919d2237 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Drawers01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90d9a2918deb4b4ad5ed41d37d20de515f6638e61e41323495bc2057bce5f0db -size 12425 +oid sha256:7629dcbbd3272ade026dee57f5452b994b6486cb894d8b65c0b5e99082060686 +size 11860 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Bed01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Bed01.uasset index 4ee8c4c3..2dfb3f00 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Bed01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Bed01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb3f6fb43905dcc8fc61eeeccf6bdbda70d0e354893f867fe7a005c87a4b7ce3 -size 11059 +oid sha256:e894b4bf000e414cbec517e0ca9d790e8ab77553ebbd89255317c1083e870b1c +size 10954 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_BedroomTable01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_BedroomTable01.uasset index 7b30a9e0..c54ca99b 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_BedroomTable01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_BedroomTable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6f8887177400418cd843fdc5a08ba30b7267fb86435dad6fe5405fffb69778a -size 12232 +oid sha256:dbf97118169c64321dbf84a0166b26c155d26555d79d4a9a1c792f9235d2c941 +size 12220 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset index 372c7525..75787860 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0c03bea7638b90df30171066477cf6ea55b8320336f4770b18916b20a6689e2 -size 11875 +oid sha256:2975456aa4d76a453893d762a5defb1d9f7c2e0b63daafc21c80beb1b83aa00f +size 11938 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset index 3245e65a..9e45d989 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:591da916ae121f8e2b05185761a6bcf5f90c338c053fe2976e3f7d72f257ff1a -size 12748 +oid sha256:0e4e0cb4e12df5efd687f0cf4cc9d3a0fe9f99003941d2fb01a4f60d1ca4df42 +size 12455 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset index e9ebd93f..145a744c 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2330f49b7884bcb37b0444057ca92f6604bc5338cf58a93ac3ed41374d71e022 -size 23383 +oid sha256:10f8ff9bb69b8eae1396249b08950057d8781f04ab946dd0e6f6b3334352441d +size 23214 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset index 3380d8e9..5da1d43b 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:470637a8a325549aa35947a4907a1f1953f9ef9342e0933e85367bda6085e201 -size 12929 +oid sha256:8c1f79e160e18ac052b98dad16b07550870dc0767038e195e1fd07a64e1ac4a5 +size 12456 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallMakeupMirror.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallMakeupMirror.uasset index 069d37fc..193bc674 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallMakeupMirror.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallMakeupMirror.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc30b030e1ff59ccfe148c36c40cbaca4c27a31bc77d4d2a71e4d3acf2a3c0f2 -size 12041 +oid sha256:2661a2179832ef7b095bec0ae5f41a5dbfa2ce24b23631c4185636011e7431ed +size 12107 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset index 252e8824..3473b382 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7ba458826c92d3855a28c829f437cc675747694e85c87ec8214670482970d63 -size 12880 +oid sha256:7c70ed20905afd7e4d88af08b0f900cda21dc677196659f4084fa3ceb2652e87 +size 12631 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset index 0e977629..79a98393 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5e40ef0a58475637cefa57e6b71cdbc3169e333f01a0dd82226621dbdd41353 -size 12933 +oid sha256:3260108887796881f73d51d52851ec990b81321f8935cb5b4e6f8a59cbb03a6c +size 12575 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset index b1382af5..2cfa2ea7 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c92bebc7db09fbb27c03761f6af0dd62ce8ca17452f00bbe0cabd323d2ee445 -size 12940 +oid sha256:40b5fa893ba058fba4bbbcc55af1a80f72af0bc6f24bcaa118634848fd3e08fc +size 9255 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset index dc4e5627..46516ec7 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9fcef7a201c488bc9cd8f9813a4cfc3fa3676a208165a89b2283535f7ff1791 -size 14872 +oid sha256:5e3fe2ce162a05c25b545b6ec3489b9c7088fdc176b9e6fd5520e717fea35837 +size 14553 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset index 55d2c399..8f1586b6 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2295e68c48bd267787b230f5c29c8a0ce8086be23137fad2991c1c271512b305 -size 13778 +oid sha256:3abc44476c766a3adcd1188a68c774fb4fbb31b0c03eada84db4568c7761edf1 +size 13425 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset index ca007ade..e44350f8 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07348e8c5c9dea07f9098309510423d0e3b4d8ffa0127dbc4abbb11384c75244 -size 12531 +oid sha256:5e851b9132cf9ff85f9cbf814b90d8b61d4bda99f391dbcdef3149221fb1d5ef +size 12406 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 173d1ed4..171f313e 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce3870108ae2fe9758eaa20ecb25f73f4623f2e9acad154d2075db2ca0fc1d0f -size 654898 +oid sha256:608252d7d0a1f02025028a75cf40e94fe7c2b7d1d0818bb27a765d2565984e1a +size 702656 From 1707d13fb9f4f8d28a2cd36fe1d4aafb1acc40de Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 09:41:18 +0000 Subject: [PATCH 37/44] Add Base Telemetry Triggers --- EndlessVendetta/Content/BP_Telemetry.uasset | 3 ++ .../FirstPerson/GunMechanicWorld.uasset | 4 +-- .../Content/Levels/NewMiamiTemp.umap | 4 +-- .../Content/Levels/TrainingFacility.umap | 4 +-- .../Source/EndlessVendetta/AI/AICharacter.cpp | 4 +-- .../BountySystem/CheckpointClass.h | 21 +++++++----- .../EndlessVendetta/EndlessVendetta.Build.cs | 3 +- .../EndlessVendettaCharacter.cpp | 3 ++ .../Source/EndlessVendetta/Telemetry.cpp | 29 ++++++++++++++++ .../Source/EndlessVendetta/Telemetry.h | 33 +++++++++++++++++++ .../WeaponSystem/BaseWeaponClass.cpp | 2 ++ 11 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 EndlessVendetta/Content/BP_Telemetry.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/Telemetry.h diff --git a/EndlessVendetta/Content/BP_Telemetry.uasset b/EndlessVendetta/Content/BP_Telemetry.uasset new file mode 100644 index 00000000..efc6e5c2 --- /dev/null +++ b/EndlessVendetta/Content/BP_Telemetry.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39a587c7f8452e17e2dd4dfccdcc3a0a7a81f2388d937de51f388fbfc53cbd30 +size 19076 diff --git a/EndlessVendetta/Content/FirstPerson/GunMechanicWorld.uasset b/EndlessVendetta/Content/FirstPerson/GunMechanicWorld.uasset index 921b01db..5f3a461d 100644 --- a/EndlessVendetta/Content/FirstPerson/GunMechanicWorld.uasset +++ b/EndlessVendetta/Content/FirstPerson/GunMechanicWorld.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f01d66661ebe4dc7038e9105e8c156e3186fdaeafea8e59cfbcbc7dde0741029 -size 19619 +oid sha256:d6148c27e76119507665e2b58c6032c998ffa701c31a41b362657aae54b7bb7f +size 19805 diff --git a/EndlessVendetta/Content/Levels/NewMiamiTemp.umap b/EndlessVendetta/Content/Levels/NewMiamiTemp.umap index 3b8d0ca0..d389e5d4 100644 --- a/EndlessVendetta/Content/Levels/NewMiamiTemp.umap +++ b/EndlessVendetta/Content/Levels/NewMiamiTemp.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3006f6fb9769c48880863300d73a5a8b6fff1ea6b8e64ca2d115c3a66e33735f -size 105819 +oid sha256:e9b04249156c82a982a6709531a4d3d339a1ddbdbad27f8d1192cd2588a3ff63 +size 119033 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 8a7ef9a0..80da3632 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9570ebbe70165da7d1c1cf54047bdb8b6e76905568015ff38ec3eeb5d283b66b -size 652471 +oid sha256:3d2e06d8fefe6182b8454bd1ef944882ea40c6e77bf74fe0ae999cb0b6c023af +size 652470 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp index 6a2debfc..8c91d7f5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp @@ -3,14 +3,13 @@ #include "AICharacter.h" -#include "AI_EnemyController.h" #include "Components/CapsuleComponent.h" #include "Engine/DamageEvents.h" #include "GameFramework/CharacterMovementComponent.h" #include "Perception/AIPerceptionStimuliSourceComponent.h" #include "Perception/AISense_Sight.h" #include "BehaviorTree/BlackboardComponent.h" -#include "Blueprint/AIBlueprintHelperLibrary.h" +#include "../Telemetry.h" // Sets default values @@ -100,4 +99,5 @@ void AAICharacter::OnDeath() } SetLifeSpan(30.0f); + Cast(GetWorld()->GetGameState())->SendEvent("kill", ""); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 2797e996..09fe069e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -5,6 +5,7 @@ #include "CoreMinimal.h" #include "WaypointActor.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" +#include "EndlessVendetta/Telemetry.h" #include "GameFramework/Actor.h" #include "CheckpointClass.generated.h" @@ -32,11 +33,11 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor AWaypointActor* WaypointActor; // ---------------------------------------- protected: - UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() { CompletedCheckpoint.Broadcast(); + Cast(GetWorld()->GetGameState())->SendEvent("Check", CheckpointTip); } UFUNCTION(BlueprintCallable) @@ -45,7 +46,7 @@ protected: virtual void BeginPlay() override; virtual void Destroyed() override; - + public: FCompletedCheckpoint CompletedCheckpoint; @@ -55,37 +56,39 @@ public: void SpawnWaypoint(); UFUNCTION(BlueprintImplementableEvent) - void CheckpointActivated(); + void CheckpointActivated(); // ------ Getters for CP Properties ------ FString GetCheckpointDesc() { return CheckpointDescription; } + FString GetCheckpointTip() { return CheckpointTip; } + FVector GetWaypointLoc() { return WaypointLoc; } + UTexture2D* GetWaypointIcon() { return WaypointIcon; } + FTransform GetCheckpointSpawnTransform() { return CheckpointSpawnTransform; } + // --------------------------------------- - + // Sets default values for this actor's properties ACheckpointClass(); - + // Called every frame - virtual void Tick(float DeltaTime) override; - - - + virtual void Tick(float DeltaTime) override; }; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendetta.Build.cs b/EndlessVendetta/Source/EndlessVendetta/EndlessVendetta.Build.cs index 3149aa96..619c70e9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendetta.Build.cs +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendetta.Build.cs @@ -11,7 +11,8 @@ public class EndlessVendetta : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay", "EnhancedInput", "AIModule", - "GameplayTasks", "NavigationSystem", "UMG", "Slate", "SlateCore", "Niagara", "NiagaraCore", "NiagaraShader" + "GameplayTasks", "NavigationSystem", "UMG", "Slate", "SlateCore", "Niagara", "NiagaraCore", "NiagaraShader", + "HTTP", "Json", "JsonUtilities" }); } } \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index e0d1a789..a2dcae5d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -7,6 +7,7 @@ #include "EnhancedInputComponent.h" #include "EnhancedInputSubsystems.h" #include "InteractionInterface.h" +#include "Telemetry.h" #include "AI/EnemyCharacter.h" #include "Engine/DamageEvents.h" #include "GameFramework/CharacterMovementComponent.h" @@ -292,6 +293,7 @@ void AEndlessVendettaCharacter::EquipPrimary() PrimaryWeapon = nullptr; bHasRifle = false; GLog->Log("Primary Weapon Put Away"); + Cast(GetWorld()->GetGameState())->SendEvent("DeEquip", "Pri"); return; } if(bIsWeaponPickedUp) @@ -318,6 +320,7 @@ void AEndlessVendettaCharacter::EquipPrimary() // bIsPrimaryWeaponCreated = true; // } if (!IsValid(PrimaryWeaponActor)) return; + Cast(GetWorld()->GetGameState())->SendEvent("Equip", "Pri"); PrimaryWeaponActor->AttachToComponent(Mesh1P, AttachmentRules, FName("GripPoint")); PrimaryWeapon = Cast(PrimaryWeaponActor); PrimaryWeapon->SetActorHiddenInGame(false); diff --git a/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp b/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp new file mode 100644 index 00000000..c5be1f28 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp @@ -0,0 +1,29 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "Telemetry.h" +#include "Misc/Guid.h" + +void ATelemetry::SendEvent(FString EventKey, FString EventData) +{ + const FString EventID = FGuid::NewGuid().ToString(); + const FString EventTime = FDateTime::Now().ToString(); + const auto Request = FHttpModule::Get().CreateRequest(); + Request->SetURL(TelemetryURLEvents); + Request->SetVerb("POST"); + Request->SetHeader("Content-Type", "application/json"); + Request->SetHeader("Accept", "application/json"); + Request->SetContentAsString( "{\"SessionID\":\"" + SessionID + "\",\"PlayerGUID\":\"" + PlayerGUID + "\",\"EventID\":\"" + EventID + "\",\"Timestamp\":\"" + EventTime + "\",\"EventKey\":\"" + EventKey + "\",\"EventData\":\"" + EventData + "\"}" ); + Request->OnProcessRequestComplete().BindLambda([](FHttpRequestPtr request, FHttpResponsePtr response, bool success) + { + GLog->Log("Telemetry Event Response: " + response->GetContentAsString()); + }); + Request->ProcessRequest(); +} + +void ATelemetry::BeginPlay() +{ + Super::BeginPlay(); + SessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); + SendEvent("start", ""); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/Telemetry.h b/EndlessVendetta/Source/EndlessVendetta/Telemetry.h new file mode 100644 index 00000000..15cbdc69 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/Telemetry.h @@ -0,0 +1,33 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/GameState.h" +#include "Http.h" +#include "Telemetry.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API ATelemetry : public AGameState +{ + GENERATED_BODY() + +public: + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString TelemetryURLEvents = "https://ev.api.philipwhite.dev/api/event"; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString TelemetryURLUsers = "https://ev.api.philipwhite.dev/api/user"; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString SessionID = "AAAAA"; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString PlayerGUID = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; + + UFUNCTION(BlueprintCallable, Category = "Telemetry") + void SendEvent(FString EventKey, FString EventData); + +protected: + virtual void BeginPlay() override; +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index deb98237..8199182c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -7,6 +7,7 @@ #include "EndlessVendetta/EndlessVendettaCharacter.h" #include "Kismet/KismetMathLibrary.h" #include "Components/CapsuleComponent.h" +#include "EndlessVendetta/Telemetry.h" #include "Kismet/GameplayStatics.h" #include "Engine/DamageEvents.h" #include "EndlessVendetta/AI/EnemyCharacter.h" @@ -242,6 +243,7 @@ void ABaseWeaponClass::Interact() { if(!IsValid(this)) return; endlessVendettaChar->WeaponSwitcher(this); + Cast(GetWorld()->GetGameState())->SendEvent("pickup", ""); } void ABaseWeaponClass::InteractPrompt() From e928131d89e8fdebb83b02fdbeb28eb1ba3fc2a8 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 09:55:49 +0000 Subject: [PATCH 38/44] Update Exit Telemetry --- .../BountySimulation/CP_EnterBountySimulationFacility.uasset | 4 ++-- .../BountySimulation/CP_ExitBountySimulationFacility.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index 597ba32f..5c135c06 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb5d6652ffbeb2dffe9d2c7bf7250396d62c63f29b58fafce029a1ee444d976a -size 74754 +oid sha256:985680b85d426c26cf6b12a0ec3eaddf71c4a2e8f9135a08855016daca429e37 +size 83257 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset index 82b10472..b0bb11dc 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f20d01e14668043ceba3f5121d5441f9b10bf53ae9b329a67bc52ca2c23abe5 -size 50569 +oid sha256:3969ee3ade0537148800a825bbb2817a35eddc0a241c58c433225333bd00f8ca +size 61123 From e7e9918dafefcd16e2c3df6359592b1a621d0a77 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 09:59:49 +0000 Subject: [PATCH 39/44] Update Start Telemetry in Training Facility --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 80da3632..04e31452 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d2e06d8fefe6182b8454bd1ef944882ea40c6e77bf74fe0ae999cb0b6c023af -size 652470 +oid sha256:2f104c3ecddd393f3a1b59b11aa92449399de5dce9422963e3cf429f6e3913e6 +size 676088 diff --git a/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp b/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp index c5be1f28..196fcc0c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp @@ -25,5 +25,4 @@ void ATelemetry::BeginPlay() { Super::BeginPlay(); SessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); - SendEvent("start", ""); } From 80912566d31ecd0eadf45cd213241a7769b3550e Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 11:48:15 +0000 Subject: [PATCH 40/44] Bugfix Creating Invaild Sessions on Startup --- .../Content/BountySystem/Waypoint/TextBackground.uasset | 3 +++ .../Content/BountySystem/Waypoint/WaypointArrow.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset new file mode 100644 index 00000000..c80f44a0 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c06aa560dd0dffcca87ab60abe3a290e98e28c94ef52e58338c9e985c83d1ac0 +size 1854378 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset index efc268bd..9075ef38 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd99b04a977e5fa33f966683ec783006f1289b9ea7cb856f646aafc057293fe6 -size 33619 +oid sha256:2884feab6896eaaf2cdd9e4333c02587c758c7a64f64dd69a216e8e8b5690afe +size 33714 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 04e31452..46e115df 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f104c3ecddd393f3a1b59b11aa92449399de5dce9422963e3cf429f6e3913e6 -size 676088 +oid sha256:c602b7e79cb2817cd4a3b4d56b2f94aaa68984977abf3d3eb777960dab8f0e89 +size 679799 From 61018a044dc924b5019d52216c4c4e1b65214e1c Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 27 Nov 2023 13:25:20 +0000 Subject: [PATCH 41/44] Migrated Telemetry To GameMode --- EndlessVendetta/Config/DefaultEngine.ini | 2 +- EndlessVendetta/Content/BP_Telemetry.uasset | 3 --- .../CP_EnterBountySimulationFacility.uasset | 4 ++-- .../CP_ExitBountySimulationFacility.uasset | 4 ++-- .../Blueprints/WBP_Crosshair.uasset | 4 ++-- .../Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/AI/AICharacter.cpp | 3 ++- .../BountySystem/CheckpointClass.h | 3 ++- .../EndlessVendettaCharacter.cpp | 5 ++-- .../EndlessVendettaGameMode.cpp | 24 +++++++++++++++++++ .../EndlessVendetta/EndlessVendettaGameMode.h | 15 ++++++++++++ .../WeaponSystem/BaseWeaponClass.cpp | 3 ++- 12 files changed, 57 insertions(+), 17 deletions(-) delete mode 100644 EndlessVendetta/Content/BP_Telemetry.uasset diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index 505db906..a3178012 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -70,7 +70,7 @@ bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance GameDefaultMap=/Game/Levels/TrainingFacility.TrainingFacility ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Game/FirstPerson/GunMechanicWorld.GunMechanicWorld_C +GlobalDefaultGameMode=/Script/EndlessVendetta.EndlessVendettaGameMode GlobalDefaultServerGameMode=None [/Script/Engine.RendererSettings] diff --git a/EndlessVendetta/Content/BP_Telemetry.uasset b/EndlessVendetta/Content/BP_Telemetry.uasset deleted file mode 100644 index efc6e5c2..00000000 --- a/EndlessVendetta/Content/BP_Telemetry.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39a587c7f8452e17e2dd4dfccdcc3a0a7a81f2388d937de51f388fbfc53cbd30 -size 19076 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index 5c135c06..537c3b62 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:985680b85d426c26cf6b12a0ec3eaddf71c4a2e8f9135a08855016daca429e37 -size 83257 +oid sha256:cb422b19b15ab7568686c196a6f8344053589c94ab572025195f6a31ed6e2a7a +size 83208 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset index b0bb11dc..16ed3897 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3969ee3ade0537148800a825bbb2817a35eddc0a241c58c433225333bd00f8ca -size 61123 +oid sha256:a95afab359651372dc7a4b610c26acdceee19e660d3e0a1036eecc5e9dc081ba +size 59234 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset index a0727e89..939e70d9 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deaa5ca564990b06d573f4a3bb575a3f2a439d3b7516e30b5b389d5a82f80ad0 -size 61358 +oid sha256:13ff21aa89e2ded711aff8ee6617abc2d565d222c39ce3878969fdfe44d5a81f +size 75992 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 46e115df..cbe7aa20 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c602b7e79cb2817cd4a3b4d56b2f94aaa68984977abf3d3eb777960dab8f0e89 -size 679799 +oid sha256:87523c2b8607590648fb1ad88b98e94617e34faa25375af04116b01388bdbda2 +size 679514 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp index 8c91d7f5..c95a5e7e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp @@ -10,6 +10,7 @@ #include "Perception/AISense_Sight.h" #include "BehaviorTree/BlackboardComponent.h" #include "../Telemetry.h" +#include // Sets default values @@ -99,5 +100,5 @@ void AAICharacter::OnDeath() } SetLifeSpan(30.0f); - Cast(GetWorld()->GetGameState())->SendEvent("kill", ""); + Cast(GetWorld()->GetAuthGameMode())->SendEvent("kill", ""); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 09fe069e..854d8588 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -7,6 +7,7 @@ #include "EndlessVendetta/EndlessVendettaCharacter.h" #include "EndlessVendetta/Telemetry.h" #include "GameFramework/Actor.h" +#include #include "CheckpointClass.generated.h" DECLARE_DYNAMIC_MULTICAST_DELEGATE(FCompletedCheckpoint); @@ -37,7 +38,7 @@ protected: void BroadcastCompletion() { CompletedCheckpoint.Broadcast(); - Cast(GetWorld()->GetGameState())->SendEvent("Check", CheckpointTip); + Cast(GetWorld()->GetAuthGameMode())->SendEvent("Check", CheckpointTip); } UFUNCTION(BlueprintCallable) diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index a2dcae5d..30287f35 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -14,6 +14,7 @@ #include "Kismet/GameplayStatics.h" #include "GameFramework/MovementComponent.h" #include "Inventory/InventoryComponent.h" +#include "EndlessVendettaGameMode.h" ////////////////////////////////////////////////////////////////////////// @@ -293,7 +294,7 @@ void AEndlessVendettaCharacter::EquipPrimary() PrimaryWeapon = nullptr; bHasRifle = false; GLog->Log("Primary Weapon Put Away"); - Cast(GetWorld()->GetGameState())->SendEvent("DeEquip", "Pri"); + Cast(GetWorld()->GetAuthGameMode())->SendEvent("DeEquip", "Pri"); return; } if(bIsWeaponPickedUp) @@ -320,7 +321,7 @@ void AEndlessVendettaCharacter::EquipPrimary() // bIsPrimaryWeaponCreated = true; // } if (!IsValid(PrimaryWeaponActor)) return; - Cast(GetWorld()->GetGameState())->SendEvent("Equip", "Pri"); + Cast(GetWorld()->GetAuthGameMode())->SendEvent("Equip", "Pri"); PrimaryWeaponActor->AttachToComponent(Mesh1P, AttachmentRules, FName("GripPoint")); PrimaryWeapon = Cast(PrimaryWeaponActor); PrimaryWeapon->SetActorHiddenInGame(false); diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp index bbba7bcd..9390d136 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp @@ -7,6 +7,7 @@ #include "EndlessVendetta/AI/AIControlHub.h" #include "Kismet/GameplayStatics.h" #include "Engine/DamageEvents.h" +#include "Misc/Guid.h" AEndlessVendettaGameMode::AEndlessVendettaGameMode() : Super() { @@ -38,3 +39,26 @@ void AEndlessVendettaGameMode::SetLocalAIAlertLevel(int NewAlertLevel) AIControlHub->SetAlertLevel(NewAlertLevel); } } + +void AEndlessVendettaGameMode::SendEvent(FString EventKey, FString EventData) +{ + const FString EventID = FGuid::NewGuid().ToString(); + const FString EventTime = FDateTime::Now().ToString(); + const auto Request = FHttpModule::Get().CreateRequest(); + Request->SetURL(TelemetryURLEvents); + Request->SetVerb("POST"); + Request->SetHeader("Content-Type", "application/json"); + Request->SetHeader("Accept", "application/json"); + Request->SetContentAsString("{\"SessionID\":\"" + SessionID + "\",\"PlayerGUID\":\"" + PlayerGUID + "\",\"EventID\":\"" + EventID + "\",\"Timestamp\":\"" + EventTime + "\",\"EventKey\":\"" + EventKey + "\",\"EventData\":\"" + EventData + "\"}"); + Request->OnProcessRequestComplete().BindLambda([](FHttpRequestPtr request, FHttpResponsePtr response, bool success) + { + GLog->Log("Telemetry Event Response: " + response->GetContentAsString()); + }); + Request->ProcessRequest(); +} + +void AEndlessVendettaGameMode::BeginPlay() +{ + Super::BeginPlay(); + SessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h index 420ab589..a5fb31f5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "GameFramework/GameModeBase.h" +#include "Http.h" #include "EndlessVendettaGameMode.generated.h" UCLASS(minimalapi) @@ -19,4 +20,18 @@ public: UFUNCTION(Exec, Category = ExecFunctions) void SetLocalAIAlertLevel(int NewAlertLevel); + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString TelemetryURLEvents = "https://ev.api.philipwhite.dev/api/event"; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString TelemetryURLUsers = "https://ev.api.philipwhite.dev/api/user"; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Instanced, Category = "Telemetry") + FString SessionID = "AAAAA"; + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString PlayerGUID = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; + + UFUNCTION(BlueprintCallable, Category = "Telemetry") + void SendEvent(FString EventKey, FString EventData); + + virtual void BeginPlay() override; }; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 8199182c..d5069806 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -11,6 +11,7 @@ #include "Kismet/GameplayStatics.h" #include "Engine/DamageEvents.h" #include "EndlessVendetta/AI/EnemyCharacter.h" +#include // Sets default values @@ -243,7 +244,7 @@ void ABaseWeaponClass::Interact() { if(!IsValid(this)) return; endlessVendettaChar->WeaponSwitcher(this); - Cast(GetWorld()->GetGameState())->SendEvent("pickup", ""); + Cast(GetWorld()->GetAuthGameMode())->SendEvent("pickup", ""); } void ABaseWeaponClass::InteractPrompt() From d34b52f972c50f983cadb6dc7df54b23279e98f1 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Tue, 28 Nov 2023 03:36:27 +0000 Subject: [PATCH 42/44] Add GameInstance for Global Session ID --- EndlessVendetta/Config/DefaultEngine.ini | 2 +- .../Content/Levels/TrainingFacility.umap | 4 +-- .../Source/EndlessVendetta/AI/AICharacter.cpp | 1 - .../BountySystem/CheckpointClass.h | 1 - .../Source/EndlessVendetta/EVGameInstance.cpp | 32 ++++++++++++++++++ .../Source/EndlessVendetta/EVGameInstance.h | 28 ++++++++++++++++ .../EndlessVendettaCharacter.cpp | 1 - .../EndlessVendettaGameMode.cpp | 3 +- .../EndlessVendetta/EndlessVendettaGameMode.h | 4 +-- .../Source/EndlessVendetta/Telemetry.cpp | 28 ---------------- .../Source/EndlessVendetta/Telemetry.h | 33 ------------------- .../WeaponSystem/BaseWeaponClass.cpp | 1 - 12 files changed, 67 insertions(+), 71 deletions(-) create mode 100644 EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h delete mode 100644 EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp delete mode 100644 EndlessVendetta/Source/EndlessVendetta/Telemetry.h diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index a3178012..18ee5e14 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -67,7 +67,7 @@ TwoPlayerSplitscreenLayout=Horizontal ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False -GameInstanceClass=/Script/Engine.GameInstance +GameInstanceClass=/Script/EndlessVendetta.EVGameInstance GameDefaultMap=/Game/Levels/TrainingFacility.TrainingFacility ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Script/EndlessVendetta.EndlessVendettaGameMode diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index cbe7aa20..19053416 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87523c2b8607590648fb1ad88b98e94617e34faa25375af04116b01388bdbda2 -size 679514 +oid sha256:9085d76489c04f7d273f580154acee8bbe53b285514f36e2770d3be3e9407730 +size 679662 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp index c95a5e7e..fb600020 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AICharacter.cpp @@ -9,7 +9,6 @@ #include "Perception/AIPerceptionStimuliSourceComponent.h" #include "Perception/AISense_Sight.h" #include "BehaviorTree/BlackboardComponent.h" -#include "../Telemetry.h" #include diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 854d8588..a414a61d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -5,7 +5,6 @@ #include "CoreMinimal.h" #include "WaypointActor.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" -#include "EndlessVendetta/Telemetry.h" #include "GameFramework/Actor.h" #include #include "CheckpointClass.generated.h" diff --git a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp new file mode 100644 index 00000000..bdaaddab --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp @@ -0,0 +1,32 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "EVGameInstance.h" + +void UEVGameInstance::OnStart() +{ + Super::OnStart(); + GlobalSessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); + IsValidSessionID(GlobalSessionID); +} + +void UEVGameInstance::IsValidSessionID(const FString& SessionID) +{ + const auto Request = FHttpModule::Get().CreateRequest(); + Request->SetURL("https://ev.api.philipwhite.dev/api/session/" + SessionID); + Request->SetVerb("GET"); + Request->OnProcessRequestComplete().BindUObject(this, &UEVGameInstance::OnResponseReceived); + Request->ProcessRequest(); +} + +void UEVGameInstance::OnResponseReceived(FHttpRequestPtr Request, FHttpResponsePtr Response, bool bConnectedSuccessfully) +{ + if (Response->GetResponseCode() == 200) + { + GLog->Log("Session ID Exists Regenerating"); + GlobalSessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); + IsValidSessionID(GlobalSessionID); + return; + } + GLog->Log("Session ID is Valid"); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h new file mode 100644 index 00000000..ec749839 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h @@ -0,0 +1,28 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Engine/GameInstance.h" +#include "Http.h" +#include "EVGameInstance.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API UEVGameInstance : public UGameInstance +{ + GENERATED_BODY() + +public: + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") + FString GlobalSessionID = "AAAAA"; + +protected: + virtual void OnStart() override; + +private: + void IsValidSessionID(const FString& SessionID); + void OnResponseReceived(FHttpRequestPtr Request, FHttpResponsePtr Response, bool bConnectedSuccessfully); +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 30287f35..04a8f415 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -7,7 +7,6 @@ #include "EnhancedInputComponent.h" #include "EnhancedInputSubsystems.h" #include "InteractionInterface.h" -#include "Telemetry.h" #include "AI/EnemyCharacter.h" #include "Engine/DamageEvents.h" #include "GameFramework/CharacterMovementComponent.h" diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp index 9390d136..744fe187 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.cpp @@ -2,6 +2,7 @@ #include "EndlessVendettaGameMode.h" #include "EndlessVendettaCharacter.h" +#include "EVGameInstance.h" #include "UObject/ConstructorHelpers.h" #include "EndlessVendetta/AI/EnemyCharacter.h" #include "EndlessVendetta/AI/AIControlHub.h" @@ -60,5 +61,5 @@ void AEndlessVendettaGameMode::SendEvent(FString EventKey, FString EventData) void AEndlessVendettaGameMode::BeginPlay() { Super::BeginPlay(); - SessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); + SessionID = Cast(GetGameInstance())->GlobalSessionID; } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h index a5fb31f5..5d015623 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaGameMode.h @@ -14,7 +14,7 @@ class AEndlessVendettaGameMode : public AGameModeBase public: AEndlessVendettaGameMode(); - + UFUNCTION(Exec, Category = ExecFunctions) void KillAllEnemies(); @@ -25,7 +25,7 @@ public: FString TelemetryURLEvents = "https://ev.api.philipwhite.dev/api/event"; UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") FString TelemetryURLUsers = "https://ev.api.philipwhite.dev/api/user"; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Instanced, Category = "Telemetry") + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") FString SessionID = "AAAAA"; UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") FString PlayerGUID = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; diff --git a/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp b/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp deleted file mode 100644 index 196fcc0c..00000000 --- a/EndlessVendetta/Source/EndlessVendetta/Telemetry.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "Telemetry.h" -#include "Misc/Guid.h" - -void ATelemetry::SendEvent(FString EventKey, FString EventData) -{ - const FString EventID = FGuid::NewGuid().ToString(); - const FString EventTime = FDateTime::Now().ToString(); - const auto Request = FHttpModule::Get().CreateRequest(); - Request->SetURL(TelemetryURLEvents); - Request->SetVerb("POST"); - Request->SetHeader("Content-Type", "application/json"); - Request->SetHeader("Accept", "application/json"); - Request->SetContentAsString( "{\"SessionID\":\"" + SessionID + "\",\"PlayerGUID\":\"" + PlayerGUID + "\",\"EventID\":\"" + EventID + "\",\"Timestamp\":\"" + EventTime + "\",\"EventKey\":\"" + EventKey + "\",\"EventData\":\"" + EventData + "\"}" ); - Request->OnProcessRequestComplete().BindLambda([](FHttpRequestPtr request, FHttpResponsePtr response, bool success) - { - GLog->Log("Telemetry Event Response: " + response->GetContentAsString()); - }); - Request->ProcessRequest(); -} - -void ATelemetry::BeginPlay() -{ - Super::BeginPlay(); - SessionID = FGuid::NewGuid().ToString().Left(5).ToUpper(); -} diff --git a/EndlessVendetta/Source/EndlessVendetta/Telemetry.h b/EndlessVendetta/Source/EndlessVendetta/Telemetry.h deleted file mode 100644 index 15cbdc69..00000000 --- a/EndlessVendetta/Source/EndlessVendetta/Telemetry.h +++ /dev/null @@ -1,33 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameState.h" -#include "Http.h" -#include "Telemetry.generated.h" - -/** - * - */ -UCLASS() -class ENDLESSVENDETTA_API ATelemetry : public AGameState -{ - GENERATED_BODY() - -public: - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") - FString TelemetryURLEvents = "https://ev.api.philipwhite.dev/api/event"; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") - FString TelemetryURLUsers = "https://ev.api.philipwhite.dev/api/user"; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") - FString SessionID = "AAAAA"; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Telemetry") - FString PlayerGUID = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; - - UFUNCTION(BlueprintCallable, Category = "Telemetry") - void SendEvent(FString EventKey, FString EventData); - -protected: - virtual void BeginPlay() override; -}; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index d5069806..6ebc5b94 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -7,7 +7,6 @@ #include "EndlessVendetta/EndlessVendettaCharacter.h" #include "Kismet/KismetMathLibrary.h" #include "Components/CapsuleComponent.h" -#include "EndlessVendetta/Telemetry.h" #include "Kismet/GameplayStatics.h" #include "Engine/DamageEvents.h" #include "EndlessVendetta/AI/EnemyCharacter.h" From 25edfbb40d916efc591ccb388af39b7f19d4753d Mon Sep 17 00:00:00 2001 From: KACPER SZELEST Date: Thu, 30 Nov 2023 09:19:30 +0000 Subject: [PATCH 43/44] Updated read.me --- readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e6e97760..f3e7cd71 100644 --- a/readme.md +++ b/readme.md @@ -4,4 +4,8 @@ -Icons by [Icons8](https://icons8.com/) \ No newline at end of file +Icons by [Icons8](https://icons8.com/) + +## Design Doc +https://docs.google.com/presentation/d/18K_XKPOnZg56S7NocoEVEdA8lVHvtSVWkflCJFtDmsE/edit?usp=sharing + From 010f39f1a1c735853dbb275fd0404178d39732b5 Mon Sep 17 00:00:00 2001 From: KACPER SZELEST Date: Thu, 30 Nov 2023 09:21:19 +0000 Subject: [PATCH 44/44] Updated read.me added the script --- readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.md b/readme.md index f3e7cd71..aeaae7ea 100644 --- a/readme.md +++ b/readme.md @@ -9,3 +9,6 @@ Icons by [Icons8](https://icons8.com/) ## Design Doc https://docs.google.com/presentation/d/18K_XKPOnZg56S7NocoEVEdA8lVHvtSVWkflCJFtDmsE/edit?usp=sharing +## Endless Vendetta Script +https://docs.google.com/document/d/1MvQ3F871koZ53Iz9kEm1RQPiGyirKYcUlOa3ygn4et8/edit?usp=sharing +