From f4deb1500fb6942b9ad0bb79147415528d1a298f Mon Sep 17 00:00:00 2001 From: LOUIS HORNE Date: Thu, 23 Nov 2023 12:05:54 +0000 Subject: [PATCH 01/14] Added door. Colour can can be changed in the mat Open the material, change the value from 1 - 3 to change the colour (whole numbers) --- .../Assets/Objects/Tutorial-Level/Bathroom/Button.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset | 3 +++ .../Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset | 3 +++ .../Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/Shower_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset | 3 +++ .../Objects/Tutorial-Level/Bathroom/standardSurface5.uasset | 3 +++ .../Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset | 3 +++ .../Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset | 3 +++ .../Textures/Doors/Doors_01-04_low_Doors_Normal.uasset | 3 +++ .../Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset | 3 +++ .../Objects/Tutorial-Level/Textures/Doors/M_Door.uasset | 3 +++ .../Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset | 3 +++ .../Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 4 ++-- .../BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset | 4 ++-- .../Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- 23 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset create mode 100644 EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset new file mode 100644 index 00000000..a6aac258 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06c1d10c0ae9c282545d7cb0fa8e3f57c0422bfc013efddd9b862ed6b750cbf1 +size 8079 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset new file mode 100644 index 00000000..e9323d78 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:001039603d515a2275590ca7e9f5c8b5d04f151911df52be5952e524e62a768c +size 23113 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset new file mode 100644 index 00000000..1064ebab --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Button_Low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:015c7e340108697b530b6c765281df940528f55231bc0c9ba6932757830840ef +size 21560 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset new file mode 100644 index 00000000..a3b1dc09 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Seat_Low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:905cd7474a033deaf0af950c1bf3f98f15a40f8f0add6b1fac4d054440391bfb +size 23961 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset new file mode 100644 index 00000000..4c78149b --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/SM_Toilet_Toilet_Low1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e144ca56ad2e65433ce9ddf54594b6cafd8fd709848703eb84c4194d281886cc +size 164255 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset new file mode 100644 index 00000000..a2a6b046 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52b1986a1e5fe508ca3c161423d2e991260fa229145719c32596b703020c9410 +size 8074 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset new file mode 100644 index 00000000..8af25233 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21116a8d95beb64c1308b3cdfe44b942b47c7a351442fb1d4ef590f355cdf4f7 +size 95535 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset new file mode 100644 index 00000000..b7285322 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d836513a7bbec906d9f4ce2f8518e2862b74d75fc5bc738b6b495015f935364f +size 51749 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset new file mode 100644 index 00000000..5095cc21 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Export.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf58f7020f4d029056da97041cc4d29089edbea2e6dc81e4669aa030df1fafff +size 29568 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset new file mode 100644 index 00000000..64d89846 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3c45925c925cc4bb179a872a2cf157f76117fee5c192a7e3dfe93ff7e4f784 +size 8078 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset new file mode 100644 index 00000000..b0314815 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a3c1c643022c43b138f2a071856fb60c1df1c511c6e6c8862984a7010e002a1 +size 8095 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset new file mode 100644 index 00000000..fe5e845c --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc55b1a8b638c9ccc397b98b396c092a0e084603e68bcd10fb1729379c47852b +size 8146 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset new file mode 100644 index 00000000..5df5287d --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8a14865171c5b65c7d8be0d46726353e8104e68683cd99357126260b55698a5 +size 34850 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset new file mode 100644 index 00000000..10b802a1 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:448c48a8287fd90a9fd71800a7087eb6e1b2bc627a3521c26bda980738caea6b +size 598632 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset new file mode 100644 index 00000000..15a294ab --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0644617ac381f191d6d72c9f86a889517c158c167463ef38789daa06aebdc4ed +size 1028057 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset new file mode 100644 index 00000000..c5a08250 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/Doors_01-04_low_Doors_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a253f3ea6a930a7b0f7ddc5c246a4df6a1a39a45825e1e9acc6a6364da29e51 +size 352971 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset new file mode 100644 index 00000000..587c6cfc --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:785ddd52d577ca4e0781a0d587f7695a0bb3a9832de221d94667ba39da4d4028 +size 17199 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset index 15ffec2e..372c7525 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76986ee4471d33ce4239f900ec8ba81ca2d514c500a19633881965ad5904067a -size 11672 +oid sha256:f0c03bea7638b90df30171066477cf6ea55b8320336f4770b18916b20a6689e2 +size 11875 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset new file mode 100644 index 00000000..3245e65a --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Door_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:591da916ae121f8e2b05185761a6bcf5f90c338c053fe2976e3f7d72f257ff1a +size 12748 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset index 895e9e1f..777ad054 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:987a4e9d5c25f997a75e654527036ae30b5f2657db8317e10a8c5d10c28bfe8e -size 40669 +oid sha256:00849c635d8e843e1520e12a92f95fd99d9b29e670718919dc847fa283ecc3c9 +size 40704 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index db396f72..14593b0f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5fdbc6cb67c6ec9d80147c3321ff6ad03bc64b283039537ab274631bec01f74 -size 40173 +oid sha256:f9481ef86ac85568b121922e82b67586cd754928de5fa47e2c8ef57066b514b3 +size 40119 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset index 2e99cff0..dde4061d 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91ac6fb94624f653a7486d1307aaf136e4a1a81559c15e167eb887e3f8cb5f9a -size 191860 +oid sha256:ead2d32698cc8f6f60af3405fa3b9f5f1452791c2c759e631744a26cebf6749e +size 185820 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 37596dba..f669362d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04e19f6714beb76a66600fc3c8ea8e68d8ab2f9102ba687caa263a29e4ea5ae0 -size 637103 +oid sha256:fbcf735252e1048bb3e6b287ddd7b485ae55154e75fb84b88577b077c2428557 +size 646936 From c955020483816c68447148e668f72a4508b66aa9 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 15:25:46 +0000 Subject: [PATCH 02/14] Re-Added Bounty Director to Tutorial Level and Fixed Missing Tag on ArtTest Rifle --- .../Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset index 777ad054..5cd48aa7 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00849c635d8e843e1520e12a92f95fd99d9b29e670718919dc847fa283ecc3c9 -size 40704 +oid sha256:55d9774b1be0067976e247efb9c0924028d8e6f104a2356fc3c244d0ca0bcbab +size 40721 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index f669362d..e06ff1a2 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbcf735252e1048bb3e6b287ddd7b485ae55154e75fb84b88577b077c2428557 -size 646936 +oid sha256:dcd44c870217e54259c4d1d8f70580c49d4ed89fb9b23ef05b894d9d4a9bd82b +size 649426 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 9e791280..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:700ed88e0d0d5ea5f66e69543fa858c40822e833a6c147ec16a86a435194ad43 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..5b36e46b 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:f21bd334df638394854b87ecb58b20d6d26ba0424976e1ad027fdd6e8d7d7764 +size 66790690 From 9020cdb284fda7423bcaa8a4d652ec70eebacfa4 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 15:53:52 +0000 Subject: [PATCH 03/14] Implemented Text to Checkpoint Completed UI --- .../Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset | 4 ++-- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset | 4 ++-- .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 3 +++ .../Source/EndlessVendetta/BountySystem/CheckpointClass.h | 1 - .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 09b70476..09966a1a 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b07b293876d399dfdce186c99573c335e2e2e509856f7a67a2a463569b4f23d -size 30404 +oid sha256:b58d0ca6a59826731ad87a5a7fc10d3006d44eab8ccba7ef819e065a8c6da9c1 +size 30968 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 8e4ecbd1..5fb874ed 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:722ad362b974f8cd884e1852c963e27f75f4ed6f285759adbd3c3571b1f477c0 -size 57740 +oid sha256:87aebe0b0ade2372a24d8570aa5634a1d111bfee7a657fb15631ce0569065b4f +size 60696 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset index 3ef7c033..ece0d8c4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:845fc89fb83a130aea8498c87ed41fadd3de14e00ac010bcd5843b5a19c29f8f -size 58154 +oid sha256:64fe64e549080d0ddf002d488c0e30412912c0088e529e0895ead72f976b2dad +size 79669 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index 38d939c9..bfd9876e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -70,6 +70,7 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->Destroy(); BountyCheckpoints.RemoveAt(0); UE_LOG(LogTemp, Warning, TEXT(" You've Completed the Bounty!! Well done")); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(FString("")); return; } @@ -89,6 +90,8 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->SpawnWaypoint(); BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); + + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointDesc()); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 9c0fa9bf..2bc602b1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -34,7 +34,6 @@ protected: UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() { - Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(); CompletedCheckpoint.Broadcast(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 106416a8..5661588f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -196,7 +196,7 @@ public: void WeaponSwitcher(AActor* Outhit); UFUNCTION(BlueprintImplementableEvent) - void CheckpointCompletedUI(); + void CheckpointCompletedUI(const FString& CheckpointDesc); // Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used bool UpdateGadgetType(TSubclassOf NewGadgetClass); From 62d33c6856183c62ce4362efe4ec4f4bc076325c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 16:43:28 +0000 Subject: [PATCH 04/14] Added Tips to All Checkpoints --- .../BountySimulation/CP_ElimTutorialTarget.uasset | 4 ++-- .../CP_EnterBountySimulationFacility.uasset | 4 ++-- .../BountySimulation/CP_ExitBountySimulationFacility.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset | 4 ++-- .../GadgetTutorial/Combat/CP_CombatTraining.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset | 4 ++-- .../GadgetTutorial/Recon/CP_ReconTraining.uasset | 4 ++-- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- .../Content/BountySystem/Waypoint/TextBackground.png | 3 +++ .../Content/BountySystem/Waypoint/TextBackground.uasset | 3 +++ .../Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset | 4 ++-- .../FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 2 +- .../Source/EndlessVendetta/BountySystem/CheckpointClass.h | 6 ++++++ 18 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset index 5883a4f1..6f3dcce1 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:727b8060f6720e1de8c6cc5aa95de4e3d2c18b4b6df469c5f1661679379f3054 -size 143152 +oid sha256:eafef3871610bf15d90d680c56e28c40ec4e54d5b735a02ae83706187362aed0 +size 144071 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index a42c2499..597ba32f 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09f78d33c2a88b48b438f3382f6db685a54203b9036a09f80f768b17e0c9d77d -size 74030 +oid sha256:cb5d6652ffbeb2dffe9d2c7bf7250396d62c63f29b58fafce029a1ee444d976a +size 74754 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset index 478f5860..82b10472 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e7b67b89169f8856643fa54ad3ee70088d8e57278dda3eae8a67cebae80fc4d -size 49564 +oid sha256:5f20d01e14668043ceba3f5121d5441f9b10bf53ae9b329a67bc52ca2c23abe5 +size 50569 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset index 5d9c77b0..c1b4c121 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:760080e3e99953e11230e2d0611fe20c01daa1e6ea7ef3dd4c5923beb8fbc6a9 -size 38487 +oid sha256:20c146ca9121d08cc486f1d15b935101e2faad580974b40b32144f4f3cf466b6 +size 38506 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset index 9d450f09..80f6d632 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:285081531c73e061d3e6bc5def297852b57b5e3622c3e947cc0b8ceed5752f85 -size 61443 +oid sha256:c983ac6f5ed8e39f4fd28d0d35a06fc6b1d4569f0448a3e6672a1cc664e91175 +size 60950 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset index 0fdaf894..b7080ef7 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fccc1eabe3bc902abe338f8980b6f249f2578be80c1c8096a5232a132ba42c6 -size 148461 +oid sha256:9a329b5461ac74c60fb7e33cc1369d9985dfb5cf33c1f85ddf207a36f94e3fb8 +size 147979 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset index 8ed828fc..ffe2f671 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76ea44d21affaf349e16f27cb6cb3684c9c14ae417f1096846b45711de2a8a3e -size 156411 +oid sha256:e035f7ddd3dcf755fb0ed071ba8d162c3a8b17bb9e5fe788443a35df5a0f5b21 +size 156499 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset index af179740..36b8ab99 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f7376ac38e90dacafa36fd1b16bbf2227d0b577ba5ad53d43ce0d8df47bbf07 -size 46961 +oid sha256:e05c2b2a67900f795bea030cd060cb7ce55f4801f5573c5e4b5ab22ff5aa4198 +size 47609 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset index a545465a..0edb31b5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0cfa2881e250992ba5cc2fff1a9597d00531cb2732df8405f6b53d76ab675a7 -size 38882 +oid sha256:9f83c02b2613872e32f795c91ce190d44c2cfdf83785965105ed43d9e326ec7e +size 38762 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset index c32db353..90dbb721 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52fa6f6a84ca059b3f9b57959ee3cfa352d0feb833b8a5d1603bae568c4d4d7d -size 46993 +oid sha256:8c6becce8ef63d5920459cc97049122bbd5c56ff7886c49fbbccd06f2f24d8f1 +size 47510 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index ba8534c6..c1359493 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04143e23cb9403f9ae001e7ab261a6c90a890df16f81eb00c35ae1e7305ed249 -size 49046 +oid sha256:5b3d88e0df1c929eb1c4bc13653d6a152930dc9ba8575709ea070bc05c3c26c7 +size 49098 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png new file mode 100644 index 00000000..d5781e4c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d3cccd91fdbe7e0090f451048771e56d36dbe24c3cb716b63d99261f414f868 +size 2232177 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset new file mode 100644 index 00000000..2bc1ea2a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f709567521d482b2a611eeb383dde9b4b80fde46087b1e4687da6ef382afcdbb +size 1854378 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 09966a1a..cd5166a9 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b58d0ca6a59826731ad87a5a7fc10d3006d44eab8ccba7ef819e065a8c6da9c1 -size 30968 +oid sha256:deb3a67c2bba412bab8428522bf65087efd0927529eeafbb678dda460b6993ab +size 30376 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset index ece0d8c4..0a4f058e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64fe64e549080d0ddf002d488c0e30412912c0088e529e0895ead72f976b2dad -size 79669 +oid sha256:1a92359cc39feb0549f88beb0aa498c448b67afac995e88ffa2de837ad2024ec +size 80434 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index e06ff1a2..752da19b 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcd44c870217e54259c4d1d8f70580c49d4ed89fb9b23ef05b894d9d4a9bd82b -size 649426 +oid sha256:35b3811ccb41bda48b54e51242d49687d08149d0c9440b4c4ddb7ff58aec8d25 +size 654848 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index bfd9876e..1170079d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -91,7 +91,7 @@ void ABountyClass::IncrementBountyCheckpoint() BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); - Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointDesc()); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(BountyCheckpoints[0]->GetCheckpointTip()); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 2bc602b1..2797e996 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -19,6 +19,8 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FString CheckpointDescription; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") + FString CheckpointTip; + UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") FVector WaypointLoc; UPROPERTY(EditDefaultsOnly, Category = "Checkpoint") UTexture2D* WaypointIcon; @@ -60,6 +62,10 @@ public: { return CheckpointDescription; } + FString GetCheckpointTip() + { + return CheckpointTip; + } FVector GetWaypointLoc() { return WaypointLoc; From 012328b34c8aabffab1a1ee4be2def96ce32b5dd Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 25 Nov 2023 19:29:07 +0000 Subject: [PATCH 05/14] Implemented Basic Screen Space UI For Checkpoint Icon --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index c1359493..9aedebc5 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b3d88e0df1c929eb1c4bc13653d6a152930dc9ba8575709ea070bc05c3c26c7 -size 49098 +oid sha256:3af83e78f0fcbb476ea6933cb4debfec09012efd50783dd0f80cb67ff4cddc0e +size 119603 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset new file mode 100644 index 00000000..6644c0ac --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f84c5b5a563c7c12488e102545b7848020e19736adf81ea4f7b70b40d16f9902 +size 37666 From 4c2ba9b3e58e19229b5add3fd7348dfa18098fec Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 15:14:48 +0000 Subject: [PATCH 06/14] Added New Object Collision Channel Waypoint --- EndlessVendetta/Config/DefaultEngine.ini | 61 ++++++++++++++++++- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +- .../Content/Levels/TrainingFacility.umap | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../BountySystem/WaypointActor.cpp | 26 +++++++- .../BountySystem/WaypointActor.h | 6 +- 6 files changed, 91 insertions(+), 12 deletions(-) diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index 89d6c838..505db906 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -1,7 +1,62 @@ [/Script/Engine.CollisionProfile] -+Profiles=(Name="Projectile",CollisionEnabled=QueryOnly,ObjectTypeName="Projectile",CustomResponses=,HelpMessage="Preset for projectiles",bCanModify=True) -+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,Name="Projectile",DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False) -+EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) +-Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) +-Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ",bCanModify=False) +-Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ",bCanModify=False) +-Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic",Response=ECR_Block),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.",bCanModify=False) +-Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors",bCanModify=False) +-Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors",bCanModify=False) +-Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.",bCanModify=False) +-Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.",bCanModify=False) +-Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="UI",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Block),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) ++Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision") ++Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.") ++Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ") ++Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ") ++Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic"),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.") ++Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.") ++Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors") ++Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors") ++Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.") ++Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.") ++Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.") ++Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.") ++Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") ++Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="Projectile",CollisionEnabled=QueryOnly,bCanModify=True,ObjectTypeName="Projectile",CustomResponses=,HelpMessage="Preset for projectiles") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Projectile") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Waypoint") ++EditProfiles=(Name="Trigger",CustomResponses=((Channel="Projectile",Response=ECR_Ignore))) +-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") +-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") +-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") +-ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") +-ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") ++ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") ++ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") ++ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") ++ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") ++ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") +-CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") +-CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") +-CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +-CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") ++CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") ++CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") ++CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") ++CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") [/Script/EngineSettings.GameMapsSettings] EditorStartupMap=/Game/Levels/TrainingFacility.TrainingFacility diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 9aedebc5..24e94150 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3af83e78f0fcbb476ea6933cb4debfec09012efd50783dd0f80cb67ff4cddc0e -size 119603 +oid sha256:a6f84a0cd87a71d9e7634262974d939d9bf178a746ede7eaa63dbccd172691bd +size 102150 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 752da19b..1f195d7d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35b3811ccb41bda48b54e51242d49687d08149d0c9440b4c4ddb7ff58aec8d25 -size 654848 +oid sha256:7538c6b68b4473d388aaad70e1e43e13d21cd55e0aad078df0ca437ad6f81782 +size 654898 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 5b36e46b..073fc784 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f21bd334df638394854b87ecb58b20d6d26ba0424976e1ad027fdd6e8d7d7764 +oid sha256:c247df32a59590cde6089e45f176abfa9fec3dd67b5c4e370067412895eb2bc6 size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 0c9320cb..b5b82015 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -31,14 +31,34 @@ void AWaypointActor::Tick(float DeltaTime) { Super::Tick(DeltaTime); - if (!PlayersCam) SetActorTickEnabled(false); + UpdateScaleAndRotation(); +} + +bool AWaypointActor::SightCheck() +{ + FHitResult OutHit; + // FCollisionQueryParams CollisionParams = FCollisionQueryParams::DefaultQueryParam; + // CollisionParams.AddIgnoredActor(PlayersCam->GetOwner()); + FCollisionObjectQueryParams CollisionParams; + ECollisionChannel CollisionChannel; + CollisionParams.AddObjectTypesToQuery(this->GetComponentsCollisionResponseToChannel()) + FVector LT_Start = PlayersCam->GetSocketLocation(); + FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * 3000); + GetWorld()->LineTraceSingleByObjectType() +} + + +void AWaypointActor::UpdateScaleAndRotation() +{ + UE_LOG(LogTemp, Warning, TEXT("Looked at? = %s"), (SightCheck ? TEXT("True") : TEXT("False"))); + if (!PlayersCam) return; FVector WaypointLoc = GetActorLocation(); FVector PlayerCamLoc = PlayersCam->GetComponentLocation(); - + FRotator NewRot = UKismetMathLibrary::FindLookAtRotation(WaypointLoc, PlayerCamLoc); SetActorRotation(NewRot); - + float DistanceToPlayer = FVector::Distance(WaypointLoc, PlayerCamLoc); // S for Scale float S = (DistanceToPlayer * ScalingMagnitude) + ScalingY_Intercept; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index cc9b5e6a..6fdff1ca 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -13,7 +13,7 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor GENERATED_BODY() UCameraComponent* PlayersCam; - + float ScalingMagnitude; float ScalingY_Intercept; @@ -29,6 +29,10 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float ScaleAtMinDist = 0.15; + + void UpdateScaleAndRotation(); + + bool SightCheck(); protected: // Called when the game starts or when spawned From 0e937e3e5ebe56b013822da89ec05ea3c459d394 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 16:14:01 +0000 Subject: [PATCH 07/14] Implemented Main Waypoint Visibility Toggle --- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +-- .../Content/Levels/TrainingFacility.umap | 2 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../BountySystem/WaypointActor.cpp | 28 +++++++++++-------- .../BountySystem/WaypointActor.h | 6 ++++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 24e94150..7069f767 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6f84a0cd87a71d9e7634262974d939d9bf178a746ede7eaa63dbccd172691bd -size 102150 +oid sha256:3ed86d1de4a3245d813c1133967be3069a04e0578f3ea55c142df21180ed2d7b +size 111529 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 1f195d7d..5efb1b8d 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7538c6b68b4473d388aaad70e1e43e13d21cd55e0aad078df0ca437ad6f81782 +oid sha256:842aa6cfaae2bd2428eb51ca353b53825d15505936abd000d4d38a8ac0284305 size 654898 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 073fc784..0befbad2 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c247df32a59590cde6089e45f176abfa9fec3dd67b5c4e370067412895eb2bc6 +oid sha256:d321261b35d69be06fe122656bd29de989a8d3927aec5a410ddc9c80d1c97540 size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index b5b82015..939bbd9e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -3,6 +3,7 @@ #include "WaypointActor.h" +#include "Engine/EngineTypes.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" // Sets default values @@ -30,27 +31,32 @@ void AWaypointActor::BeginPlay() void AWaypointActor::Tick(float DeltaTime) { Super::Tick(DeltaTime); + + if (SightCheck()) + { + UpdateVisibility(true); + UpdateScaleAndRotation(); + return; + } + + UpdateVisibility(false); + - UpdateScaleAndRotation(); } bool AWaypointActor::SightCheck() { FHitResult OutHit; - // FCollisionQueryParams CollisionParams = FCollisionQueryParams::DefaultQueryParam; - // CollisionParams.AddIgnoredActor(PlayersCam->GetOwner()); - FCollisionObjectQueryParams CollisionParams; - ECollisionChannel CollisionChannel; - CollisionParams.AddObjectTypesToQuery(this->GetComponentsCollisionResponseToChannel()) - FVector LT_Start = PlayersCam->GetSocketLocation(); - FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * 3000); - GetWorld()->LineTraceSingleByObjectType() + FCollisionObjectQueryParams ObjectQueryParams; + ObjectQueryParams.AddObjectTypesToQuery(ECollisionChannel::ECC_GameTraceChannel2); + FVector LT_Start = PlayersCam->GetComponentLocation(); + FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * WaypointFocusDistance); + if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams)) return true; + return false; } - void AWaypointActor::UpdateScaleAndRotation() { - UE_LOG(LogTemp, Warning, TEXT("Looked at? = %s"), (SightCheck ? TEXT("True") : TEXT("False"))); if (!PlayersCam) return; FVector WaypointLoc = GetActorLocation(); diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index 6fdff1ca..e8936dec 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -18,6 +18,9 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor float ScalingY_Intercept; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint") + float WaypointFocusDistance = 3000; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float MaxDist = 16000.f; @@ -38,6 +41,9 @@ protected: // Called when the game starts or when spawned virtual void BeginPlay() override; + UFUNCTION(BlueprintImplementableEvent) + void UpdateVisibility(bool IsVisible); + public: // Sets default values for this actor's properties AWaypointActor(); From 787c9c76f10ab19a6ad0e7b1bb318ce772d0f36d Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 16:16:17 +0000 Subject: [PATCH 08/14] Removed Test Mini Waypoint BP --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- .../Content/BountySystem/Waypoint/TextBackground.uasset | 3 --- EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset | 3 --- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 7069f767..fea9a176 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ed86d1de4a3245d813c1133967be3069a04e0578f3ea55c142df21180ed2d7b -size 111529 +oid sha256:7f2025158a6ae81155530070b6becb40850e60358ca27e87bee12a410a19bb53 +size 100344 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset deleted file mode 100644 index 2bc1ea2a..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f709567521d482b2a611eeb383dde9b4b80fde46087b1e4687da6ef382afcdbb -size 1854378 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset deleted file mode 100644 index 6644c0ac..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/wbp_SS.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f84c5b5a563c7c12488e102545b7848020e19736adf81ea4f7b70b40d16f9902 -size 37666 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0befbad2..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d321261b35d69be06fe122656bd29de989a8d3927aec5a410ddc9c80d1c97540 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..556e3c1b 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:1ca0d15344c39404b70241423c636cec9d5b0f5ef0e4251dc797d3432b3a8263 +size 53268 From 153e02635408f1ffda28006000dfe5bc031d6b4a Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 16:39:39 +0000 Subject: [PATCH 09/14] Added New Mini Waypoint Class with Visibility Toggle --- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- .../Waypoint/WBP_MiniWaypoint.uasset | 3 +++ .../BountySystem/WaypointActor.cpp | 7 +++++-- .../BountySystem/WaypointActor.h | 6 ++++++ .../UserWidgets/MiniWaypoint.cpp | 5 +++++ .../UserWidgets/MiniWaypoint.h | 21 +++++++++++++++++++ 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index fea9a176..020a3c2c 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f2025158a6ae81155530070b6becb40850e60358ca27e87bee12a410a19bb53 -size 100344 +oid sha256:a523b2149e46a3b369ca97e969d9a3f241a7af78f45b6500febbe252b9a53193 +size 100785 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset new file mode 100644 index 00000000..b4cca8c2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48aab2df957e2a9988712c7a2913d041000b8948f572298a8d8f23c759161e0a +size 39684 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 939bbd9e..ce186cbb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -16,7 +16,6 @@ AWaypointActor::AWaypointActor() // Called when the game starts or when spawned void AWaypointActor::BeginPlay() { - SetActorTickEnabled(false); Super::BeginPlay(); SetActorTickInterval(0.05); @@ -24,7 +23,9 @@ void AWaypointActor::BeginPlay() PlayersCam = Cast(PlayerActor->GetComponentByClass(UCameraComponent::StaticClass())); ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist); ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); - if (PlayersCam) SetActorTickEnabled(true); + + MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); + MiniWaypoint->AddToViewport(1); } // Called every frame @@ -36,10 +37,12 @@ void AWaypointActor::Tick(float DeltaTime) { UpdateVisibility(true); UpdateScaleAndRotation(); + MiniWaypoint->UpdateVisibility(false); return; } UpdateVisibility(false); + MiniWaypoint->UpdateVisibility(true); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index e8936dec..d86c1207 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "Camera/CameraComponent.h" +#include "EndlessVendetta/UserWidgets/MiniWaypoint.h" #include "GameFramework/Actor.h" #include "WaypointActor.generated.h" @@ -21,6 +22,11 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor UPROPERTY(EditDefaultsOnly, Category = "Waypoint") float WaypointFocusDistance = 3000; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint") + TSubclassOf MiniWaypointClass; + + UMiniWaypoint* MiniWaypoint; + UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float MaxDist = 16000.f; diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp new file mode 100644 index 00000000..68f8f0f4 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MiniWaypoint.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h new file mode 100644 index 00000000..a556167d --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Blueprint/UserWidget.h" +#include "MiniWaypoint.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API UMiniWaypoint : public UUserWidget +{ + GENERATED_BODY() + +public: + UFUNCTION(BlueprintImplementableEvent) + void UpdateVisibility(bool IsVisible); + +}; From 5a8d8e828454bb80b0c8abee1f12666affb25f6c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 21:23:54 +0000 Subject: [PATCH 10/14] Implemented Mini Waypoint Appearing When Main Waypoint is Out of Focus --- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +- .../Waypoint/WBP_MiniWaypoint.uasset | 4 +- .../Content/Levels/TrainingFacility.umap | 2 +- .../BountySystem/WaypointActor.cpp | 15 ++--- .../BountySystem/WaypointActor.h | 5 +- .../UserWidgets/MiniWaypoint.cpp | 60 +++++++++++++++++++ .../UserWidgets/MiniWaypoint.h | 16 +++++ 7 files changed, 88 insertions(+), 18 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 020a3c2c..d2678445 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a523b2149e46a3b369ca97e969d9a3f241a7af78f45b6500febbe252b9a53193 -size 100785 +oid sha256:adf1682c60d18b92e71347784817def276af822981b49939047b0e98e8d1d1f5 +size 105318 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset index b4cca8c2..4162142b 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48aab2df957e2a9988712c7a2913d041000b8948f572298a8d8f23c759161e0a -size 39684 +oid sha256:d3d5b6b3ec13c451b42ae7c71efdfc6878d1e4dbdb366e7256834767a8cd6364 +size 42017 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 5efb1b8d..afb2d366 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:842aa6cfaae2bd2428eb51ca353b53825d15505936abd000d4d38a8ac0284305 +oid sha256:9b6671545b77ffaff9044f90b3f250e2384252cb1d7a122617969c932a0f863e size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index ce186cbb..6c5f9674 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -13,19 +13,19 @@ AWaypointActor::AWaypointActor() PrimaryActorTick.bCanEverTick = true; } -// Called when the game starts or when spawned -void AWaypointActor::BeginPlay() +void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FString& Desc) { - Super::BeginPlay(); - SetActorTickInterval(0.05); AActor* PlayerActor = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); PlayersCam = Cast(PlayerActor->GetComponentByClass(UCameraComponent::StaticClass())); ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist); ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); - + MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); MiniWaypoint->AddToViewport(1); + MiniWaypoint->WorldLoc = this->GetActorLocation(); + MiniWaypoint->PlayerController = GetWorld()->GetFirstPlayerController(); + MiniWaypoint->SetIcon(Icon); } // Called every frame @@ -33,18 +33,15 @@ void AWaypointActor::Tick(float DeltaTime) { Super::Tick(DeltaTime); + UpdateScaleAndRotation(); if (SightCheck()) { UpdateVisibility(true); - UpdateScaleAndRotation(); MiniWaypoint->UpdateVisibility(false); return; } - UpdateVisibility(false); MiniWaypoint->UpdateVisibility(true); - - } bool AWaypointActor::SightCheck() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index d86c1207..a8957749 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -44,9 +44,6 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor bool SightCheck(); protected: - // Called when the game starts or when spawned - virtual void BeginPlay() override; - UFUNCTION(BlueprintImplementableEvent) void UpdateVisibility(bool IsVisible); @@ -57,7 +54,7 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; - UFUNCTION(BlueprintImplementableEvent) + UFUNCTION(BlueprintNativeEvent) void SetupWaypoint(UTexture2D* Icon, const FString& Desc); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index 68f8f0f4..6ee988a9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -3,3 +3,63 @@ #include "MiniWaypoint.h" + + +void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) +{ + Super::NativeTick(MyGeometry, InDeltaTime); + + if (!IsValid(IconCanvasPanelSlot) || !IsValid(PlayerController)) return; + + FVector2D ScreenLoc; + PlayerController->ProjectWorldLocationToScreen(WorldLoc, ScreenLoc); + + // Check if waypoint is outside of players vision frustum + if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) + { + //UE_LOG(LogTemp, Warning, TEXT("IconPos: %f"), IconCanvasPanelSlot->GetPosition().X); + + float PlayerYaw = PlayerController->GetControlRotation().Yaw; + float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; + if (TargetYaw < 0 ) TargetYaw += 360; + + UE_LOG(LogTemp, Warning, TEXT("Yaw: %f"), PlayerController->GetControlRotation().Yaw); + UE_LOG(LogTemp, Warning, TEXT("Look at Yaw: %f"), TargetYaw); + + // Check if waypoint is closer to the players right + bool TargetOnTheRight = false; + if (PlayerYaw >= TargetYaw) + { + TargetOnTheRight = FMath::Abs(TargetYaw - PlayerYaw) >= 180; + } + else + { + TargetOnTheRight = TargetYaw - PlayerYaw <= 180; + } + + UE_LOG(LogTemp, Warning, TEXT("On the right?...%s"), TargetOnTheRight ? TEXT("true") : TEXT("false")); + return; + } + + FVector2d ViewPortSize; + GEngine->GameViewport->GetViewportSize(ViewPortSize); + float ViewportHalfX = ViewPortSize.X / 2.f; + float ViewportHalfY = ViewPortSize.Y / 2.f; + + // Centers the icon + ScreenLoc.X -= ViewportHalfX; + ScreenLoc.Y -= ViewportHalfY; + + float ViewportMarginX = ViewportHalfX * 0.8f; + float ViewportMarginY = ViewportHalfY * 0.6f; + + ScreenLoc.X = FMath::Clamp(ScreenLoc.X, ViewportMarginX * -1.f, ViewportMarginX); + ScreenLoc.Y = FMath::Clamp(ScreenLoc.Y, ViewportMarginY * -1.f, ViewportMarginY); + + IconCanvasPanelSlot->SetPosition(ScreenLoc); +} + +void UMiniWaypoint::SetIconPanelSlot(UImage* IconImage) +{ + IconCanvasPanelSlot = Cast(IconImage->Slot); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h index a556167d..0089f226 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h @@ -4,6 +4,8 @@ #include "CoreMinimal.h" #include "Blueprint/UserWidget.h" +#include "Components/CanvasPanelSlot.h" +#include "Components/Image.h" #include "MiniWaypoint.generated.h" /** @@ -13,9 +15,23 @@ UCLASS() class ENDLESSVENDETTA_API UMiniWaypoint : public UUserWidget { GENERATED_BODY() + + void NativeTick(const FGeometry& MyGeometry, float InDeltaTime) override; + + UCanvasPanelSlot* IconCanvasPanelSlot; + +protected: + UFUNCTION(BlueprintCallable) + void SetIconPanelSlot(UImage* IconImage); public: + FVector WorldLoc = FVector(0, 0, 0); + APlayerController* PlayerController; + UFUNCTION(BlueprintImplementableEvent) void UpdateVisibility(bool IsVisible); + + UFUNCTION(BlueprintImplementableEvent) + void SetIcon(UTexture2D* Icon); }; From cbf89a2c938c0061c717a3f565b9c93a095d052b Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 22:45:21 +0000 Subject: [PATCH 11/14] Implemented Mini Waypoint Direction Toggle --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 2 +- EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- .../EndlessVendetta/UserWidgets/MiniWaypoint.cpp | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index d2678445..dc557ee3 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adf1682c60d18b92e71347784817def276af822981b49939047b0e98e8d1d1f5 +oid sha256:4d5808bd83b46d892a7321c2bad2bee7aec16fbd8b427d0b05b760fcc596c906 size 105318 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index afb2d366..2ebfb2cd 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b6671545b77ffaff9044f90b3f250e2384252cb1d7a122617969c932a0f863e +oid sha256:c4ea69a798330d981b7d72fce4e0999e306589ee7e0b3b49ce9a69adf36d6348 size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index 6ee988a9..bb2d4640 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -17,17 +17,12 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) // Check if waypoint is outside of players vision frustum if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) { - //UE_LOG(LogTemp, Warning, TEXT("IconPos: %f"), IconCanvasPanelSlot->GetPosition().X); - float PlayerYaw = PlayerController->GetControlRotation().Yaw; float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; if (TargetYaw < 0 ) TargetYaw += 360; - UE_LOG(LogTemp, Warning, TEXT("Yaw: %f"), PlayerController->GetControlRotation().Yaw); - UE_LOG(LogTemp, Warning, TEXT("Look at Yaw: %f"), TargetYaw); - // Check if waypoint is closer to the players right - bool TargetOnTheRight = false; + bool TargetOnTheRight; if (PlayerYaw >= TargetYaw) { TargetOnTheRight = FMath::Abs(TargetYaw - PlayerYaw) >= 180; @@ -37,7 +32,10 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) TargetOnTheRight = TargetYaw - PlayerYaw <= 180; } - UE_LOG(LogTemp, Warning, TEXT("On the right?...%s"), TargetOnTheRight ? TEXT("true") : TEXT("false")); + FVector2D NewPos = IconCanvasPanelSlot->GetPosition(); + if ((TargetOnTheRight && NewPos.X < 0) || (!TargetOnTheRight && NewPos.X > 0)) NewPos.X *= -1; + + IconCanvasPanelSlot->SetPosition(NewPos); return; } From c51f2ab7b6cb45aa2d5b55bfe18a24fe7a310cf8 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 23:26:01 +0000 Subject: [PATCH 12/14] Added a Directional Arrow to Mini Waypoints --- .../Waypoint/WBP_MiniWaypoint.uasset | 4 ++-- .../BountySystem/Waypoint/WaypointArrow.png | 3 +++ .../BountySystem/Waypoint/WaypointArrow.uasset | 3 +++ .../Content/Levels/TrainingFacility.umap | 2 +- .../EndlessVendetta/UserWidgets/MiniWaypoint.cpp | 16 +++++++++------- .../EndlessVendetta/UserWidgets/MiniWaypoint.h | 6 ++++-- 6 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset index 4162142b..cd79767a 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_MiniWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3d5b6b3ec13c451b42ae7c71efdfc6878d1e4dbdb366e7256834767a8cd6364 -size 42017 +oid sha256:432d04e87414a6a95285b4468bfe64d4631557cef349a37f6e60087e843f85d9 +size 48883 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png new file mode 100644 index 00000000..5909a350 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9cd8b801f66f1241477554f28ec764079c875e75400bf22dec42494c2807650 +size 44164 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset new file mode 100644 index 00000000..efc268bd --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd99b04a977e5fa33f966683ec783006f1289b9ea7cb856f646aafc057293fe6 +size 33619 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 2ebfb2cd..f16e3960 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4ea69a798330d981b7d72fce4e0999e306589ee7e0b3b49ce9a69adf36d6348 +oid sha256:d3943e1a064276d17b897a7a10a3c42a35c75d6c02117bd1ea962544f3576a9b size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index bb2d4640..03a7b6be 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -4,7 +4,6 @@ #include "MiniWaypoint.h" - void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) { Super::NativeTick(MyGeometry, InDeltaTime); @@ -14,13 +13,15 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) FVector2D ScreenLoc; PlayerController->ProjectWorldLocationToScreen(WorldLoc, ScreenLoc); + float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; + float PlayerYaw = PlayerController->GetControlRotation().Yaw; + if (TargetYaw < 0 ) TargetYaw += 360; + + ArrowImage->SetRenderTransformAngle(TargetYaw - PlayerYaw); + // Check if waypoint is outside of players vision frustum if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) { - float PlayerYaw = PlayerController->GetControlRotation().Yaw; - float TargetYaw = (WorldLoc - PlayerController->GetPawn()->GetActorLocation()).Rotation().Yaw; - if (TargetYaw < 0 ) TargetYaw += 360; - // Check if waypoint is closer to the players right bool TargetOnTheRight; if (PlayerYaw >= TargetYaw) @@ -57,7 +58,8 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) IconCanvasPanelSlot->SetPosition(ScreenLoc); } -void UMiniWaypoint::SetIconPanelSlot(UImage* IconImage) +void UMiniWaypoint::SetIconPanelSlot(UCanvasPanel* IconParent, UImage* ArrowImageComp) { - IconCanvasPanelSlot = Cast(IconImage->Slot); + ArrowImage = ArrowImageComp; + IconCanvasPanelSlot = Cast(IconParent->Slot); } diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h index 0089f226..9f810bfd 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.h @@ -5,6 +5,7 @@ #include "CoreMinimal.h" #include "Blueprint/UserWidget.h" #include "Components/CanvasPanelSlot.h" +#include "Components/CanvasPanel.h" #include "Components/Image.h" #include "MiniWaypoint.generated.h" @@ -19,10 +20,11 @@ class ENDLESSVENDETTA_API UMiniWaypoint : public UUserWidget void NativeTick(const FGeometry& MyGeometry, float InDeltaTime) override; UCanvasPanelSlot* IconCanvasPanelSlot; + UImage* ArrowImage; -protected: +protected: UFUNCTION(BlueprintCallable) - void SetIconPanelSlot(UImage* IconImage); + void SetIconPanelSlot(UCanvasPanel* IconParent, UImage* ArrowImageComp); public: FVector WorldLoc = FVector(0, 0, 0); From 797653132eb3a966a5db585eed51027c5e5e99d2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sun, 26 Nov 2023 23:59:53 +0000 Subject: [PATCH 13/14] Fixed Multiple Main Waypoints Becoming Focused When Looking at Just One --- .../Content/BountySystem/Waypoint/BP_Waypoint.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../EndlessVendetta/BountySystem/CheckpointClass.cpp | 1 + .../EndlessVendetta/BountySystem/WaypointActor.cpp | 11 +++++++++-- .../EndlessVendetta/BountySystem/WaypointActor.h | 2 ++ 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index dc557ee3..784cbe0b 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d5808bd83b46d892a7321c2bad2bee7aec16fbd8b427d0b05b760fcc596c906 -size 105318 +oid sha256:a406c3c753428efd22e472351a913e042fd0653a7430e4ee29ae7149559d92b4 +size 62287 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index f16e3960..af04d0dd 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3943e1a064276d17b897a7a10a3c42a35c75d6c02117bd1ea962544f3576a9b -size 654898 +oid sha256:68499c0acedf4bd43fa13b5244a3900ad9850ff62e15ac85b1e337859200d06d +size 654847 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index 556e3c1b..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca0d15344c39404b70241423c636cec9d5b0f5ef0e4251dc797d3432b3a8263 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..89145d94 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:b7943b84a70f66da9ce4c738e5748bd6853c3af285ea2f99a76efa584cb31301 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index 5562a2b8..df618059 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -46,6 +46,7 @@ void ACheckpointClass::Tick(float DeltaTime) void ACheckpointClass::Destroyed() { if (WaypointActor) WaypointActor->Destroy(); + Super::Destroyed(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 6c5f9674..531fff83 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -22,7 +22,7 @@ void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FStrin ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); - MiniWaypoint->AddToViewport(1); + MiniWaypoint->AddToViewport(0); MiniWaypoint->WorldLoc = this->GetActorLocation(); MiniWaypoint->PlayerController = GetWorld()->GetFirstPlayerController(); MiniWaypoint->SetIcon(Icon); @@ -51,7 +51,7 @@ bool AWaypointActor::SightCheck() ObjectQueryParams.AddObjectTypesToQuery(ECollisionChannel::ECC_GameTraceChannel2); FVector LT_Start = PlayersCam->GetComponentLocation(); FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * WaypointFocusDistance); - if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams)) return true; + if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams) && OutHit.GetActor()->GetUniqueID() == this->GetUniqueID()) return true; return false; } @@ -72,3 +72,10 @@ void AWaypointActor::UpdateScaleAndRotation() SetActorScale3D(FVector(1.f, S, S)); } +void AWaypointActor::Destroyed() +{ + if (IsValid(MiniWaypoint)) MiniWaypoint->RemoveFromParent(); + Super::Destroyed(); +} + + diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index a8957749..63538881 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -47,6 +47,8 @@ protected: UFUNCTION(BlueprintImplementableEvent) void UpdateVisibility(bool IsVisible); + void Destroyed() override; + public: // Sets default values for this actor's properties AWaypointActor(); From 53c64e90f4faea9e3f2b321e80a36b011f91deb2 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 27 Nov 2023 00:12:45 +0000 Subject: [PATCH 14/14] Fixed Mini Waypoint Being Stuck to Center of Screen When Main Waypoint Spawns Behind Player --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index af04d0dd..173d1ed4 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68499c0acedf4bd43fa13b5244a3900ad9850ff62e15ac85b1e337859200d06d -size 654847 +oid sha256:ce3870108ae2fe9758eaa20ecb25f73f4623f2e9acad154d2075db2ca0fc1d0f +size 654898 diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp index 03a7b6be..679372cb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/MiniWaypoint.cpp @@ -20,8 +20,8 @@ void UMiniWaypoint::NativeTick(const FGeometry& MyGeometry, float InDeltaTime) ArrowImage->SetRenderTransformAngle(TargetYaw - PlayerYaw); // Check if waypoint is outside of players vision frustum - if (FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) - { + if (FMath::IsNearlyZero(ScreenLoc.X) && FMath::IsNearlyZero(ScreenLoc.Y) && !FMath::IsNearlyZero(IconCanvasPanelSlot->GetPosition().X))//(FMath::IsWithin(ScreenLoc.X, -0.01, 0.01) && FMath::IsWithin(ScreenLoc.Y, -0.01, 0.01)) + { // Check if waypoint is closer to the players right bool TargetOnTheRight; if (PlayerYaw >= TargetYaw)