From 162d9c85a4e526a903af8fd1e51a560a546ab03d Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 3 Feb 2024 16:00:11 +0000 Subject: [PATCH 01/11] Setup Pause Menu Input --- .../.idea.EndlessVendetta/.idea/workspace.xml | 26 ++++++++++------- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 +-- .../Input/Actions/IA_PauseMenu.uasset | 3 ++ .../FirstPerson/Input/IMC_Default.uasset | 4 +-- .../Content/Levels/MainMenuLevel.umap | 4 +-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../BountySystem/BountyDirector.cpp | 8 ++--- .../Characters/BountyHunterCharacter.cpp | 29 ++++++++++++++++++- .../Characters/BountyHunterCharacter.h | 14 +++++++++ .../Characters/MyVICharacterBase.cpp | 1 + .../EndlessVendettaCharacter.cpp | 16 ++++++---- .../EndlessVendettaCharacter.h | 7 +++-- 12 files changed, 87 insertions(+), 31 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Input/Actions/IA_PauseMenu.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 3a72e6ff..1de7075c 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,14 +8,17 @@ - + + + - - - - - + + + + + + - { + "keyToString": { + "C++ Project.EndlessVendetta.executor": "Run", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "PauseMenu", + "ignore.virus.scanning.warn.message": "true", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" }, - "keyToStringList": { - "rider.external.source.directories": [ - "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache", - "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache", - "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src" + "keyToStringList": { + "rider.external.source.directories": [ + "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache", + "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache", + "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src" ] } -}]]> +} diff --git a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset index 6891d70e..374830ac 100644 --- a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset +++ b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad835c5a96e5af4cdf7871ccb3a74e336cf83ef1f3eb8b0171ffdb88dcab7d50 -size 128279 +oid sha256:4f1ff7c7f40bfa0e911df326f08ba112a5998828ea779bc214af84f795f2d68a +size 118103 diff --git a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset new file mode 100644 index 00000000..4fc01cf4 --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb8f4c9f8b54f6f6bf65b0d41ff7f1ea5c8a9c25e494a0ceae061faa431279f9 +size 6023064 diff --git a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.wav b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.wav new file mode 100644 index 00000000..775da37b --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:decb88fc3a4aa3cb116c5e9d44ce516f241d1ac9752f5e463af941cd42393f81 +size 7534184 diff --git a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3_Cue.uasset b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3_Cue.uasset new file mode 100644 index 00000000..ede7d79a --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3_Cue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6abfcdb46a942964ebf8d8c611d978447511c8d048a7e1dca9615525f9e93ce +size 5262 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..56a9fbe5 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:466c723985861da68aa9ea25153ae0068833dd6159178b0c033d0f814a8cd6f5 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 86db413e..c5c3b84e 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7168545a49b33b45ea3aaf27166d03dec5630c5d99c893bfa265f5083dc33ef1 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 From a2e80dcdf624f16ca4d26349171c1f48aa3fa11b Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 4 Feb 2024 13:58:25 +0000 Subject: [PATCH 04/11] Bugfix Player Maintains Velocity from Ship when Landing --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 10 +++++----- EndlessVendetta/Content/Levels/TempOpenWorld.umap | 4 ++-- .../StarterContent/Architecture/Floor_400x400.uasset | 2 +- .../EndlessVendetta/EndlessVendettaCharacter.cpp | 9 ++++++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index b5d707d5..5d2c3eff 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,11 +9,10 @@ - - - - - + + + + diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index 331dc700..b460c344 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3977a136e9c4c43dad14b8288902b6cf0cf3c7b46eac4dfdcb8cc25e225edc02 -size 13864728 +oid sha256:513e7a005246865fbaac9bf4abda7bf0473776603585a01eea1bd278711dbfce +size 13864801 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 56a9fbe5..5f51ceb6 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:466c723985861da68aa9ea25153ae0068833dd6159178b0c033d0f814a8cd6f5 +oid sha256:54d78cbc2e7ef625432ee7b2da07e34a29fc46f230ab4ba5105f1efd2c9c7ca3 size 14831 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index f0412376..81ca8170 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -734,8 +734,15 @@ void AEndlessVendettaCharacter::EnterShip(FTransform TakeoffLoc) void AEndlessVendettaCharacter::ExitShip(FTransform ExitLoc) { PlayFadeScreen(); - SetActorLocation(ExitLoc.GetLocation()); + APlayerController* PC = Cast(GetController()); + PC->SetIgnoreMoveInput(true); + PC->SetIgnoreLookInput(true); + SpaceShip->GetCharacterMovement()->Velocity = FVector(0, 0, 0); + GetCharacterMovement()->Velocity = FVector(0, 0, 0); + SetActorLocation(ExitLoc.GetLocation(), false, nullptr, ETeleportType::ResetPhysics); GetController()->SetControlRotation(ExitLoc.Rotator()); SpaceShip->Destroy(); PlayerOnShip = false; + PC->SetIgnoreMoveInput(false); + PC->SetIgnoreLookInput(false); } From ce4f968151ccf42017133739b945939688706716 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 4 Feb 2024 17:59:01 +0000 Subject: [PATCH 05/11] Implemented Loading and Saving Player Spawn Transform in Open World --- .../.idea.EndlessVendetta/.idea/workspace.xml | 8 ++-- .../Architecture/Floor_400x400.uasset | 4 +- .../StarterContent/Audio/Collapse01.uasset | 4 +- .../Characters/BountyHunterCharacter.cpp | 46 ++++++++++++++++--- .../Characters/BountyHunterCharacter.h | 5 +- .../EndlessVendetta/MainSaveGameClass.h | 4 +- .../EndlessVendetta/SpaceShip/LandingZone.h | 6 +++ 7 files changed, 62 insertions(+), 15 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 5d2c3eff..aa29ae48 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,10 +9,12 @@ - - + + + + diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 5f51ceb6..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:54d78cbc2e7ef625432ee7b2da07e34a29fc46f230ab4ba5105f1efd2c9c7ca3 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index 5e3ff30e..24412998 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d -size 348532 +oid sha256:3d2b0daf585d5c6052afc625471c8e235e09c7b6f76185220074287885b3fc06 +size 353648 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 7e60169a..dd05262f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -5,14 +5,10 @@ #include "Kismet/GameplayStatics.h" #include "EnhancedInputComponent.h" -void ABountyHunterCharacter::SpawnMainBounty() +void ABountyHunterCharacter::SpawnMainBounty(UEVGameInstance* GI) { - UEVGameInstance* GI = Cast(GetGameInstance()); - if (!IsValid(GI->MainSaveGameInstanceRef)) return; CurrentMainBountyIndex = GI->MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld; - UE_LOG(LogTemp, Warning, TEXT("Loaded current bounty as %d"), CurrentMainBountyIndex); - if (GI->MainSaveGameInstanceRef->CurrentMainBountyIndexSave > CurrentMainBountyIndex) CompleteCurrentMainBounty(GI); if (MainBountyClasses.IsEmpty() || MainBountyClasses.Num() <= CurrentMainBountyIndex|| !IsValid(MainBountyClasses[CurrentMainBountyIndex])) @@ -49,7 +45,17 @@ void ABountyHunterCharacter::AllBountiesCompleted() void ABountyHunterCharacter::BeginPlay() { - if (UGameplayStatics::DoesSaveGameExist("MainSave", 0)) SpawnMainBounty(); + UEVGameInstance* GI = Cast(GetGameInstance()); + if (IsValid(GI->MainSaveGameInstanceRef)) + { + SpawnMainBounty(GI); + FTransform SpawnLoc = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave; + if (SpawnLoc.GetLocation() != FVector(0, 0, 0) && UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName) + { + SetActorTransform(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave); + Cast(GetController())->SetControlRotation(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave.GetRotation().Rotator()); + } + } Super::BeginPlay(); } @@ -94,3 +100,31 @@ void ABountyHunterCharacter::Tick(float DeltaTime) { Super::Tick(DeltaTime); } + +void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) +{ + Super::EndPlay(EndPlayReason); + if (UGameplayStatics::GetCurrentLevelName(GetWorld()) != OpenWorldLevelName) return; + UEVGameInstance* GI = Cast(GetGameInstance()); + if (!IsValid(GI->MainSaveGameInstanceRef)) return; + TArray LandingZones; + ALandingZone* ClosestLandingZone = nullptr; + double DistToClosestLandingZone; + UGameplayStatics::GetAllActorsOfClass(GetWorld(), ALandingZone::StaticClass(), LandingZones); + for (AActor* LZ_Actor : LandingZones) + { + ALandingZone* LZ = Cast(LZ_Actor); + double DistToLZ = FVector::Dist(LZ->GetExitTransform().GetLocation(), GetActorLocation()); + if (!IsValid(ClosestLandingZone)) + { + ClosestLandingZone = LZ; + DistToClosestLandingZone = DistToLZ; + continue; + } + ClosestLandingZone = DistToClosestLandingZone >= DistToLZ ? LZ : ClosestLandingZone; + DistToClosestLandingZone = DistToClosestLandingZone >= DistToLZ ? DistToLZ : DistToClosestLandingZone; + } + if (!IsValid(ClosestLandingZone)) return; + GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave = ClosestLandingZone->GetExitTransform(); + UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 7b6df1db..e628b489 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -58,7 +58,7 @@ public: // ------------------- METHODS --------------------------------- private: // Spawns Current Main Bounty along with its Side Bounties, and spawns its appropriate CP's based on level - void SpawnMainBounty(); + void SpawnMainBounty(UEVGameInstance* GI); // Collects Reward for Current Main Bounty and Increments the Main Bounty Index void CompleteCurrentMainBounty(UEVGameInstance* GI); @@ -78,6 +78,9 @@ protected: // Called every frame virtual void Tick(float DeltaTime) override; + + // Called When Actor destroyed or Removed from Level + virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; public: // Used by Final Checkpoint to always load the Level set as the Open Level in here FString GetOpenWorldLevelName() diff --git a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h index 3d7937da..ccd11131 100644 --- a/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/MainSaveGameClass.h @@ -27,5 +27,7 @@ public: UPROPERTY() TSubclassOf SecondaryWeaponClassSave; - + + UPROPERTY() + FTransform PlayerOpenWorldSpawnTransformSave; }; diff --git a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h index 8ff2cbbf..75234e19 100644 --- a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h +++ b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/LandingZone.h @@ -68,4 +68,10 @@ public: // Updates all LZ's, then runs enter ship func on player passing the correct takeoff transform void Takeoff(); + + // Returns Exit Transform for LZ, Used for Save System for when Player Leaves Open World + FTransform GetExitTransform() + { + return LZ_ExitTransform; + } }; From 9d26ef66f439f4ee91a47bc50c592558b58c7c82 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 4 Feb 2024 18:36:42 +0000 Subject: [PATCH 06/11] Added Custom Open World Spawn Location upon Completing a Main Bounty --- .../.idea.EndlessVendetta/.idea/workspace.xml | 10 ++++---- .../ApartmentBounty/MB_Apartment.uasset | 4 ++-- .../Bounty/MB_Training.uasset | 4 ++-- .../Content/Levels/MainMenuLevel.umap | 4 ++-- .../Content/Levels/TempOpenWorld.umap | 4 ++-- .../Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/Audio/Collapse01.uasset | 4 ++-- .../BountySystem/MainBountyClass.h | 9 +++++++ .../Characters/BountyHunterCharacter.cpp | 24 ++++++++----------- .../Characters/BountyHunterCharacter.h | 3 --- 10 files changed, 37 insertions(+), 33 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index aa29ae48..7a87fbdb 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,12 +9,14 @@ - + + + + + - - diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 30ecc43f..9874fb3c 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c24d0e32c594435e5c24f57444e1a99c1c7e491256f16bf15f60f1a627928600 -size 23786 +oid sha256:3f54596b2946a99060351c9a805c70203868db194b24f94a9999bc72847cb197 +size 23998 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index 11607e4e..abd6b8f7 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14fd53a50ee9b233156dd4e8ff06c7a92800afbe4934bb067d7fe94c28d2cdda -size 26131 +oid sha256:79ee7d751efb58c167bfd14d74bac82cb3c3b02094f86cd0ea000a807211d478 +size 26452 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 50ae49e0..aa658f49 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15bdb4a6b7b73c3abed62d2af28bf942b4011d09abcb972641ae60a7006fee97 -size 306352 +oid sha256:185acae34cc8b4ff2298ec48a4c697230e4665427a7dcb492e93494203b190dd +size 306304 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index b460c344..1247e23d 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:513e7a005246865fbaac9bf4abda7bf0473776603585a01eea1bd278711dbfce -size 13864801 +oid sha256:9afe44b1d4908593e2d2ac009bb61efb016e69bf32f03198bb4bd8e51a54f0f6 +size 13864753 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..07261300 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:b7a9945596fb0a138326d2dfc6f85d5b8cf3a580077f398c6fa4c73ec468e2dd +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index 24412998..5e3ff30e 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d2b0daf585d5c6052afc625471c8e235e09c7b6f76185220074287885b3fc06 -size 353648 +oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d +size 348532 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index 1617dfe6..cb403d15 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -23,6 +23,10 @@ class ENDLESSVENDETTA_API AMainBountyClass : public ABountyClass // Used to Store Ref for Bounty Tracking Functionality ACheckpointClass* OpenWorldcheckpoint; + // Used by Players Character to Determine where to Spawn in the Open World after Completing Main Bounty + UPROPERTY(EditDefaultsOnly, Category = "Bounty") + FTransform PlayerSpawnTransform; + protected: @@ -40,6 +44,11 @@ public: // Spawns the Single Checkpoint in the Open World for this Main Bounty void SpawnOpenWorldCheckpoint(); + // Used by Players Character to Determine where to Spawn in the Open World after Completing Main Bounty + FTransform GetPlayerSpawnTransform() + { + return PlayerSpawnTransform; + } diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index dd05262f..5df9d76b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -32,6 +32,10 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) { // Collect rewards for bounty and move onto next UE_LOG(LogTemp, Warning, TEXT("Would be collecting reward for completing bounty %d"), CurrentMainBountyIndex); + + FTransform PostBountySpawnTransform = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); + SetActorTransform(PostBountySpawnTransform); + Cast(GetController())->SetControlRotation(PostBountySpawnTransform.GetRotation().Rotator()); CurrentMainBountyIndex = GI->MainSaveGameInstanceRef->CurrentMainBountyIndexSave; GI->MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld = CurrentMainBountyIndex; @@ -73,7 +77,7 @@ void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerIn void ABountyHunterCharacter::TogglePauseMenu() { - bool bOpenNewPauseMenu = !IsValid(PauseMenu); + const bool bOpenNewPauseMenu = !IsValid(PauseMenu); FInputModeUIOnly UIOnly; FInputModeGameOnly GameOnly; APlayerController* PC = Cast(GetController()); @@ -82,23 +86,15 @@ void ABountyHunterCharacter::TogglePauseMenu() PC->SetIgnoreMoveInput(bOpenNewPauseMenu); PC->SetIgnoreLookInput(bOpenNewPauseMenu); PC->SetShowMouseCursor(bOpenNewPauseMenu); - if (bOpenNewPauseMenu) - { - PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); - PauseMenu->AddToViewport(50); - BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); - PauseMenu->OpenNewTab(BountiesTab); - } - else + if (!bOpenNewPauseMenu) { PauseMenu->RemoveFromParent(); PauseMenu = nullptr; } -} - -void ABountyHunterCharacter::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); + PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); + PauseMenu->AddToViewport(50); + BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); + PauseMenu->OpenNewTab(BountiesTab); } void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index e628b489..2db3f625 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -76,9 +76,6 @@ protected: // Open or Close the Pause Menu, Defaults to Opening Bounty Tab void TogglePauseMenu(); - // Called every frame - virtual void Tick(float DeltaTime) override; - // Called When Actor destroyed or Removed from Level virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; public: From 79a131cf59bf427d941c00266d16ad27e79f00fc Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 4 Feb 2024 18:45:47 +0000 Subject: [PATCH 07/11] Added Post Processing from Apartment Hit Level to All Current Gameplay Levels --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 12 +++--------- .../Content/Levels/ControlTutorialLevel.umap | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- EndlessVendetta/Content/Levels/TempOpenWorld.umap | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 7a87fbdb..57c740d8 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,15 +8,9 @@ - - - + + - - - - - diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap index acf3a596..7ec56f15 100644 --- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap +++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c78dde892caa4b4cb292592b66f9ee2fd986382798310e40212c1f80ee418cee -size 3452507 +oid sha256:80f2ef39b4b9633d0b514454868231fa60ea6d417aade784a86041309bc09d27 +size 3439790 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index aa658f49..cda0701d 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185acae34cc8b4ff2298ec48a4c697230e4665427a7dcb492e93494203b190dd -size 306304 +oid sha256:a5360f36b2cbef2de63d54bea07216f5d228208e40966a4f266f819d89a0d514 +size 307414 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index 1247e23d..4cead22c 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9afe44b1d4908593e2d2ac009bb61efb016e69bf32f03198bb4bd8e51a54f0f6 -size 13864753 +oid sha256:c23c9614eb11e162386c9a60456be49ab400d443ccb643d2defaa76bb8435a5d +size 13865992 From ca0365e41b6337de69fc99cd65a0f9c9b44e7dd2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 5 Feb 2024 03:54:35 +0000 Subject: [PATCH 08/11] Updated Main Menu Music to Drums Version --- .../.idea/.idea.EndlessVendetta/.idea/workspace.xml | 5 ++--- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- .../MainMenu/Gameplay/MainMenuPlayerController.uasset | 4 ++-- EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3.1.wav | 3 +++ EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset | 3 +++ .../Content/MainMenu/Music/Menu_maybe_3_1_Cue.uasset | 3 +++ .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- 8 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3.1.wav create mode 100644 EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset create mode 100644 EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1_Cue.uasset diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 57c740d8..4484ab9d 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,9 +8,7 @@ - - - + diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index cda0701d..5e1dba7b 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5360f36b2cbef2de63d54bea07216f5d228208e40966a4f266f819d89a0d514 -size 307414 +oid sha256:fec34acd70ac06d25aa1c86c425bb023665ec2ea756ee7f676ef0ee5749d6e6c +size 308710 diff --git a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset index 374830ac..8e5b26a1 100644 --- a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset +++ b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1ff7c7f40bfa0e911df326f08ba112a5998828ea779bc214af84f795f2d68a -size 118103 +oid sha256:cef8b2e10eee2850f8670c6652b2527e63f5e7d6fb26835ac8d5710381ccb733 +size 116961 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3.1.wav b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3.1.wav new file mode 100644 index 00000000..a7bc9acc --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3.1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e620f081ce888b8d63e03857e582244f42041b840b5a9e877275ca2a192d4b18 +size 18823784 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset new file mode 100644 index 00000000..41087f44 --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1d6ac457cec4cc6d963b0522d8adbd8ce6e90f7e1d290c482c548cb596017c4 +size 15907164 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1_Cue.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1_Cue.uasset new file mode 100644 index 00000000..721f1c6d --- /dev/null +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1_Cue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f21821a2ed5950dbed14153cade46048529a98a5abc65b5aa1f0c291ae803cf +size 5276 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 07261300..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:b7a9945596fb0a138326d2dfc6f85d5b8cf3a580077f398c6fa4c73ec468e2dd -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..cebb89f6 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:01d418b7b5593c6be29fb97bc899990ef08bac110c874363bad529b39a3af997 +size 53268 From 14ff02285c2927ac488002a269e7d62b19454e73 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 5 Feb 2024 05:55:41 +0000 Subject: [PATCH 09/11] Implemented Quit Tab and its Functionality --- .../.idea.EndlessVendetta/.idea/workspace.xml | 10 +- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 +- .../Content/Levels/MainMenuLevel.umap | 4 +- .../PauseMenu/Tabs/WBP_BountiesTab.uasset | 3 + .../Content/PauseMenu/Tabs/WBP_QuitTab.uasset | 3 + .../PauseMenu/Tabs/WBP_TestMenuTab.uasset | 3 + .../Content/PauseMenu/WBP_PauseMenu.uasset | 4 +- .../Content/PauseMenu/WBP_TestMenuTab.uasset | 3 - .../Architecture/Floor_400x400.uasset | 4 +- .../Particles/P_Ambient_Dust.uasset | 4 +- .../Characters/BountyHunterCharacter.cpp | 59 +++++---- .../Characters/BountyHunterCharacter.h | 123 ++++++++++++++---- .../EndlessVendetta/PauseMenu/BountiesTab.cpp | 5 + .../EndlessVendetta/PauseMenu/BountiesTab.h | 31 +++++ .../PauseMenu/PauseMenuClass.h | 32 +++-- .../EndlessVendetta/PauseMenu/QuitTab.cpp | 5 + .../EndlessVendetta/PauseMenu/QuitTab.h | 14 ++ .../EndlessVendetta/PauseMenu/TabWidget.cpp | 5 + .../EndlessVendetta/PauseMenu/TabWidget.h | 17 +++ 19 files changed, 262 insertions(+), 71 deletions(-) create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/WBP_QuitTab.uasset create mode 100644 EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset delete mode 100644 EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.h create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.h diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 4484ab9d..032408b5 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,6 +9,14 @@ + + + + + + + + diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 381bde7b..5c690b7f 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:f1ecafab249f201ddeaf8e1c7b6631e183f9bf07d10e1f460002076e75795801 -size 470059 +oid sha256:d2f8d95778a3400a1cb4f254ce88e826577c5600bacca7246b34c0a3f10ee51d +size 472419 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 5e1dba7b..4fb787ef 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fec34acd70ac06d25aa1c86c425bb023665ec2ea756ee7f676ef0ee5749d6e6c -size 308710 +oid sha256:62323ec29b4a5d647b91a836041fb29cbac98efc420ff43db000bf63ba74e92d +size 308758 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset new file mode 100644 index 00000000..425b5d7f --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_BountiesTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51dce130f9a950a96cc11a6d0ce5c7da112f49d961edb944ec9cf866a00b46a2 +size 25564 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_QuitTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_QuitTab.uasset new file mode 100644 index 00000000..e3cc3d00 --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_QuitTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47dd758ba4393d88bf5ef5f4851b8419af7eac51b969e91cfd6f383abd2876fa +size 42508 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset new file mode 100644 index 00000000..36ed479f --- /dev/null +++ b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07291b58ab52dce6a6681c9f7e051f0f49e911be6cb555a59e4367f212d6d4f5 +size 33171 diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset index 6f9bc650..74180af7 100644 --- a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset +++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:336be313e00bf23335d5275ec65cc1c86bd7f339a66ef48608261e1aa503614f -size 475108 +oid sha256:6da7938ededede015f593c24d848d94faca0e6fa502cf28e3ec3a57fb3627c58 +size 485775 diff --git a/EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset b/EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset deleted file mode 100644 index 3447b252..00000000 --- a/EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cf9c231c4b94dec2434c03af547e75968039b3ab03ce0e9d4518c94a86b1fa9 -size 32656 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..8d5fd2ab 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:15b6c3125fb9ab79ce42ea8e167f65e403524724da7a232719d682eccdf85d6e +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index cebb89f6..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:01d418b7b5593c6be29fb97bc899990ef08bac110c874363bad529b39a3af997 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 5df9d76b..d6363f4b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -60,6 +60,7 @@ void ABountyHunterCharacter::BeginPlay() Cast(GetController())->SetControlRotation(GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave.GetRotation().Rotator()); } } + CreatePauseMenuTabs(); Super::BeginPlay(); } @@ -75,28 +76,6 @@ void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerIn Super::SetupPlayerInputComponent(PlayerInputComponent); } -void ABountyHunterCharacter::TogglePauseMenu() -{ - const bool bOpenNewPauseMenu = !IsValid(PauseMenu); - FInputModeUIOnly UIOnly; - FInputModeGameOnly GameOnly; - APlayerController* PC = Cast(GetController()); - - InPauseMenu = bOpenNewPauseMenu; - PC->SetIgnoreMoveInput(bOpenNewPauseMenu); - PC->SetIgnoreLookInput(bOpenNewPauseMenu); - PC->SetShowMouseCursor(bOpenNewPauseMenu); - if (!bOpenNewPauseMenu) - { - PauseMenu->RemoveFromParent(); - PauseMenu = nullptr; - } - PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); - PauseMenu->AddToViewport(50); - BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); - PauseMenu->OpenNewTab(BountiesTab); -} - void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) { Super::EndPlay(EndPlayReason); @@ -124,3 +103,39 @@ void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave = ClosestLandingZone->GetExitTransform(); UGameplayStatics::SaveGameToSlot(GI->MainSaveGameInstanceRef, "MainSave", 0); } + +void ABountyHunterCharacter::CreatePauseMenuTabs() +{ + BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); + FavoursTab = CreateWidget(GetWorld(), FavoursTabWidgetClass); + NavigationTab = CreateWidget(GetWorld(), NavigationTabWidgetClass); + SettingsTab = CreateWidget(GetWorld(), SettingsTabWidgetClass); + QuitTab = CreateWidget(GetWorld(), QuitTabWidgetClass); +} + +void ABountyHunterCharacter::TogglePauseMenu() +{ + const bool bOpenNewPauseMenu = !IsValid(PauseMenu); + FInputModeUIOnly UIOnly; + FInputModeGameOnly GameOnly; + APlayerController* PC = Cast(GetController()); + + InPauseMenu = bOpenNewPauseMenu; + PC->SetIgnoreMoveInput(bOpenNewPauseMenu); + PC->SetIgnoreLookInput(bOpenNewPauseMenu); + PC->SetShowMouseCursor(bOpenNewPauseMenu); + if (!bOpenNewPauseMenu) + { + PauseMenu->RemoveFromParent(); + PauseMenu = nullptr; + return; + } + PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); + PauseMenu->AddToViewport(50); + PauseMenu->OpenNewTab(BountiesTab); + PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab); + PauseMenu->OpenedFavoursTab.AddDynamic(this, &ABountyHunterCharacter::OpenFavoursTab); + PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab); + PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab); + PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab); +} \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 2db3f625..50695cba 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -7,7 +7,9 @@ #include "EndlessVendetta/EVGameInstance.h" #include "EndlessVendetta/MainSaveGameClass.h" #include "EndlessVendetta/BountySystem/MainBountyClass.h" +#include "EndlessVendetta/PauseMenu/BountiesTab.h" #include "EndlessVendetta/PauseMenu/PauseMenuClass.h" +#include "EndlessVendetta/PauseMenu/QuitTab.h" #include "BountyHunterCharacter.generated.h" /** @@ -33,25 +35,7 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac UPROPERTY(EditDefaultsOnly, Category = "Bounty Hunter") FString OpenWorldLevelName = "ControlTutorialLevel"; - // Input Action for Opening and Closing Pause Menu - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) - UInputAction* PauseMenuAction; - - // Widget Class used to Spawn Pause Menu - UPROPERTY(EditDefaultsOnly, Category = PauseMenu) - TSubclassOf PauseMenuWidgetClass; - - // Reference to Pause Menu Widget - UPauseMenuClass* PauseMenu; - -protected: - // Widget Class used to Spawn Bounties Tab Widget - UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") - TSubclassOf BountyTabWidgetClass; - - // Reference to Bounty Tab Widget - UUserWidget* BountiesTab; - +protected: public: @@ -65,24 +49,115 @@ private: // Replaces Normal Bounty Info UI with Unique Game Over UI void AllBountiesCompleted(); - + protected: // Called When Player Spawns virtual void BeginPlay() override; // Overridden to Setup up Pause Menu Inputs virtual void SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) override; - - // Open or Close the Pause Menu, Defaults to Opening Bounty Tab - void TogglePauseMenu(); - + // Called When Actor destroyed or Removed from Level virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; + public: // Used by Final Checkpoint to always load the Level set as the Open Level in here FString GetOpenWorldLevelName() { return OpenWorldLevelName; } + +// ------------------- Pause Menu --------------------------------- +private: + // Input Action for Opening and Closing Pause Menu + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) + UInputAction* PauseMenuAction; + + // Widget Class used to Spawn Pause Menu + UPROPERTY(EditDefaultsOnly, Category = PauseMenu) + TSubclassOf PauseMenuWidgetClass; + + // Reference to Pause Menu Widget + UPauseMenuClass* PauseMenu; + // Widget Class used to Spawn Bounties Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf BountyTabWidgetClass; + + // Reference to Bounty Tab Widget + UPROPERTY() + UBountiesTab* BountiesTab; + + // Widget Class used to Spawn Favours Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf FavoursTabWidgetClass; + + // Reference to Favours Tab Widget + UPROPERTY() + UTabWidget* FavoursTab; + + // Widget Class used to Spawn Navigation Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf NavigationTabWidgetClass; + + // Reference to Navigation Tab Widget + UPROPERTY() + UTabWidget* NavigationTab; + + // Widget Class used to Spawn Settings Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf SettingsTabWidgetClass; + + // Reference to Settings Tab Widget + UPROPERTY() + UTabWidget* SettingsTab; + + // Widget Class used to Spawn Quit Tab Widget + UPROPERTY(EditDefaultsOnly, Category = "Pause Menu") + TSubclassOf QuitTabWidgetClass; + + // Reference to Quit Tab Widget + UPROPERTY() + UQuitTab* QuitTab; + + // Creates and Stores References to each Pause Menu Tab on Begin Play + void CreatePauseMenuTabs(); + + // Open or Close the Pause Menu, Defaults to Opening Bounty Tab + void TogglePauseMenu(); + + // Opens Bounties Tab + UFUNCTION() + void OpenBountiesTab() + { + PauseMenu->OpenNewTab(BountiesTab); + } + + // Opens Favours Tab + UFUNCTION() + void OpenFavoursTab() + { + PauseMenu->OpenNewTab(FavoursTab); + } + + // Opens Navigation Tab + UFUNCTION() + void OpenNavigationTab() + { + PauseMenu->OpenNewTab(NavigationTab); + } + + // Opens Settings Tab + UFUNCTION() + void OpenSettingsTab() + { + PauseMenu->OpenNewTab(SettingsTab); + } + + // Opens Quit Tab + UFUNCTION() + void OpenQuitTab() + { + PauseMenu->OpenNewTab(QuitTab); + } }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.cpp b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.cpp new file mode 100644 index 00000000..0400a586 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "BountiesTab.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h new file mode 100644 index 00000000..85878167 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/BountiesTab.h @@ -0,0 +1,31 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "TabWidget.h" +#include "EndlessVendetta/BountySystem/BountyClass.h" +#include "BountiesTab.generated.h" + +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FTrackBounty, ABountyClass*, BountyToTrack); + +UCLASS() +class ENDLESSVENDETTA_API UBountiesTab : public UTabWidget +{ + GENERATED_BODY() + +// ------------------- ATTRIBUTES ------------------------------ + +protected: + +public: + UPROPERTY(BlueprintAssignable) + FTrackBounty TrackBountyDelegate; + +// ------------------- METHODS --------------------------------- +private: + +protected: + +public: +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h index 84acbe79..fff8ea82 100644 --- a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h @@ -6,26 +6,36 @@ #include "Blueprint/UserWidget.h" #include "PauseMenuClass.generated.h" -/** - * - */ +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOpenedBountiesTab); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOpenedFavoursTab); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOpenedNavigationTab); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOpenedSettingsTab); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOpenedQuitTab); + UCLASS() class ENDLESSVENDETTA_API UPauseMenuClass : public UUserWidget { GENERATED_BODY() // ------------------- ATTRIBUTES ------------------------------ +public: + UPROPERTY(BlueprintCallable) + FOpenedBountiesTab OpenedBountiesTab; -protected: + UPROPERTY(BlueprintCallable) + FOpenedFavoursTab OpenedFavoursTab; -public: + UPROPERTY(BlueprintCallable) + FOpenedNavigationTab OpenedNavigationTab; + + UPROPERTY(BlueprintCallable) + FOpenedSettingsTab OpenedSettingsTab; + + UPROPERTY(BlueprintCallable) + FOpenedQuitTab OpenedQuitTab; // ------------------- METHODS --------------------------------- -private: - -protected: - public: + // Closes any Previously Opened Tab and Opens the Given new Tab UFUNCTION(BlueprintImplementableEvent) - void OpenNewTab(UUserWidget* TabWidget); - + void OpenNewTab(UTabWidget* TabWidget); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.cpp b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.cpp new file mode 100644 index 00000000..d497a801 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "QuitTab.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.h new file mode 100644 index 00000000..cf9e4020 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/QuitTab.h @@ -0,0 +1,14 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "TabWidget.h" +#include "QuitTab.generated.h" + +UCLASS() +class ENDLESSVENDETTA_API UQuitTab : public UTabWidget +{ + GENERATED_BODY() + +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.cpp b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.cpp new file mode 100644 index 00000000..bd9ccfba --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "TabWidget.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.h new file mode 100644 index 00000000..b96c7767 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/TabWidget.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Blueprint/UserWidget.h" +#include "TabWidget.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API UTabWidget : public UUserWidget +{ + GENERATED_BODY() + +}; From 5272f2054ada3b59e8daa422461a9fc964957c89 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 5 Feb 2024 05:59:24 +0000 Subject: [PATCH 10/11] Added Mayor to Enemy Test AI Level --- .../Levels/EnemyAITest/6/VK/HJHN36OGRNBJVSACPK17TJ.uasset | 3 +++ .../Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/6/VK/HJHN36OGRNBJVSACPK17TJ.uasset delete mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/6/VK/HJHN36OGRNBJVSACPK17TJ.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/6/VK/HJHN36OGRNBJVSACPK17TJ.uasset new file mode 100644 index 00000000..56c77103 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/6/VK/HJHN36OGRNBJVSACPK17TJ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df40cc09f2b897e82277a3c74d970e623a1df6a339027dad2d86729cbabe7910 +size 5173 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset deleted file mode 100644 index 16fa5da5..00000000 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/EnemyAITest/E/WM/7S8OEF1ALOX6NKI759UPUB.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3b486e5f781568dfc3311e0a748054cd44c937f24cf97813ffdb41bc57ff9ab -size 4797 From e44395a58f3e485ff3a8111c027aec39e8e466bf Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 5 Feb 2024 11:20:07 +0000 Subject: [PATCH 11/11] Quick Bug Fixes --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/Snipers/BaseSniper.uasset | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 5c690b7f..56637590 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:d2f8d95778a3400a1cb4f254ce88e826577c5600bacca7246b34c0a3f10ee51d -size 472419 +oid sha256:8940bc41955ada96468ffc747fadce7e4ffd6e694118e4367d00dcf18407f17a +size 494513 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index 201ac1f9..f82473e5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4d4c8728c6346fed52e60b7b56fa54a6492180815d2cee29d8d8730ac624947 -size 125545 +oid sha256:32e4bddac4c8767c25d303a48a8426a7cf97635ca5552fab77fa56cf9001cfee +size 125570 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset index 658f6c74..dc459121 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:cf3cb3f1c18d9cef57e27220662bc04a7cfb0de1aff48d810eaefeed37c29d20 -size 127332 +oid sha256:63aef9af49c1856616c82ecd43a68bbc1273b943ef41a71e6a625f8aece55b01 +size 127270 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 8d5fd2ab..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:15b6c3125fb9ab79ce42ea8e167f65e403524724da7a232719d682eccdf85d6e -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..b715cd47 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:d029060e9a20598861faa739272c3bbf75646095f4811df3347556cdf8606199 +size 66790690 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset index 11295e10..d24e6bcd 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d53dac7e3e749916ed5e5802c3c3495f2895827dcb66e9b2f49a8cac9a4ecb5 -size 6664 +oid sha256:82a6fbc29ddd199d5ea508c98c2577fa99eaeb43042aa50a7e89570fc743b9cf +size 6741