diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index a9337554..3a72e6ff 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -3,44 +3,19 @@ Intermediate/ProjectFiles/EndlessVendetta.vcxproj + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - 1706898787115 + + 1706900339638 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 3ea3e010..8720c67f 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:aebdbf8cc9c9e7a79e8c3aa030177ebbc24a049b2bd22748408da5ce58519413 +oid sha256:2948a0f047ea3d4c550459ad2641ce7a098433ea2c165c572d9816ad798fd473 size 66790690 diff --git a/EndlessVendetta/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs b/EndlessVendetta/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs index 63486a00..c1cb2430 100644 --- a/EndlessVendetta/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs +++ b/EndlessVendetta/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs @@ -26,8 +26,8 @@ public class DialogueSystemEditor : ModuleRules "CoreUObject", "Engine", "Slate", + "UnrealEd", "SlateCore", - "UnrealEd", "GenericGraphRuntime", "EndlessVendetta" } diff --git a/EndlessVendetta/Source/EndlessVendetta.Target.cs b/EndlessVendetta/Source/EndlessVendetta.Target.cs index 0bfa1565..b31c5112 100644 --- a/EndlessVendetta/Source/EndlessVendetta.Target.cs +++ b/EndlessVendetta/Source/EndlessVendetta.Target.cs @@ -11,11 +11,5 @@ public class EndlessVendettaTarget : TargetRules DefaultBuildSettings = BuildSettingsVersion.V2; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; ExtraModuleNames.Add("EndlessVendetta"); - RegisterModulesCreatedByRider(); - } - - private void RegisterModulesCreatedByRider() - { - ExtraModuleNames.AddRange(new string[] { "DialogueSystemEditor" }); } } diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h index 3613f00d..0df68620 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h @@ -15,5 +15,7 @@ class UDialogueEdge : public UGenericGraphEdge inline UDialogueEdge::UDialogueEdge() { +#if WITH_EDITORONLY_DATA bShouldDrawTitle = true; +#endif } diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h index 38e6f2c0..56ae66bd 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h @@ -10,7 +10,7 @@ class UDialogueRootNode : public UGenericGraphNode GENERATED_BODY() public: - UDialogueRootNode();; + UDialogueRootNode(); #if WITH_EDITOR virtual FText GetNodeTitle() const override; diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp index fc669ebf..a74404f2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp @@ -9,7 +9,7 @@ UDialogueTree::UDialogueTree() NodeType = UGenericGraphNode::StaticClass(); EdgeType = UDialogueEdge::StaticClass(); - bCanBeCyclical = true; + // bCanBeCyclical = true; Character1.CharacterName = "Character 1"; Character2.CharacterName = "Character 2";