diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset index 852dfa21..98664dd1 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BP_GreasyRick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6953fab657d76ea4a5f6ecefddd23ca6f9338af8b71624a86e5b8aa85dfb47b3 -size 76517 +oid sha256:5116f4dc040f1ca11d223113b30367becef3f6ff4d3e194ab165fe9f6b2088ee +size 153438 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT/BTT_ArrivedOutsideMarket.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT/BTT_ArrivedOutsideMarket.uasset new file mode 100644 index 00000000..5ef7734f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT/BTT_ArrivedOutsideMarket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bd6e7677eb3a1670154b60289a729baa6680187e4eb5a325aded8ef70dfe906 +size 29210 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT_SetRotation.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT_SetRotation.uasset deleted file mode 100644 index 997c0011..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT_SetRotation.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e006907ba22b71d8f79c763857bba9813f901785efc5a6315a458d803ca8e1f -size 26328 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BT_GreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BT_GreasyRick.uasset index fbe6620a..dec6444b 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BT_GreasyRick.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BT_GreasyRick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ffeb2c71c53f3f08add5ce504c432661e1f2367cdd8f693e3e95cba3b81e1d8 -size 11836 +oid sha256:0813ab3a09c6908f9482546d7df1f19b4e2204345885e6f6cca5a44448f8c4b5 +size 11764 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickDefault.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickDefault.uasset index 3e359e4e..0013c3d2 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickDefault.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickDefault.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b75baf8d20d04fa43f583eba1d0609aac97915bbd9a13cf6af2051f15dc62484 -size 6752 +oid sha256:ab1cfbbd67cb5f5f34c1dca5da0625dd8829ab06e8537c4fdf8e4d507ed05be1 +size 7242 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset index 17fcbf95..04452721 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ab479df95c2cb7f6f6e2a50747f3e3c47ad70a236483703d518c47498173dc -size 22526 +oid sha256:66163b728de6a632e2419bf67335be18e7e006862bc093974a6b2b601578af1f +size 24909 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_OutsideMarketArea.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_OutsideMarketArea.uasset new file mode 100644 index 00000000..994d117b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_OutsideMarketArea.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44a8880304314cde96c89b29b2c9f5c7330e59f389529862ac589de57db16774 +size 16962 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset new file mode 100644 index 00000000..93242c83 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e42b92883d3bcbfc1b4d46642fbed40a5dd91e27d8b9cf25eaf367a99b0346c9 +size 41050 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_Apartment.uasset new file mode 100644 index 00000000..54c74c5b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_Apartment.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab29d188a8041468715c0d14cfda840bf038759591aa61c0252577a9abef8a67 +size 35640 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest1.uasset new file mode 100644 index 00000000..d8318d9e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c88b2da7641fa5f610533a036bef38b40d67dc4c96e173ecbcb88e88b7908322 +size 29319 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest2.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest2.uasset new file mode 100644 index 00000000..dc603126 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:061bab61b8749ba725701e392b291247e35dd205a6a5d4bbd45574a01402368a +size 38715 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_Apartment.uasset deleted file mode 100644 index 0315d174..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_Apartment.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffc0494e896f842e6d6baa4953b6f317c3e2479d2b672611671fdc12fb184555 -size 35802 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset new file mode 100644 index 00000000..685fe45c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a36add1ae5fa2c965618417522fd7b08206d799b92a5bb145ddfc47e1b5681cc +size 69327 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_InteractTest1.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_InteractTest1.uasset deleted file mode 100644 index acb04777..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_InteractTest1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:253f8ebabbd32167aa4ecd182352cb52f1c337502351a1bd8f38414f6b3a9d61 -size 29197 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_InteractTest2.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_InteractTest2.uasset deleted file mode 100644 index 405a3150..00000000 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_InteractTest2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c22f439331d8787e77de31ada2719cc99dd341a7a0564eeb9bd3f8fcafcc2f2 -size 38592 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset new file mode 100644 index 00000000..b03e5741 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkToGreasyRickOutsideTheMarket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e297e190c30fc85fb8f8807ecef1e48f9bb32202cae96ead763e0d3b7c989177 +size 60203 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset new file mode 100644 index 00000000..0174b2e5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95ffa7198aad5ad503e53bf93742621dbf81e652fee14292705c7755188220a6 +size 54901 diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 14b71962..6cb77221 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a67204b6b65b0b19778380561dee8ca2dd3af99541fdacb2b2e44ac185382ea5 -size 26877 +oid sha256:1a91be4f194b7201af29ce132c115235a7bd582e5980141cad653b6091ca2070 +size 26252 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index edfdeb33..4b140f0d 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8dc1a8d9115ec67600014abd75f1870abc3f452ce59997419fc23b1b9b6ab59 +oid sha256:d94d72c1af278dc419f29483623353fb9ebbd253716e4d70fdeeeeb3baa493c6 size 28746 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 3b21973c..e8d010c3 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:b6511ca4db97e4492dced6793261a1362cc37f48b4cbc534142af930d394cbdc -size 62240 +oid sha256:f64b084e86fc64a87d78af8aa50f98ae1e7844a11398d3063aecbd5b9a8d1401 +size 62548 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset index 774e5d89..825bd5b7 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:7ad8e92feadf8aced172d7716c2e63bca5660d8108b2561d755c79abad6b048e -size 30201 +oid sha256:528cce4e86c3bdd9171767ace9f1425bb4efdd53fc2175413990653e7422c513 +size 47079 diff --git a/EndlessVendetta/Content/Dialogue/Testing/Waypoint/WBP_TempMayorWaypoint.uasset b/EndlessVendetta/Content/Dialogue/Testing/Waypoint/WBP_TempMayorWaypoint.uasset index c0898207..4ce87d96 100644 --- a/EndlessVendetta/Content/Dialogue/Testing/Waypoint/WBP_TempMayorWaypoint.uasset +++ b/EndlessVendetta/Content/Dialogue/Testing/Waypoint/WBP_TempMayorWaypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5bedb029616a18d0c2351b36753da408483c59fa4c5d239d0153166bffa5bb0 -size 30496 +oid sha256:fa2e578e39852006adb553eea446e2e36ad886860a506eaa657ea84e9aaa94c4 +size 30501 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index a79a02e7..c1bc34ba 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:3b3943c1c4918895a70b44d6d95650a4bfb36b00eb98983ced859f3dff70bd54 -size 817216 +oid sha256:815df3978cc9abfdf7212f3f6d479f6cbe4103abb34b3a2d69c540c919e327ae +size 827084 diff --git a/EndlessVendetta/Content/Levels/OpenWorldRework.umap b/EndlessVendetta/Content/Levels/OpenWorldRework.umap index 92bcd079..484864cb 100644 --- a/EndlessVendetta/Content/Levels/OpenWorldRework.umap +++ b/EndlessVendetta/Content/Levels/OpenWorldRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e442a95ad15525835a7f5ba2bfa243ddec48b95d9c2575d09b111d42bc01f37 -size 293624422 +oid sha256:ce018854123dcc94eb0bf5bbce589f6902f0514415946e76b97e4fcfcd66d5c4 +size 293642302 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..a10c5d07 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:c725adf99da7d235934f26a048a506e600633d6f91205ea06302e4b4ae6b92b8 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index ac3f7536..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:6ba7c7b0ee09a438907efbf237854bd39fe5510343e95c17dafbfdd69a70d79b -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp index 531fff83..e1feb43e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp @@ -20,7 +20,9 @@ void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FStrin PlayersCam = Cast(PlayerActor->GetComponentByClass(UCameraComponent::StaticClass())); ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist); ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); - + + if (!SpawnMiniWaypoint) return; + MiniWaypoint = CreateWidget(GetWorld(), MiniWaypointClass); MiniWaypoint->AddToViewport(0); MiniWaypoint->WorldLoc = this->GetActorLocation(); @@ -37,11 +39,11 @@ void AWaypointActor::Tick(float DeltaTime) if (SightCheck()) { UpdateVisibility(true); - MiniWaypoint->UpdateVisibility(false); + if (IsValid(MiniWaypoint)) MiniWaypoint->UpdateVisibility(false); return; } UpdateVisibility(false); - MiniWaypoint->UpdateVisibility(true); + if (IsValid(MiniWaypoint)) MiniWaypoint->UpdateVisibility(true); } bool AWaypointActor::SightCheck() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index 63538881..0cbdfc8b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -52,11 +52,14 @@ protected: public: // Sets default values for this actor's properties AWaypointActor(); + + UPROPERTY(BlueprintReadWrite) + bool SpawnMiniWaypoint = true; // Called every frame virtual void Tick(float DeltaTime) override; - UFUNCTION(BlueprintNativeEvent) + UFUNCTION(BlueprintNativeEvent, BlueprintCallable) void SetupWaypoint(UTexture2D* Icon, const FString& Desc); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h index 80681856..0671f4b2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_Dialogue.h @@ -20,7 +20,7 @@ class ENDLESSVENDETTA_API UAC_Dialogue : public UActorComponent public: void Interact() const; - UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category = "Dialogue") + UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "Dialogue") UDialogueTree* DialogueTree; };