From 7afc38c423182d752c0f8fcdd7ab06e26b122428 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 00:00:31 +0100 Subject: [PATCH 1/7] Created Tutorial Intro Sequence --- .../BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset | 3 +++ .../Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset | 3 +++ .../Tutorial/CinematicSequences/Intro/MarsShake.uasset | 3 +++ .../Tutorial/CinematicSequences/Intro/TutorialIntro.uasset | 3 +++ .../Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset | 3 +++ .../Content/BountySystem/Tutorial/MB_Training.uasset | 4 ++-- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- EndlessVendetta/EndlessVendetta.sln.DotSettings.user | 2 ++ 11 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/MarsShake.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset create mode 100644 EndlessVendetta/EndlessVendetta.sln.DotSettings.user diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset new file mode 100644 index 00000000..75916872 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Mars.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:201d92203e64b0a0daa5bf777951293a927fd722894912110feef05e6024062b +size 44925 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset new file mode 100644 index 00000000..076e9477 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6d807c4e0ab30930c463439ed46ee84ff83c0fdb3eb5efb9d0640e078909919 +size 50509 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/MarsShake.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/MarsShake.uasset new file mode 100644 index 00000000..ec405f4b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/MarsShake.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c536f8e7072f41ec92ee832dc8bc63378b69b29470f5bc099cb5458d6577992 +size 6692 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset new file mode 100644 index 00000000..c5572cc3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa5923428e8e7aa2600f000c4e5131d62a5610db1264ed0ad775494c7368863e +size 24608 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset new file mode 100644 index 00000000..c54e9f3c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/WBP_TutIntro.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcabed2638e76cad50e0522e85b6b7f5f73381559735dff667630a559b832c53 +size 45297 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset index d31217af..74b408e7 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b8017d69ec06da080f2d7c728add0e186489411b6bbaf5516c83f32a952c72e -size 28734 +oid sha256:c58ec034d1901652cf9f35acc43cc0173d6d5d957a9cc725406900ea5dc71bac +size 24128 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index e1e694a9..6bae58d3 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:930c14ba29f3cb7c56703bb51bacd86c1346d14130afca4f96bf3d15224eab85 -size 830212 +oid sha256:54526257745d9349bd1084059a5bcd24f806b231615e2cf4fe2eae322f8c67e3 +size 838737 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index d31d0e43..44790cd1 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:276d41edc23363c2297ee9adc12479902f7eeb41daba2bb6e530b53ccc3a50a7 -size 1938089 +oid sha256:3ca3009c9db19a05d519381e2682979a313f4425dee9d2e30a70698bf447ce86 +size 1941075 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..3f0cf8be 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:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:dcd744415c36d7f01a64653563dd413a017466bf707c108ec6733da0fcfb7d66 +size 43745 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 59edfeab..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:7f9718104bf73e05bab11a98ed8856c6ad4905100fc3c4194654dd75b0056dc9 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user new file mode 100644 index 00000000..2b08f3a1 --- /dev/null +++ b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user @@ -0,0 +1,2 @@ + + C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr \ No newline at end of file From 2249e0fa6cab15eb39ad83fe51151d361eea10a1 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 01:14:50 +0100 Subject: [PATCH 2/7] Created Gadget Training Room Related Cinematic Sequences --- .../Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset | 3 +++ .../Tutorial/BountySpecificActors/AI_Speach_Congrats.wav | 3 +++ .../Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset | 4 ++-- .../BountySpecificActors/Elevator/AI_Speach_Elevator.uasset | 3 +++ .../BountySpecificActors/Elevator/AI_Speach_Elevator.wav | 3 +++ .../BountySpecificActors/Elevator/BP_Ind_Elevator.uasset | 3 +++ .../GadgetTraining/AI_Speach_GadgetTraining.uasset | 3 +++ .../GadgetTraining/AI_Speach_GadgetTraining.wav | 3 +++ .../GadgetTraining/GadgetTrainingSequence.uasset | 3 +++ .../Tutorial/CinematicSequences/Intro/TutorialIntro.uasset | 2 +- .../Tutorial/GadgetGamemode/BP_BrainSpawner.uasset | 4 ++-- .../Tutorial/GadgetGamemode/BP_WaveComputer.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap | 4 ++-- 13 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.wav create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.wav create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.wav create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset new file mode 100644 index 00000000..1d15cc3c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30830d810f065bccab3cdbe3b3209794a1ef77ca357ad9e34264ad4a40dc4a4b +size 552716 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.wav b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.wav new file mode 100644 index 00000000..59260b12 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2634267961fda3c26598f5a03ec27a24c5dbaf2ef0ac9a58fe91f752a617d56 +size 624684 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset index 9b46a200..a04deda9 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_Ind_Elevator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:429ac085a3c1d4b67325ef834c9ca08eaca205c6add5c9411a9045327517669d -size 99136 +oid sha256:452c859dc48f334abf2784624c1b3a0b2461b62cbe6eddb9fc038da0d10701e2 +size 2678 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset new file mode 100644 index 00000000..df1db88c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbac2659af0d768ed49696b105864158d3574632f5e836d21b8490c7e3df48a1 +size 1677020 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.wav b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.wav new file mode 100644 index 00000000..e64e1aa7 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfbc215c47a229062f89ed5b75ca270ce4c5b0998f9af1dd9978050b6c732868 +size 1871916 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset new file mode 100644 index 00000000..6894fe2f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d15d05d02e22ee7212bdf1b8ce9d2e59e7381ff2f3acde98a2b9c4b6226ebd26 +size 120082 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset new file mode 100644 index 00000000..fc374898 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da7436168cc76532fe907e829ef9ade4756dfe67377fad08fd9b8103820633a3 +size 2751136 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.wav b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.wav new file mode 100644 index 00000000..d6ca0404 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2796ba39c87d905dea7d8ee4bddd249f1e1463038440652c3019b9f0fabb733 +size 3084332 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset new file mode 100644 index 00000000..6dce2eea --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fed9f33fab9b11ac8bb8d53c6a5f3a956a2369ad189d7bb18c7973ca59e22d4a +size 21415 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset index c5572cc3..58ce97fc 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/Intro/TutorialIntro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa5923428e8e7aa2600f000c4e5131d62a5610db1264ed0ad775494c7368863e +oid sha256:2009d287ba0982ae6da4f45012b79964789b194262b1c8a723eaea260527dbb1 size 24608 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset index ea4d8c42..1012bfea 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_BrainSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a506a040052bc5f17e6b911879570df71a582de8813652ee3755327fcfbd4bf -size 25990 +oid sha256:e9b7c0e77d2bb16956dd86c4baf504b4c92a8bbb47e34b4b7df29c089bfaf619 +size 25129 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset index e4b40147..72725284 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d587a4ca85a92ffbdff527b9cdb639af8727251dcb3dfdd49d2b20cab9d9ec2 -size 118976 +oid sha256:a01486d1395650bc7800d9362fed266a8216201e4ed34e3466ffff9a4632550e +size 176242 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index 44790cd1..6fe38535 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ca3009c9db19a05d519381e2682979a313f4425dee9d2e30a70698bf447ce86 -size 1941075 +oid sha256:edf8c15717801d97fcc897b60ed3eb6d57e1b86205ddb434283e2a310ee64e06 +size 1942950 From 0a15ed721c7edc32e30e5da89b795ca5c1ee1967 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 01:55:25 +0100 Subject: [PATCH 3/7] Implemented New Mayor --- .../StaticMesh/Building/BP_SpaceShipDoor01.uasset | 4 ++-- .../StaticMesh/Props/BP_CorridorDoorLeft.uasset | 4 ++-- .../StaticMesh/Props/BP_CorridorDoorRight.uasset | 4 ++-- .../Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset | 3 +++ .../Tutorial/BountySpecificActors/Mayor/MayorImage.png | 3 +++ .../Tutorial/BountySpecificActors/Mayor/MayorImage.uasset | 3 +++ .../Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset | 3 +++ .../GadgetTraining/GadgetTrainingSequence.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap | 4 ++-- .../Content/MainMenu/Gameplay/MainMenuPlayerController.uasset | 4 ++-- 10 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.png create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset diff --git a/EndlessVendetta/Content/BigStarStation/StaticMesh/Building/BP_SpaceShipDoor01.uasset b/EndlessVendetta/Content/BigStarStation/StaticMesh/Building/BP_SpaceShipDoor01.uasset index 2d124fe1..799d9c66 100644 --- a/EndlessVendetta/Content/BigStarStation/StaticMesh/Building/BP_SpaceShipDoor01.uasset +++ b/EndlessVendetta/Content/BigStarStation/StaticMesh/Building/BP_SpaceShipDoor01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68bb5768ad7714b0155f5452821fcaff8a7796a596847b7c70d6dc413003def2 -size 66325 +oid sha256:9ba74d8527e165435b180e3720d55d55d279103fd35d9e6e16467eff994fc7c1 +size 54420 diff --git a/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorLeft.uasset b/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorLeft.uasset index 8596f341..c3c9a729 100644 --- a/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorLeft.uasset +++ b/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorLeft.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd8f87ce4387e57cab3c6c0ea7b5744834cc082df3464c84f5c6b21fc6a2d992 -size 71562 +oid sha256:06b26b627e96b7f6c083b4a7c9af94860cfa546ff05c4fa227b4ae70d54a8dcc +size 56850 diff --git a/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorRight.uasset b/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorRight.uasset index 5e79ad9b..723cbd36 100644 --- a/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorRight.uasset +++ b/EndlessVendetta/Content/BigStarStation/StaticMesh/Props/BP_CorridorDoorRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f182b8534ebfc58cd10e775732ebcf56c88468497b4e44d68c46c20ec66e04 -size 70783 +oid sha256:75752fdc3772312eb5c49d80fb2dff84e8512a8f78c26d5dabe69867266a6cc5 +size 56114 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset new file mode 100644 index 00000000..cf489252 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/BP_Mayor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:901c1749f7f8fc8d2e9626d51c1d9a81cd7b66d61848e9e07d896648edfcb915 +size 54720 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.png b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.png new file mode 100644 index 00000000..d15f5e8d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2ae4457ce7a0790d74ef7c9b8a8bd318806cb1968469a9b9803de4f05e7d9f3 +size 1296487 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset new file mode 100644 index 00000000..4660d68e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d5bac9cdc478a00b470c02301065b8eaa6441820793305dc2a8fb058f1719aa +size 1030259 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset new file mode 100644 index 00000000..b726cdcd --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/WBP_MayorsFace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cd44ab920c788eb1368750eca585f194cea12f39b0263aebd85709fbfb5de52 +size 27002 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset index 6dce2eea..7e4dddc6 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/GadgetTrainingSequence.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fed9f33fab9b11ac8bb8d53c6a5f3a956a2369ad189d7bb18c7973ca59e22d4a -size 21415 +oid sha256:255940270ee954b498e570d5fef586d0d8b0da3e0938f3e655a0c72aee62ecbb +size 25179 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index 6fe38535..f2652b5b 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edf8c15717801d97fcc897b60ed3eb6d57e1b86205ddb434283e2a310ee64e06 -size 1942950 +oid sha256:3ae590863c9b13c6622afb31688e57c355cdb71db8d56485ae598e0576c7f5df +size 1946156 diff --git a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset index 8f48eb8e..758db32b 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:0a8dd4c43cd8f01a39547f8516fc1fe1881b5e86b7fe86ba9c1b3bdc33a33343 -size 152321 +oid sha256:d196b760a1f85054c7de14dafb60be0300d1a4d6bbbea27d615d69822e33cea0 +size 150781 From c79a1e50e7176b9ca485f031beef4c27bb5c39d1 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 01:59:38 +0100 Subject: [PATCH 4/7] Implemented Intro Cinematic Checkpoint --- .../Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset index 076e9477..8382394d 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TutIntroLvlSequence.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6d807c4e0ab30930c463439ed46ee84ff83c0fdb3eb5efb9d0640e078909919 -size 50509 +oid sha256:615115308fc690043d93808432bb577f8dad5274cf155e006bf62f3f45dd0d74 +size 63125 From ce980cb03560a3aba447ca02bcab3d68dbd2aaa7 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 02:25:53 +0100 Subject: [PATCH 5/7] Implemented Tutorial Checkpoints Through to Maintenance Area --- .../Tutorial/BountySpecificActors/Contract/ContractImage.jpg | 3 +++ .../BountySpecificActors/Contract/ContractImage.uasset | 3 +++ .../BountySpecificActors/Contract/Item_Contract.uasset | 3 +++ .../BountySpecificActors/Contract/M_ContractPic.uasset | 3 +++ .../BountySpecificActors/Contract/M_ContractPic_Rot.uasset | 3 +++ .../Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset | 3 +++ .../Tutorial/Checkpoints/CP_LeaveTheOffice.uasset | 3 +++ .../Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset | 3 +++ .../Content/BountySystem/Tutorial/MB_Training.uasset | 4 ++-- EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap | 2 +- 11 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.jpg create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/Item_Contract.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic_Rot.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheOffice.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.jpg b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.jpg new file mode 100644 index 00000000..639907f6 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d39268673c8e6626085f144e409b39f1a8e909abd2bf47cdbce47df54600b169 +size 15801 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset new file mode 100644 index 00000000..a289096d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea24923f2482a47f97e8c3ec07b9ddf4272ced8852c0267afaeadc9967c2d7b5 +size 23897 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/Item_Contract.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/Item_Contract.uasset new file mode 100644 index 00000000..151ebc2a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/Item_Contract.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56fd16eed46bbdb4c9e3a234da22048a2c4f7842ea2e82b6f8bbc9a10bd322fc +size 6617 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic.uasset new file mode 100644 index 00000000..660c2ed7 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe4d6da15d0a7ef57a1e5594b30a17237dabb855ce3b1e696b32273897eec6d3 +size 9395 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic_Rot.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic_Rot.uasset new file mode 100644 index 00000000..43e6803f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/M_ContractPic_Rot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:176c727b782192b4b8422659ea947d34ef829bb1c17106023a9676f7ba341960 +size 9443 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset new file mode 100644 index 00000000..e2c43278 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0167ec6e47c3dcc5a36a2eb4ecb3313917a7d70d9c0cff8fed619667783fb8c +size 46128 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheOffice.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheOffice.uasset new file mode 100644 index 00000000..77ee682a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheOffice.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b94b929b26153b86830cbcd40218b261b644f6dad8be27409b22a9dba194506 +size 30937 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset new file mode 100644 index 00000000..a4971bfe --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TalkWithTheMayor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d562d16ef743fa1acca0bfc36df78c4360e7fb5a58237cea180803cff2044c5a +size 60146 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset index 74b408e7..9f7db0de 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c58ec034d1901652cf9f35acc43cc0173d6d5d957a9cc725406900ea5dc71bac -size 24128 +oid sha256:47aa90d10c8c410fcde20cb3f8c2ce40d41023436ce1ada9062f532a80fd6dc4 +size 24692 diff --git a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset index 54f764d4..ec3889de 100644 --- a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset +++ b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ccdde9c17154641bb8dd5fb42141b19633b6c6884e2cf9ab001b129d1dfefdc -size 87725 +oid sha256:060781c3eda905eb75e12ff506412383129429dbf664aff0c903e8a2965dfa82 +size 90113 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index f2652b5b..143507f4 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ae590863c9b13c6622afb31688e57c355cdb71db8d56485ae598e0576c7f5df +oid sha256:fde5d418bf23bd198557ed749c41d93bec26649064d021507047e0257f04531b size 1946156 From a0cb8d43c372ea6bf6710b9e702fa57b4603d181 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 03:20:39 +0100 Subject: [PATCH 6/7] Implemented Gun Range Checkpoints --- .../Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset | 3 +++ .../BountySpecificActors/BP_GunRangeShutters_Maybe.uasset | 3 +++ .../Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset | 3 +++ .../BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset | 3 +++ .../Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset | 4 ++-- .../Tutorial/Checkpoints/CP_ShootTheTargets.uasset | 3 +++ .../Content/BountySystem/Tutorial/MB_Training.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap | 4 ++-- 8 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeShutters_Maybe.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset new file mode 100644 index 00000000..58b9be84 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7efb3b71f4beb59f72f8d6ab21ab034b0d69641a8738c0357ff8357eb42bfb6f +size 43945 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeShutters_Maybe.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeShutters_Maybe.uasset new file mode 100644 index 00000000..5a40fe86 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/BP_GunRangeShutters_Maybe.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0829e45461eec8e587ce6b95f9b7e7d43d7aecae8ae42d1f701218fee64c4f7 +size 122645 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset new file mode 100644 index 00000000..6632da62 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GoThroughMaintenenceArea.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31e4e7f217419e49be908d4aad1ac4ca09b915012bb1f58564703131374bc37f +size 43085 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset new file mode 100644 index 00000000..53f02b12 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GrabPistol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e7cfcc71221400aae07bc91805b493778f031883a0376b08409eecddf151c55 +size 59675 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset index e2c43278..8e555d6f 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_HeadDownTheCorridor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0167ec6e47c3dcc5a36a2eb4ecb3313917a7d70d9c0cff8fed619667783fb8c -size 46128 +oid sha256:d6cf61c5d18fe24c58d9d6db06595a1f0ff29fbc48f1bfe8584cef1f5081bfda +size 48124 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset new file mode 100644 index 00000000..42ce6249 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f69a66df3e842c5f70b434d523e22d8ae8ff1757be0db07797a01b477a196bb +size 86471 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset index 9f7db0de..9c669c20 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47aa90d10c8c410fcde20cb3f8c2ce40d41023436ce1ada9062f532a80fd6dc4 -size 24692 +oid sha256:339d24fd1f9dcc65f821af947466a5c7278a74790ede50941fce5c9561e556fe +size 25252 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index 143507f4..3356b054 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fde5d418bf23bd198557ed749c41d93bec26649064d021507047e0257f04531b -size 1946156 +oid sha256:6018597114beef9dd695ae8cfd205ecb429e5d854c31244a49930a28688df7cf +size 1936322 From 16784b051f3468e9f9830032e4666569adf6b305 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 05:01:05 +0100 Subject: [PATCH 7/7] Implemented Checkpoints for Gadget Tutorial Area --- EndlessVendetta/Config/DefaultGame.ini | 1 + .../Elevator/BP_ElevatorDoor_Ind.uasset | 3 +++ .../Elevator/BP_Ind_Elevator.uasset | 4 ++-- .../CP_ContinueThroughFacility.uasset | 3 +++ .../Tutorial/Checkpoints/CP_DepositGun.uasset | 3 +++ .../Tutorial/Checkpoints/CP_Empty.uasset | 3 +++ .../Checkpoints/CP_EnterTheElevator.uasset | 3 +++ .../CP_GadgetTrainingCinematic.uasset | 3 +++ .../CP_LeaveTheGadgetTrainingFacility.uasset | 3 +++ .../CP_ProtectTheHoloSupplies.uasset | 3 +++ .../Checkpoints/CP_SelectCombat.uasset | 3 +++ .../Checkpoints/CP_SelectRecon.uasset | 3 +++ .../Checkpoints/CP_ShootTheTargets.uasset | 4 ++-- .../Tutorial/Checkpoints/CP_TempEmpty.uasset | 3 +++ .../GadgetGamemode/BP_WaveComputer.uasset | 4 ++-- .../BountySystem/Tutorial/MB_Training.uasset | 4 ++-- .../Levels/TempLevels/NewTutorialMap.umap | 4 ++-- .../Blueprints/Blueprint_CeilingLight.uasset | 2 +- .../CheckPoints/WeaponDepositCheckpoint.cpp | 18 ++++++++++++++ .../CheckPoints/WeaponDepositCheckpoint.h | 24 +++++++++++++++++++ .../EndlessVendettaCharacter.cpp | 2 +- .../EndlessVendettaCharacter.h | 2 ++ 22 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h diff --git a/EndlessVendetta/Config/DefaultGame.ini b/EndlessVendetta/Config/DefaultGame.ini index 8744e92f..9a962fd5 100644 --- a/EndlessVendetta/Config/DefaultGame.ini +++ b/EndlessVendetta/Config/DefaultGame.ini @@ -107,6 +107,7 @@ bSkipMovies=False +MapsToCook=(FilePath="/Game/Levels/OpenWorldRework") +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies") +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies") ++MapsToCook=(FilePath="/Game/Levels/TempLevels/NewTutorialMap") +DirectoriesToAlwaysCook=(Path="/Interchange/Functions") +DirectoriesToAlwaysCook=(Path="/Interchange/gltf") +DirectoriesToAlwaysCook=(Path="/Interchange/Materials") diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset new file mode 100644 index 00000000..0f4f6c80 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dea20e5d6a3f6ed66cc512864b20a61c091586977344ba851102819accd67af3 +size 44085 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset index 6894fe2f..a36c1e16 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d15d05d02e22ee7212bdf1b8ce9d2e59e7381ff2f3acde98a2b9c4b6226ebd26 -size 120082 +oid sha256:cd4ac8c1ceda8aacaf312104e54ced6bc9575fc6525f157dfb8d5484040c8151 +size 123778 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset new file mode 100644 index 00000000..47b14233 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b60223379c2ef6eab084cfc7cbc36495e98903541cd2706f2e2bd1ce3b3f775 +size 36902 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset new file mode 100644 index 00000000..b3543c42 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbbd98bf3691755654cb904710901bbd9932099a968f9598fd762d4e508a0a6c +size 26478 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset new file mode 100644 index 00000000..55a86d07 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d6d7d15242cb223e91311a243310c61cd501c52a52d96415b7a1dfc9e012db8 +size 35189 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset new file mode 100644 index 00000000..a5baaeb1 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c931230fefec4bb9b8b2291f4475511420afccec0bbe8dc013e5a51f5147a38e +size 42586 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset new file mode 100644 index 00000000..94b1578b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47d5998f8b8eb42f63c66a5c950cd3923042113fbab7c1307ec3ca7f51d0ebd7 +size 39464 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset new file mode 100644 index 00000000..93dbf0eb --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d259a334d0ea048dfef93d8b8eda98d297d0d54b62a3c767f259f87f0f541d5 +size 43124 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset new file mode 100644 index 00000000..7b8118c8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16ad484fecc7bfa11ff70ed7cde51d7ced395fcab41d73c3d238d7237fb62c0a +size 50113 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset new file mode 100644 index 00000000..27ee9484 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94fdccabfe717d535068965238dbfe093bc84d7f5506cd9ed4e0132a73baa4ec +size 49517 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset new file mode 100644 index 00000000..9c6d4282 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdc62a74409dc494b6739127c7155d7e94c80a235c649327b00d954d1bcfb548 +size 49445 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset index 42ce6249..9cca82ee 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f69a66df3e842c5f70b434d523e22d8ae8ff1757be0db07797a01b477a196bb -size 86471 +oid sha256:944b94ec41547f02e04760ba1ccdf5b903e66f70674fc9bf222e8ada5f4bc57d +size 82333 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset new file mode 100644 index 00000000..67a1176a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fedfe3a6f7917c088a125c6acc634a9d3a1dc49c7d400be7a30eaafd139c8ba9 +size 32826 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset index 72725284..eccc8f8e 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a01486d1395650bc7800d9362fed266a8216201e4ed34e3466ffff9a4632550e -size 176242 +oid sha256:3e9dda08a025f74281c7608d7d8f3e986494a763c981c1aef936088da1ab4fc8 +size 182824 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset index 9c669c20..04866db2 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:339d24fd1f9dcc65f821af947466a5c7278a74790ede50941fce5c9561e556fe -size 25252 +oid sha256:88530c75feaa3a5ae973962f72a1ca7b2c34be7a552a61db18a74b0c739c4a3f +size 27114 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index 3356b054..d320596e 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6018597114beef9dd695ae8cfd205ecb429e5d854c31244a49930a28688df7cf -size 1936322 +oid sha256:9f66d5325e533e2512616a08ec970350af33783d40079e87a3fddcd7f9c1f8a1 +size 1936940 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 3f0cf8be..4c4d5bca 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:dcd744415c36d7f01a64653563dd413a017466bf707c108ec6733da0fcfb7d66 +oid sha256:251d138dfec13168b7377f8bf7ff38b62151dc9968919a11ce68ab1e86bd0e02 size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp new file mode 100644 index 00000000..2f6d999e --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp @@ -0,0 +1,18 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "WeaponDepositCheckpoint.h" + +#include "EndlessVendetta/EndlessVendettaCharacter.h" + +void AWeaponDepositCheckpoint::Interact() +{ + if (!Active) return; + + UE_LOG(LogTemp,Warning, TEXT("Sooooo ermmmmmm")); + AEndlessVendettaCharacter* Player = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); + if (Player->bHasRifle) Player->EquipSecondary(); + Player->bLockSecondary = true; + OpenElevatorDoor(); + BroadcastCompletion(); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h new file mode 100644 index 00000000..953f0b01 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "EndlessVendetta/InteractionInterface.h" +#include "EndlessVendetta/BountySystem/CheckpointClass.h" +#include "WeaponDepositCheckpoint.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API AWeaponDepositCheckpoint : public ACheckpointClass, public IInteractionInterface +{ + GENERATED_BODY() + +protected: + void Interact() override; + + UFUNCTION(BlueprintImplementableEvent) + void OpenElevatorDoor(); + +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 5de27d68..7b2cdbcc 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -493,7 +493,7 @@ void AEndlessVendettaCharacter::EquipPrimary() void AEndlessVendettaCharacter::EquipSecondary() { - if (bIsReloading) return; + if (bIsReloading || bLockSecondary) return; if (!IsValid(SecondaryWeaponClass)) return; if (PlayerOnShip || InPauseMenu) return; FActorSpawnParameters spawnParams; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 8255dd6d..778da25d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -219,6 +219,8 @@ public: AGadgetManager* GadgetManager; bool bIsReloading = false; + bool bLockSecondary = false; + bool bIsPlayerMoving = false; UPROPERTY(VisibleAnywhere, BlueprintReadWrite)