Merge branch '4.24' into 4.25

Recursoft · Jul 7, 2020 · 73cc417 · 73cc417
2 parents 974c12e + 87b32b4
commit 73cc417
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 2 deletions.
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
@@ -3,3 +3,6 @@ ProjectID=93EED4C841D2EA5DA19FD1A2F096EB00
 ProjectName=Logic Driver Example
 CopyrightNotice=Recursoft LLC
 
+[/Script/UnrealEd.ProjectPackagingSettings]
+BlueprintNativizationMethod=Inclusive
+
diff --git a/Content/Blueprints/AIActor.uasset b/Content/Blueprints/AIActor.uasset
diff --git a/Content/Blueprints/BP_Double_Doors.uasset b/Content/Blueprints/BP_Double_Doors.uasset
diff --git a/Content/Blueprints/BaseCharacter.uasset b/Content/Blueprints/BaseCharacter.uasset
diff --git a/Content/Blueprints/ThirdPersonCharacter.uasset b/Content/Blueprints/ThirdPersonCharacter.uasset
diff --git a/Content/Maps/Quests_ExampleMap.umap b/Content/Maps/Quests_ExampleMap.umap
diff --git a/Content/Maps/Skills_ExampleMap.umap b/Content/Maps/Skills_ExampleMap.umap
diff --git a/Content/StateMachines/AIRoom/BP_AI_Patrol.uasset b/Content/StateMachines/AIRoom/BP_AI_Patrol.uasset
diff --git a/Content/StateMachines/ClassesRoom/CustomNodes/PrintTextState.uasset b/Content/StateMachines/ClassesRoom/CustomNodes/PrintTextState.uasset
diff --git a/Content/StateMachines/QuestRoom/Blueprints/BP_QuestLevel.uasset b/Content/StateMachines/QuestRoom/Blueprints/BP_QuestLevel.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestClasses/BP_QuestEndNode.uasset b/Content/StateMachines/QuestRoom/QuestClasses/BP_QuestEndNode.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestClasses/BP_QuestObjectiveNode.uasset b/Content/StateMachines/QuestRoom/QuestClasses/BP_QuestObjectiveNode.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestClasses/BP_QuestStateMachine.uasset b/Content/StateMachines/QuestRoom/QuestClasses/BP_QuestStateMachine.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestStateMachines/ParallelRoom/BP_Quest_Sub_A.uasset b/Content/StateMachines/QuestRoom/QuestStateMachines/ParallelRoom/BP_Quest_Sub_A.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestStateMachines/ParallelRoom/BP_Quest_Sub_B.uasset b/Content/StateMachines/QuestRoom/QuestStateMachines/ParallelRoom/BP_Quest_Sub_B.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestStateMachines/ParallelRoom/BP_Quests_2.uasset b/Content/StateMachines/QuestRoom/QuestStateMachines/ParallelRoom/BP_Quests_2.uasset
diff --git a/Content/StateMachines/QuestRoom/QuestStateMachines/SequentialRoom/BP_Quests.uasset b/Content/StateMachines/QuestRoom/QuestStateMachines/SequentialRoom/BP_Quests.uasset
diff --git a/Content/StateMachines/SkillRoom/Blueprints/BP_LevelIncrease.uasset b/Content/StateMachines/SkillRoom/Blueprints/BP_LevelIncrease.uasset
diff --git a/Content/StateMachines/SkillRoom/Blueprints/BP_SkillLevel.uasset b/Content/StateMachines/SkillRoom/Blueprints/BP_SkillLevel.uasset
diff --git a/Content/StateMachines/SkillRoom/Blueprints/BP_SkillSave.uasset b/Content/StateMachines/SkillRoom/Blueprints/BP_SkillSave.uasset
diff --git a/Content/StateMachines/SkillRoom/SkillClasses/BP_SkillNode.uasset b/Content/StateMachines/SkillRoom/SkillClasses/BP_SkillNode.uasset
diff --git a/Content/StateMachines/SkillRoom/SkillClasses/BP_SkillStateMachine.uasset b/Content/StateMachines/SkillRoom/SkillClasses/BP_SkillStateMachine.uasset
diff --git a/Content/StateMachines/SkillRoom/SkillClasses/BP_SkillTransition.uasset b/Content/StateMachines/SkillRoom/SkillClasses/BP_SkillTransition.uasset
diff --git a/Content/StateMachines/SkillRoom/SkillStateMachines/BP_SkillTree.uasset b/Content/StateMachines/SkillRoom/SkillStateMachines/BP_SkillTree.uasset
diff --git a/Content/StateMachines/UtilityNodes/BP_WaitForFSMs.uasset b/Content/StateMachines/UtilityNodes/BP_WaitForFSMs.uasset
diff --git a/LogicDriverExample.uproject b/LogicDriverExample.uproject
@@ -39,6 +39,14 @@
 			"Name": "SMDialogue",
 			"Enabled": true,
 			"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/9d8db9962594400988f8ddd3fb83cd88"
+		},
+		{
+			"Name": "FunctionalTestingEditor",
+			"Enabled": true
+		},
+		{
+			"Name": "RuntimeTests",
+			"Enabled": true
 		}
 	]
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Logic Driver 2.0 Example Project
 
-**Requires Logic Driver 2.0**
+**Requires Logic Driver 2.3**
 
 Looking for Logic Driver LITE's Blueprint Only example project? Download from [here](https://logicdriver.recursoft.net/liteexample).
 
@@ -50,4 +50,8 @@ Looking for Logic Driver LITE's Blueprint Only example project? Download from [h
 - Sample implementation of a simple fetch quest system. Each quest node is a state machine class containing  quest objective state nodes.
 - Behavior rules are setup so `BP_QuestObjectiveNode` states can only be placed in state machines of type `BP_QuestStateMachine`.
 - First room runs sequential quests.
-- Second room runs parallel quests by dynamically creating state machines with custom classes. (Not recommended for replication)
+- Second room runs parallel quests.
+
+## Skill Example Map
+
+- Demonstrates branching parallel states and leaving states active.