Bugfix Build Issues with UnrealEd

This commit is contained in:
Rafal Swierczek 2024-02-02 19:55:51 +00:00
parent 71c79f00bd
commit f0f04e1928
7 changed files with 24 additions and 51 deletions

View File

@ -3,44 +3,19 @@
<component name="AutoGeneratedRunConfigurationManager"> <component name="AutoGeneratedRunConfigurationManager">
<projectFile>Intermediate/ProjectFiles/EndlessVendetta.vcxproj</projectFile> <projectFile>Intermediate/ProjectFiles/EndlessVendetta.vcxproj</projectFile>
</component> </component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6b877713-7611-482b-88e8-6a3c0d51c7b4" name="Changes" comment=""> <list default="true" id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Config/DefaultGame.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/DefaultGame.ini" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror_Texture/Bathroom_Mirror.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror_Texture/Bathroom_Mirror.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Texture/Shower_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Texture/Shower_Texture.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Texture/Sink_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Texture/Sink_Texture.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Texture/Tap_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Texture/Tap_Texture.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Seat_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Seat_Texture.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Texture.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Counter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Counter.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Cupboard44.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Cupboard44.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Draws.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Draws.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/lamp_01/lamp_01_blue.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/lamp_01/lamp_01_blue.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_01/wall_light_01_orange.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_01/wall_light_01_orange.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_02/wall_light_02_orange.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_02/wall_light_02_orange.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/B_BookShelf.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/B_BookShelf.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/M_Books.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/M_Books.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf_Edge/M_BooksShelfEdge.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf_Edge/M_BooksShelfEdge.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/CLOCK01/m_clock01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/CLOCK01/m_clock01.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Chamber.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Chamber.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Gameboy_MugCup01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Gameboy_MugCup01.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Table02.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Table02.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_WallPiece.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_WallPiece.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/TRadio/M_Radio.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/TRadio/M_Radio.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cabinets/cabinet_01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cabinets/cabinet_01.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/chair_01/chair.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/chair_01/chair.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_bl.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_bl.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/fireplace/fireplace.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/fireplace/fireplace.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/sofa_02/sofa_02.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/sofa_02/sofa_02.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta.Target.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta.Target.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendetta.Build.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendetta.Build.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -55,18 +30,20 @@
</component> </component>
<component name="ProjectColorInfo"><![CDATA[{ <component name="ProjectColorInfo"><![CDATA[{
"customColor": "", "customColor": "",
"associatedIndex": 5 "associatedIndex": 7
}]]></component> }]]></component>
<component name="ProjectId" id="2bp4f0aLGz4XHjaYb9EKOrNfYuz" /> <component name="ProjectId" id="2bp7o8dmlHZgRsYmVepgy7lbmpM" />
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent"><![CDATA[{
"keyToString": { "keyToString": {
"C++ Project.EndlessVendetta.executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "TempBuildSetup", "git-widget-placeholder": "TempBuildSetup",
"ignore.virus.scanning.warn.message": "true",
"node.js.detected.package.eslint": "true", "node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true", "node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.eslint": "(autodetect)",
@ -148,12 +125,12 @@
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="6b877713-7611-482b-88e8-6a3c0d51c7b4" name="Changes" comment="" /> <changelist id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="" />
<created>1706898787115</created> <created>1706900339638</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1706898787115</updated> <updated>1706900339638</updated>
<workItem from="1706898789667" duration="426000" /> <workItem from="1706900342753" duration="2652000" />
</task> </task>
<servers /> <servers />
</component> </component>

View File

@ -26,8 +26,8 @@ public class DialogueSystemEditor : ModuleRules
"CoreUObject", "CoreUObject",
"Engine", "Engine",
"Slate", "Slate",
"UnrealEd",
"SlateCore", "SlateCore",
"UnrealEd",
"GenericGraphRuntime", "GenericGraphRuntime",
"EndlessVendetta" "EndlessVendetta"
} }

View File

@ -11,11 +11,5 @@ public class EndlessVendettaTarget : TargetRules
DefaultBuildSettings = BuildSettingsVersion.V2; DefaultBuildSettings = BuildSettingsVersion.V2;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1;
ExtraModuleNames.Add("EndlessVendetta"); ExtraModuleNames.Add("EndlessVendetta");
RegisterModulesCreatedByRider();
}
private void RegisterModulesCreatedByRider()
{
ExtraModuleNames.AddRange(new string[] { "DialogueSystemEditor" });
} }
} }

View File

@ -15,5 +15,7 @@ class UDialogueEdge : public UGenericGraphEdge
inline UDialogueEdge::UDialogueEdge() inline UDialogueEdge::UDialogueEdge()
{ {
#if WITH_EDITORONLY_DATA
bShouldDrawTitle = true; bShouldDrawTitle = true;
#endif
} }

View File

@ -10,7 +10,7 @@ class UDialogueRootNode : public UGenericGraphNode
GENERATED_BODY() GENERATED_BODY()
public: public:
UDialogueRootNode();; UDialogueRootNode();
#if WITH_EDITOR #if WITH_EDITOR
virtual FText GetNodeTitle() const override; virtual FText GetNodeTitle() const override;

View File

@ -9,7 +9,7 @@ UDialogueTree::UDialogueTree()
NodeType = UGenericGraphNode::StaticClass(); NodeType = UGenericGraphNode::StaticClass();
EdgeType = UDialogueEdge::StaticClass(); EdgeType = UDialogueEdge::StaticClass();
bCanBeCyclical = true; // bCanBeCyclical = true;
Character1.CharacterName = "Character 1"; Character1.CharacterName = "Character 1";
Character2.CharacterName = "Character 2"; Character2.CharacterName = "Character 2";