diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 497f585..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Plugins/LogicDriver-Dialogue"] - path = Plugins/LogicDriver-Dialogue - url = git@github.com:Recursoft/LogicDriver-Dialogue.git diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 2393e25..a10a5b3 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -4,5 +4,5 @@ ProjectName=Logic Driver Example CopyrightNotice=Recursoft LLC [/Script/UnrealEd.ProjectPackagingSettings] -BlueprintNativizationMethod=Inclusive +BlueprintNativizationMethod=Disabled diff --git a/Content/Blueprints/AIActor.uasset b/Content/Blueprints/AIActor.uasset index dc4aa14..a3883a3 100644 Binary files a/Content/Blueprints/AIActor.uasset and b/Content/Blueprints/AIActor.uasset differ diff --git a/Content/Blueprints/BaseCharacter.uasset b/Content/Blueprints/BaseCharacter.uasset index 4a023c5..77ab5d0 100644 Binary files a/Content/Blueprints/BaseCharacter.uasset and b/Content/Blueprints/BaseCharacter.uasset differ diff --git a/Content/Blueprints/BoxCharacter.uasset b/Content/Blueprints/BoxCharacter.uasset index 5e63ac1..3e359d4 100644 Binary files a/Content/Blueprints/BoxCharacter.uasset and b/Content/Blueprints/BoxCharacter.uasset differ diff --git a/Content/Blueprints/ThirdPersonGameMode.uasset b/Content/Blueprints/ThirdPersonGameMode.uasset index 12cd2f8..c2732be 100644 Binary files a/Content/Blueprints/ThirdPersonGameMode.uasset and b/Content/Blueprints/ThirdPersonGameMode.uasset differ diff --git a/Content/Maps/Dialogue_ExampleMap.umap b/Content/Maps/Dialogue_ExampleMap.umap index 9098ff7..b2cc764 100644 Binary files a/Content/Maps/Dialogue_ExampleMap.umap and b/Content/Maps/Dialogue_ExampleMap.umap differ diff --git a/Content/Maps/RPG_ExampleMap.umap b/Content/Maps/RPG_ExampleMap.umap index bcfd96f..b7c0a29 100644 Binary files a/Content/Maps/RPG_ExampleMap.umap and b/Content/Maps/RPG_ExampleMap.umap differ diff --git a/Content/StateMachines/BP_SMTargeting.uasset b/Content/StateMachines/BP_SMTargeting.uasset index 9488759..0e49bab 100644 Binary files a/Content/StateMachines/BP_SMTargeting.uasset and b/Content/StateMachines/BP_SMTargeting.uasset differ diff --git a/Content/StateMachines/ClassesRoom/BP_StateStackSM.uasset b/Content/StateMachines/ClassesRoom/BP_StateStackSM.uasset index 942cb5e..0ffd545 100644 Binary files a/Content/StateMachines/ClassesRoom/BP_StateStackSM.uasset and b/Content/StateMachines/ClassesRoom/BP_StateStackSM.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Components/LogicDriverDialogueComponent.uasset b/Content/StateMachines/DialogueRoom/Components/LogicDriverDialogueComponent.uasset new file mode 100644 index 0000000..0e04af1 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Components/LogicDriverDialogueComponent.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Components/LogicDriverDialogueManager.uasset b/Content/StateMachines/DialogueRoom/Components/LogicDriverDialogueManager.uasset new file mode 100644 index 0000000..8e06b1d Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Components/LogicDriverDialogueManager.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Data/DialogueStringTable.uasset b/Content/StateMachines/DialogueRoom/Data/DialogueStringTable.uasset new file mode 100644 index 0000000..1f2041e Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Data/DialogueStringTable.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Data/FSMDialogueDataStructure.uasset b/Content/StateMachines/DialogueRoom/Data/FSMDialogueDataStructure.uasset new file mode 100644 index 0000000..052a7ee Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Data/FSMDialogueDataStructure.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Data/FSM_DialogueSample_DataTable.uasset b/Content/StateMachines/DialogueRoom/Data/FSM_DialogueSample_DataTable.uasset new file mode 100644 index 0000000..51b321b Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Data/FSM_DialogueSample_DataTable.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_CloseDialogue.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/BP_CloseDialogue.uasset deleted file mode 100644 index 853635d..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_CloseDialogue.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueChoiceNode.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueChoiceNode.uasset deleted file mode 100644 index 67bedb3..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueChoiceNode.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueNode.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueNode.uasset deleted file mode 100644 index a65cc5e..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueNode.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueTransition.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueTransition.uasset deleted file mode 100644 index 23a7650..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueClasses/BP_DialogueTransition.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_CloseDialogue.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_CloseDialogue.uasset new file mode 100644 index 0000000..70670aa Binary files /dev/null and b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_CloseDialogue.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_Color.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_Color.uasset new file mode 100644 index 0000000..848a21a Binary files /dev/null and b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_Color.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueChoice.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueChoice.uasset new file mode 100644 index 0000000..e80a0ec Binary files /dev/null and b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueChoice.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueNode.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueNode.uasset new file mode 100644 index 0000000..7557c51 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueNode.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueNodeBase.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueNodeBase.uasset new file mode 100644 index 0000000..fe00a2d Binary files /dev/null and b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueNodeBase.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueTransition.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueTransition.uasset new file mode 100644 index 0000000..a34f7f6 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/DialogueClasses/FSMNode_DialogueTransition.uasset differ diff --git a/Content/StateMachines/DialogueRoom/DialogueClasses/SetBoxColor.uasset b/Content/StateMachines/DialogueRoom/DialogueClasses/SetBoxColor.uasset deleted file mode 100644 index 90a3fe9..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueClasses/SetBoxColor.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueOptionWidget.uasset b/Content/StateMachines/DialogueRoom/DialogueOptionWidget.uasset deleted file mode 100644 index 5a7bf76..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueOptionWidget.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_BaseDialogue.uasset b/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_BaseDialogue.uasset deleted file mode 100644 index 8f9421a..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_BaseDialogue.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_Choices.uasset b/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_Choices.uasset deleted file mode 100644 index 27d58c6..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_Choices.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueBehavior.uasset b/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueBehavior.uasset deleted file mode 100644 index 34f4eb1..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueBehavior.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueGettingStarted.uasset b/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueGettingStarted.uasset deleted file mode 100644 index b16b4e4..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueGettingStarted.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueObjectParsing.uasset b/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueObjectParsing.uasset deleted file mode 100644 index 0cdc908..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_DialogueObjectParsing.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_SelectColor.uasset b/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_SelectColor.uasset deleted file mode 100644 index 24772b8..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueStateMachines/BP_SelectColor.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/DialogueWidget.uasset b/Content/StateMachines/DialogueRoom/DialogueWidget.uasset deleted file mode 100644 index de5b994..0000000 Binary files a/Content/StateMachines/DialogueRoom/DialogueWidget.uasset and /dev/null differ diff --git a/Content/StateMachines/DialogueRoom/FSM_DialogueBase.uasset b/Content/StateMachines/DialogueRoom/FSM_DialogueBase.uasset new file mode 100644 index 0000000..b9afa0a Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_DialogueBase.uasset differ diff --git a/Content/StateMachines/DialogueRoom/FSM_Dialogue_Behavior.uasset b/Content/StateMachines/DialogueRoom/FSM_Dialogue_Behavior.uasset new file mode 100644 index 0000000..c8b53bd Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_Dialogue_Behavior.uasset differ diff --git a/Content/StateMachines/DialogueRoom/FSM_Dialogue_Choices.uasset b/Content/StateMachines/DialogueRoom/FSM_Dialogue_Choices.uasset new file mode 100644 index 0000000..14a10d3 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_Dialogue_Choices.uasset differ diff --git a/Content/StateMachines/DialogueRoom/FSM_Dialogue_DataTable.uasset b/Content/StateMachines/DialogueRoom/FSM_Dialogue_DataTable.uasset new file mode 100644 index 0000000..ac24bd8 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_Dialogue_DataTable.uasset differ diff --git a/Content/StateMachines/DialogueRoom/FSM_Dialogue_GettingStarted.uasset b/Content/StateMachines/DialogueRoom/FSM_Dialogue_GettingStarted.uasset new file mode 100644 index 0000000..a3a6b6c Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_Dialogue_GettingStarted.uasset differ diff --git a/Content/StateMachines/DialogueRoom/FSM_Dialogue_ObjectParsing.uasset b/Content/StateMachines/DialogueRoom/FSM_Dialogue_ObjectParsing.uasset new file mode 100644 index 0000000..4424618 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_Dialogue_ObjectParsing.uasset differ diff --git a/Content/StateMachines/DialogueRoom/FSM_Dialogue_SelectColor.uasset b/Content/StateMachines/DialogueRoom/FSM_Dialogue_SelectColor.uasset new file mode 100644 index 0000000..25082c9 Binary files /dev/null and b/Content/StateMachines/DialogueRoom/FSM_Dialogue_SelectColor.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Widgets/DialogueOptionWidget.uasset b/Content/StateMachines/DialogueRoom/Widgets/DialogueOptionWidget.uasset new file mode 100644 index 0000000..0cd60ed Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Widgets/DialogueOptionWidget.uasset differ diff --git a/Content/StateMachines/DialogueRoom/Widgets/DialogueWidget.uasset b/Content/StateMachines/DialogueRoom/Widgets/DialogueWidget.uasset new file mode 100644 index 0000000..044171e Binary files /dev/null and b/Content/StateMachines/DialogueRoom/Widgets/DialogueWidget.uasset differ diff --git a/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Chef.uasset b/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Chef.uasset index 9a33096..173c603 100644 Binary files a/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Chef.uasset and b/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Chef.uasset differ diff --git a/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Hungry_Person.uasset b/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Hungry_Person.uasset index 3b8ea3b..ef34121 100644 Binary files a/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Hungry_Person.uasset and b/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_Hungry_Person.uasset differ diff --git a/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_ShopKeep.uasset b/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_ShopKeep.uasset index d643708..0e340b9 100644 Binary files a/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_ShopKeep.uasset and b/Content/StateMachines/RPGRoom/Dialogue/SM_Dialogue_ShopKeep.uasset differ diff --git a/LogicDriverExample.uproject b/LogicDriverExample.uproject index 625534c..6ee63f6 100644 --- a/LogicDriverExample.uproject +++ b/LogicDriverExample.uproject @@ -3,13 +3,6 @@ "EngineAssociation": "4.27", "Category": "", "Description": "", - "Modules": [ - { - "Name": "LogicDriverExample", - "Type": "Runtime", - "LoadingPhase": "Default" - } - ], "Plugins": [ { "Name": "SMSystem", @@ -35,11 +28,6 @@ "Mac" ] }, - { - "Name": "SMDialogue", - "Enabled": true, - "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/9d8db9962594400988f8ddd3fb83cd88" - }, { "Name": "FunctionalTestingEditor", "Enabled": true diff --git a/Plugins/LogicDriver-Dialogue b/Plugins/LogicDriver-Dialogue deleted file mode 160000 index df98bd9..0000000 --- a/Plugins/LogicDriver-Dialogue +++ /dev/null @@ -1 +0,0 @@ -Subproject commit df98bd939fc5efa7bea646466f32fe96960b2385 diff --git a/README.md b/README.md index 5fad54a..f1f4b6b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Logic Driver Pro Example Project -**Requires Logic Driver 2.5.0 or higher** +**Requires Logic Driver 2.6.0 or higher** Looking for Logic Driver LITE's Blueprint Only example project? Download from [here](https://logicdriver.com/liteexample). @@ -8,22 +8,15 @@ Looking for Logic Driver LITE's Blueprint Only example project? Download from [h 1. Uninstall Logic Driver Lite if installed. 1. [Install Logic Driver Pro](https://logicdriver.com/docs/pages/installation/) from the Marketplace. -1. Open the [releases page](https://github.com/Recursoft/LogicDriver-Example/releases) *or clone the repository using `git clone --recurse-submodules`* -1. Download `LogicDriverExample.zip`. +1. Clone or download the project as a zip. +1. Open `LogicDriverExample.uproject`. -![Download Image](https://i.imgur.com/DeOYG4O.jpg) - -5. Open `LogicDriverExample.uproject`. -1. Unreal should prompt to build the project. - - Visual Studio is required for the project to build. It can be downloaded from https://visualstudio.microsoft.com/downloads/ - - Make sure [Game development with C++](https://devblogs.microsoft.com/cppblog/directx-game-development-with-c-in-visual-studio/) is checked during the install otherwise building the project may fail. - - Make sure .NET Framework 4.6 SDK is installed. +- Previous versions required to build a C++ project. This is no longer necessary. Use the ## Installation & Walk-through Video [![ExampleProject Walkthrough](https://img.youtube.com/vi/fOvyPBi_LM8/0.jpg)](https://www.youtube.com/watch?v=fOvyPBi_LM8) - ## Documentation - [Logic Driver User Guide and API Reference](https://logicdriver.com/docs/) @@ -50,10 +43,8 @@ Looking for Logic Driver LITE's Blueprint Only example project? Download from [h ## Dialogue Example Map -- Sample Dialogue implementation using the [LogicDriver-Dialogue Plugin](https://github.com/Recursoft/LogicDriver-Dialogue). - - This is a submodule of this project and is required for this example. - - The plugin can be used as an example on how to overload state and transition classes in C++. -- [A dialogue system can be implemented entirely using Blueprints](https://github.com/Recursoft/LogicDriver-DialogueExample). See [Dialogue System Concepts](https://logicdriver.com/docs/pages/dialogue/) for more information. +- Sample blueprint dialogue implementation using the [LogicDriver-Dialogue Blueprint Project](https://github.com/Recursoft/LogicDriver-DialogueExample). +- For a C++ example, see the [C++ Dialogue Plugin](https://github.com/Recursoft/LogicDriver-Dialogue). This was used on older versions of this example project and in the `4.27-cpp`. ## Quest Example Map diff --git a/Source/LogicDriverExample.Target.cs b/Source/LogicDriverExample.Target.cs deleted file mode 100644 index 5369b10..0000000 --- a/Source/LogicDriverExample.Target.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Recursoft LLC - -using UnrealBuildTool; -using System.Collections.Generic; - -public class LogicDriverExampleTarget : TargetRules -{ - public LogicDriverExampleTarget(TargetInfo Target) : base(Target) - { - Type = TargetType.Game; - DefaultBuildSettings = BuildSettingsVersion.V2; - - ExtraModuleNames.AddRange( new string[] { "LogicDriverExample" } ); - } -} diff --git a/Source/LogicDriverExample/LogicDriverExample.Build.cs b/Source/LogicDriverExample/LogicDriverExample.Build.cs deleted file mode 100644 index 6d83fdc..0000000 --- a/Source/LogicDriverExample/LogicDriverExample.Build.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Recursoft LLC - -using UnrealBuildTool; - -public class LogicDriverExample : ModuleRules -{ - public LogicDriverExample(ReadOnlyTargetRules Target) : base(Target) - { - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); - - PrivateDependencyModuleNames.AddRange(new string[] { }); - - // Uncomment if you are using Slate UI - // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); - - // Uncomment if you are using online features - // PrivateDependencyModuleNames.Add("OnlineSubsystem"); - - // To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true - } -} diff --git a/Source/LogicDriverExample/LogicDriverExample.cpp b/Source/LogicDriverExample/LogicDriverExample.cpp deleted file mode 100644 index c0f9845..0000000 --- a/Source/LogicDriverExample/LogicDriverExample.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// Recursoft LLC - -#include "LogicDriverExample.h" -#include "Modules/ModuleManager.h" - -IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, LogicDriverExample, "LogicDriverExample" ); diff --git a/Source/LogicDriverExample/LogicDriverExample.h b/Source/LogicDriverExample/LogicDriverExample.h deleted file mode 100644 index 236eba2..0000000 --- a/Source/LogicDriverExample/LogicDriverExample.h +++ /dev/null @@ -1,6 +0,0 @@ -// Recursoft LLC - -#pragma once - -#include "CoreMinimal.h" - diff --git a/Source/LogicDriverExampleEditor.Target.cs b/Source/LogicDriverExampleEditor.Target.cs deleted file mode 100644 index c78547d..0000000 --- a/Source/LogicDriverExampleEditor.Target.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Recursoft LLC - -using UnrealBuildTool; -using System.Collections.Generic; - -public class LogicDriverExampleEditorTarget : TargetRules -{ - public LogicDriverExampleEditorTarget(TargetInfo Target) : base(Target) - { - Type = TargetType.Editor; - DefaultBuildSettings = BuildSettingsVersion.V2; - - ExtraModuleNames.AddRange( new string[] { "LogicDriverExample" } ); - } -}