Skip to content

Commit 18ff972

Browse files
pavlicekdominikpavlicekdominik
committed
Merge branch '5.3_dev' into 5.4_dev
2 parents f549a31 + 25be576 commit 18ff972

File tree

91 files changed

+4761
-2596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+4761
-2596
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ Plugins/*/Intermediate/*
7474
# Cache files for the editor to use
7575
DerivedDataCache/*
7676

77+
# Python cache
78+
Content/Python/__pycache__/*
79+
7780
# Ignore project specific files
7881
*.png~
7982
Config/MDSConfig.ini

‎Config/Default.ini

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Python]
2+
+AdditionalPaths=(Path="/MounteaDialogueSystem/Content/Python")

‎Config/DefaultMounteaDialogueSystem.ini

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,13 @@
55
+PropertyRedirects=(OldName="/Script/MounteaDialogueSystem.WidgetDialogueRow.RowText",NewName="/Script/MounteaDialogueSystem.WidgetDialogueRow.DialogueRowBody")
66
+PropertyRedirects=(OldName="/Script/MounteaDialogueSystem.WidgetDialogueRow.RowTitle",NewName="/Script/MounteaDialogueSystem.WidgetDialogueRow.DialogueRowTitle")
77
+PropertyRedirects=(OldName="/Script/MounteaDialogueSystem.WidgetDialogueRow.DialogueParticipantName",NewName="/Script/MounteaDialogueSystem.WidgetDialogueRow.DialogueRowParticipantName")
8-
+PropertyRedirects=(OldName="/Script/MounteaDialogueSystem.MounteaDialogueContextReplicatedStruct.ActiveDataTable",NewName="/Script/MounteaDialogueSystem.MounteaDialogueContextReplicatedStruct.ActiveDialogueTableHandle")
8+
+PropertyRedirects=(OldName="/Script/MounteaDialogueSystem.MounteaDialogueContextReplicatedStruct.ActiveDataTable",NewName="/Script/MounteaDialogueSystem.MounteaDialogueContextReplicatedStruct.ActiveDialogueTableHandle")
9+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.GetDefaultDialogueManagerState",NewName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.GetDefaultManagerState")
10+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.SetDialogueManagerState",NewName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.SetManagerState")
11+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.CallDialogueNodeSelected",NewName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.NodeSelected")
12+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.StartExecuteDialogueRow",NewName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.ProcessDialogueRow")
13+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.FinishedExecuteDialogueRow",NewName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.DialogueRowProcessed")
14+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.GetState",NewName="/Script/MounteaDialogueSystem.IMounteaDialogueManagerInterface.GetManagerState")
15+
+PropertyRedirects=(OldName="/Script/MounteaDialogueSystem.MounteaDialogueManager.DialogueWidgetPtr",NewName="/Script/MounteaDialogueSystem.MounteaDialogueManager.DialogueWidget")
16+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics.GetState",NewName="/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics.GetManagerState")
17+
+FunctionRedirects=(OldName="/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics.SetDialogueManagerState",NewName="/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics.SetManagerState")

‎Config/FilterPlugin.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[FilterPlugin]
22
.../Tags/MounteaDialogueSystemTags.ini
33
...DefaultMounteaDialogueSystem.ini
4-
...DefaultMounteaSettings.ini
4+
...DefaultMounteaSettings.ini
5+
...node_replacements.json

‎Config/node_replacements.json

+225
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
{
2+
"replacements": [
3+
{
4+
"old_node": {
5+
"type": "function_call",
6+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
7+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
8+
"function": "AddDialogueUIObjects",
9+
"is_interface_call": true
10+
},
11+
"new_node": {
12+
"type": "function_call",
13+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
14+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
15+
"function": "AddDialogueUIObjectsV2",
16+
"is_interface_call": false
17+
}
18+
},
19+
{
20+
"old_node": {
21+
"type": "function_call",
22+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
23+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
24+
"function": "GetStateV2",
25+
"is_interface_call": true
26+
},
27+
"new_node": {
28+
"type": "function_call",
29+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
30+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
31+
"function": "GetManagerState",
32+
"is_interface_call": false
33+
}
34+
},
35+
{
36+
"old_node": {
37+
"type": "function_call",
38+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
39+
"parent": "/Script/AnimGraphRuntime.AnimationStateMachineLibrary",
40+
"function": "GetState",
41+
"is_interface_call": false,
42+
"ignore_pins":
43+
[
44+
"UpdateContext",
45+
"Node"
46+
]
47+
},
48+
"new_node": {
49+
"type": "function_call",
50+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
51+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
52+
"function": "GetManagerState",
53+
"is_interface_call": false
54+
}
55+
},
56+
{
57+
"old_node": {
58+
"type": "function_call",
59+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
60+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
61+
"function": "GetDialogueWidgetV2",
62+
"is_interface_call": true
63+
},
64+
"new_node": {
65+
"type": "function_call",
66+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
67+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
68+
"function": "GetDialogueWidget",
69+
"is_interface_call": false
70+
}
71+
},
72+
{
73+
"old_node":{
74+
"type": "function_call",
75+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
76+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
77+
"function": "InitializeDialogue",
78+
"is_interface_call": false
79+
},
80+
"new_node": {
81+
"type": "function_call",
82+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
83+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
84+
"function": "RequestStartDialogue",
85+
"is_interface_call": false,
86+
"pin_mapping": {
87+
"execute": "execute",
88+
"Target": "Target",
89+
"OwningPlayerState": "DialogueInitiator",
90+
"Participants": "InitialParticipants"
91+
}
92+
}
93+
},
94+
{
95+
"old_node":{
96+
"type": "function_call",
97+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
98+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
99+
"function": "GetDialogueContextV2",
100+
"is_interface_call": true
101+
},
102+
"new_node": {
103+
"type": "function_call",
104+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
105+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
106+
"function": "GetDialogueContext",
107+
"is_interface_call": false
108+
}
109+
},
110+
{
111+
"old_node":{
112+
"type": "function_call",
113+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
114+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
115+
"function": "GetDialogueWidgetZOrderV2",
116+
"is_interface_call": true
117+
},
118+
"new_node": {
119+
"type": "function_call",
120+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
121+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
122+
"function": "GetDialogueWidgetZOrder",
123+
"is_interface_call": false
124+
}
125+
},
126+
{
127+
"old_node":{
128+
"type": "function_call",
129+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
130+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
131+
"function": "ExecuteWidgetCommand",
132+
"is_interface_call": true
133+
},
134+
"new_node": {
135+
"type": "function_call",
136+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
137+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
138+
"function": "ExecuteWidgetCommand",
139+
"is_interface_call": false
140+
}
141+
},
142+
{
143+
"old_node":{
144+
"type": "function_call",
145+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
146+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
147+
"function": "CallDialogueNodeSelectedV2",
148+
"is_interface_call": true
149+
},
150+
"new_node": {
151+
"type": "function_call",
152+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
153+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
154+
"function": "SelectNode",
155+
"is_interface_call": false
156+
}
157+
},
158+
{
159+
"old_node":{
160+
"type": "function_call",
161+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
162+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
163+
"function": "SkipDialogueRow",
164+
"is_interface_call": true
165+
},
166+
"new_node": {
167+
"type": "function_call",
168+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
169+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
170+
"function": "SkipDialogueRow",
171+
"is_interface_call": false
172+
}
173+
},
174+
{
175+
"old_node":{
176+
"type": "function_call",
177+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
178+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerInterface",
179+
"function": "GetDialogueContextEvent",
180+
"is_interface_call": true
181+
},
182+
"new_node": {
183+
"type": "function_call",
184+
"class_name": "/Script/MounteaDialogueSystemDeveloper.K2Node_MounteaDialogueCallFunction",
185+
"parent": "/Script/MounteaDialogueSystem.MounteaDialogueManagerStatics",
186+
"function": "GetDialogueContext",
187+
"is_interface_call": false
188+
}
189+
},
190+
{
191+
"old_node":{
192+
"type": "function_call",
193+
"class_name": "/Script/BlueprintGraph.K2Node_CallFunction",
194+
"parent": "",
195+
"function": "InitializeDialogueTextStyle",
196+
"is_interface_call": false,
197+
"is_blueprint_function": true
198+
},
199+
"new_node": {
200+
"type": "function_call",
201+
"class_name": "/Script/BlueprintGraph.K2Node_MounteaDialogueCallFunction",
202+
"parent": "/MounteaDialogueSystem/Blueprints/Helpers/BFL_MounteaDialogueHelpers.BFL_MounteaDialogueHelpers_C",
203+
"function": "Initialize Dialogue Text Style",
204+
"is_interface_call": false,
205+
"is_blueprint_function": true
206+
}
207+
},
208+
{
209+
"old_node": {
210+
"type": "function_call",
211+
"class_name": "/Script/BlueprintGraph.K2Node_CallFunction",
212+
"parent": "/Script/MounteaDialogueSystemDeveloper.MounteaDialogueSystemDeveloperUtilities",
213+
"function": "CopyToClipboard",
214+
"is_interface_call": false
215+
},
216+
"new_node": {
217+
"type": "function_call",
218+
"class_name": "/Script/BlueprintGraph.K2Node_MounteaDialogueCallFunction",
219+
"parent": "/Script/MounteaDialogueSystemDeveloper.MounteaDialogueSystemDeveloperUtilities",
220+
"function": "CopyToClipboard",
221+
"is_interface_call": false
222+
}
223+
}
224+
]
225+
}

‎Content/Blueprints/Core/BP_DialogueActor.uasset

-123 Bytes
Binary file not shown.

‎Content/Blueprints/Core/BP_DialoguePlayerController.uasset

-7.3 KB
Binary file not shown.

‎Content/Blueprints/Core/BP_DialoguePlayerState.uasset

23.5 KB
Binary file not shown.

‎Content/Blueprints/Core/BP_Dialogue_Character.uasset

53.1 KB
Binary file not shown.

‎Content/Blueprints/Decorators/Examples/BPD_ToggleTypeWriterEffect.uasset

1.11 KB
Binary file not shown.

‎Content/Blueprints/Helpers/BFL_MounteaDialogueHelpers.uasset

-617 Bytes
Binary file not shown.

‎Content/Dialogues/D_TestDialogue.uasset

-492 Bytes
Binary file not shown.

‎Content/Editor/WBP_TranslateNode.uasset

125 KB
Binary file not shown.

‎Content/Example/BP_NPC_DialogueTesting.uasset

126 KB
Binary file not shown.

‎Content/Example/BP_Player_Pawn_DialogueTesting.uasset

-58.3 KB
Binary file not shown.

‎Content/Example/M_DialogueExample.umap

1.11 KB
Binary file not shown.

‎Content/Example/WorldUI/WBP_WorldDialogueRow.uasset

60.4 KB
Binary file not shown.

‎Content/WBP/WBP_Dialogue.uasset

23 Bytes
Binary file not shown.

‎Content/WBP/WBP_DialogueOption.uasset

944 Bytes
Binary file not shown.

‎Content/WBP/WBP_DialogueRow_Basic.uasset

14.9 KB
Binary file not shown.

‎Content/WBP/WBP_DialogueRow_WithIcon.uasset

491 Bytes
Binary file not shown.

‎Content/WBP/WBP_SkipHold.uasset

835 Bytes
Binary file not shown.

‎MounteaDialogueSystem.uplugin

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
3-
"Version": 2,
4-
"VersionName": "2.0.4.54",
3+
"Version": 3,
4+
"VersionName": "3.0.0.53",
55
"FriendlyName": "Mountea Dialogue System",
66
"Description": "Mountea Dialogue System is an Open-source Mountea Framework tool for Unreal Engine for creating (not just) complex dialogues!\nProvides its own Dialogue Tree editor and validation system.",
77
"Category": "Mountea Framework",
@@ -10,7 +10,7 @@
1010
"DocsURL": "https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki",
1111
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/ea38ae1f87b24807a66fdf4fa65ef521",
1212
"SupportURL": "https://bit.ly/DominikPavlicek_SupportServer",
13-
"EngineVersion": "5.4.0",
13+
"EngineVersion": "5.3.0",
1414
"CanContainContent": true,
1515
"Installed": true,
1616
"Modules": [

‎Resources/CircleBox.png

-294 KB
Loading

0 commit comments

Comments
 (0)