Browse Source

update dialogic to v1.0

Arnaud Vergnet 1 year ago
parent
commit
80a3d7e0c4
58 changed files with 534 additions and 422 deletions
  1. 36
    15
      addons/dialogic/Dialog.tscn
  2. 2
    0
      addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd
  3. 1
    6
      addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn
  4. 0
    4
      addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd
  5. 6
    2
      addons/dialogic/Editor/MasterTree/MasterTree.gd
  6. 12
    14
      addons/dialogic/Editor/Pieces/AudioBlock.tscn
  7. 12
    15
      addons/dialogic/Editor/Pieces/BackgroundMusic.tscn
  8. 2
    5
      addons/dialogic/Editor/Pieces/ChangeScene.tscn
  9. 2
    5
      addons/dialogic/Editor/Pieces/ChangeTimeline.tscn
  10. 1
    4
      addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn
  11. 1
    4
      addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn
  12. 1
    4
      addons/dialogic/Editor/Pieces/Choice.tscn
  13. 1
    4
      addons/dialogic/Editor/Pieces/CloseDialog.tscn
  14. 0
    49
      addons/dialogic/Editor/Pieces/Common/DragController.gd
  15. 0
    10
      addons/dialogic/Editor/Pieces/Common/DragController.tscn
  16. 1
    4
      addons/dialogic/Editor/Pieces/EmitSignal.tscn
  17. 1
    4
      addons/dialogic/Editor/Pieces/EndBranch.tscn
  18. 1
    4
      addons/dialogic/Editor/Pieces/IfCondition.tscn
  19. 1
    4
      addons/dialogic/Editor/Pieces/Question.tscn
  20. 5
    8
      addons/dialogic/Editor/Pieces/SceneEvent.tscn
  21. 2
    5
      addons/dialogic/Editor/Pieces/SetTheme.tscn
  22. 1
    5
      addons/dialogic/Editor/Pieces/SetValue.tscn
  23. 1
    4
      addons/dialogic/Editor/Pieces/TextBlock.tscn
  24. 2
    5
      addons/dialogic/Editor/Pieces/WaitSeconds.tscn
  25. 17
    0
      addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres
  26. 19
    1
      addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd
  27. 56
    40
      addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn
  28. 63
    4
      addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd
  29. 93
    91
      addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn
  30. 0
    0
      addons/dialogic/Images/Events/Wait.svg
  31. 3
    3
      addons/dialogic/Images/Events/Wait.svg.import
  32. 4
    0
      addons/dialogic/Images/Events/audio-event.svg
  33. 3
    3
      addons/dialogic/Images/Events/audio-event.svg.import
  34. 4
    0
      addons/dialogic/Images/Events/background-music.svg
  35. 34
    0
      addons/dialogic/Images/Events/background-music.svg.import
  36. 4
    0
      addons/dialogic/Images/Events/change-scene.svg
  37. 3
    3
      addons/dialogic/Images/Events/change-scene.svg.import
  38. 4
    0
      addons/dialogic/Images/Events/change-timeline.svg
  39. 3
    3
      addons/dialogic/Images/Events/change-timeline.svg.import
  40. 4
    0
      addons/dialogic/Images/Events/scene.svg
  41. 3
    3
      addons/dialogic/Images/Events/scene.svg.import
  42. 3
    0
      addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg
  43. 34
    0
      addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg.import
  44. 3
    0
      addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg
  45. 34
    0
      addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg.import
  46. 0
    4
      addons/dialogic/Images/audio-event.svg
  47. 0
    4
      addons/dialogic/Images/change-scene.svg
  48. 0
    4
      addons/dialogic/Images/change-timeline.svg
  49. 0
    3
      addons/dialogic/Images/plugin-editor-icon.svg
  50. 0
    34
      addons/dialogic/Images/plugin-editor-icon.svg.import
  51. 0
    3
      addons/dialogic/Images/scene.svg
  52. 17
    12
      addons/dialogic/Nodes/BackgroundMusic.gd
  53. 8
    9
      addons/dialogic/Nodes/BackgroundMusic.tscn
  54. 10
    4
      addons/dialogic/Nodes/dialog_node.gd
  55. 9
    9
      addons/dialogic/Other/DialogicResources.gd
  56. 1
    0
      addons/dialogic/Other/DialogicSingleton.gd
  57. 4
    1
      addons/dialogic/dialogic.gd
  58. 2
    0
      dialogic/themes/theme-1616657657.cfg

+ 36
- 15
addons/dialogic/Dialog.tscn View File

@@ -1,4 +1,4 @@
1
-[gd_scene load_steps=12 format=2]
1
+[gd_scene load_steps=14 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Images/next-indicator.png" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Images/background/background-2.png" type="Texture" id=2]
@@ -13,6 +13,25 @@ bg_color = Color( 1, 1, 1, 0 )
13 13
 expand_margin_left = 10.0
14 14
 
15 15
 [sub_resource type="Animation" id=2]
16
+resource_name = "Pulse"
17
+loop = true
18
+tracks/0/type = "value"
19
+tracks/0/path = NodePath(".:self_modulate")
20
+tracks/0/interp = 2
21
+tracks/0/loop_wrap = true
22
+tracks/0/imported = false
23
+tracks/0/enabled = true
24
+tracks/0/keys = {
25
+"times": PoolRealArray( 0, 0.5 ),
26
+"transitions": PoolRealArray( 1, 1 ),
27
+"update": 0,
28
+"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
29
+}
30
+
31
+[sub_resource type="Animation" id=3]
32
+resource_name = "Static"
33
+
34
+[sub_resource type="Animation" id=4]
16 35
 loop = true
17 36
 tracks/0/type = "value"
18 37
 tracks/0/path = NodePath(".:margin_bottom")
@@ -27,13 +46,13 @@ tracks/0/keys = {
27 46
 "values": [ 12.0, 55.0 ]
28 47
 }
29 48
 
30
-[sub_resource type="StyleBoxFlat" id=3]
49
+[sub_resource type="StyleBoxFlat" id=5]
31 50
 content_margin_left = 10.0
32 51
 content_margin_right = 10.0
33 52
 bg_color = Color( 1, 1, 1, 0 )
34 53
 expand_margin_left = 10.0
35 54
 
36
-[sub_resource type="StyleBoxFlat" id=4]
55
+[sub_resource type="StyleBoxFlat" id=6]
37 56
 bg_color = Color( 0.196078, 0.196078, 0.196078, 0 )
38 57
 
39 58
 [node name="DialogNode" type="Control"]
@@ -77,15 +96,15 @@ __meta__ = {
77 96
 }
78 97
 
79 98
 [node name="ColorRect" type="ColorRect" parent="TextBubble"]
99
+visible = false
80 100
 anchor_right = 1.0
81 101
 anchor_bottom = 1.0
82
-color = Color( 0, 0, 0, 0.639216 )
102
+color = Color( 0, 0, 0, 1 )
83 103
 __meta__ = {
84 104
 "_edit_use_anchors_": false
85 105
 }
86 106
 
87 107
 [node name="TextureRect" type="TextureRect" parent="TextBubble"]
88
-visible = false
89 108
 anchor_right = 1.0
90 109
 anchor_bottom = 1.0
91 110
 texture = ExtResource( 2 )
@@ -128,7 +147,7 @@ anchor_bottom = 1.0
128 147
 margin_left = -36.4279
129 148
 margin_top = -35.9016
130 149
 margin_right = 14.5721
131
-margin_bottom = 12.0
150
+margin_bottom = 29.4015
132 151
 rect_scale = Vector2( 0.4, 0.4 )
133 152
 texture = ExtResource( 1 )
134 153
 stretch_mode = 4
@@ -137,17 +156,20 @@ __meta__ = {
137 156
 }
138 157
 
139 158
 [node name="AnimationPlayer" type="AnimationPlayer" parent="TextBubble/NextIndicator"]
140
-autoplay = "IDLE"
141
-anims/IDLE = SubResource( 2 )
159
+autoplay = "Up and down"
160
+anims/Pulse = SubResource( 2 )
161
+anims/Static = SubResource( 3 )
162
+"anims/Up and down" = SubResource( 4 )
142 163
 
143 164
 [node name="NameLabel" type="Label" parent="TextBubble"]
144
-margin_top = -40.0
165
+margin_top = -48.0
145 166
 margin_right = 58.0
167
+margin_bottom = -8.0
146 168
 size_flags_vertical = 1
147
-custom_styles/normal = SubResource( 3 )
169
+custom_styles/normal = SubResource( 5 )
148 170
 custom_fonts/font = ExtResource( 3 )
149 171
 custom_colors/font_color = Color( 1, 1, 1, 1 )
150
-custom_colors/font_color_shadow = Color( 1, 1, 1, 0 )
172
+custom_colors/font_color_shadow = Color( 0, 0, 0, 0.619608 )
151 173
 custom_constants/shadow_offset_x = 2
152 174
 custom_constants/shadow_offset_y = 2
153 175
 align = 1
@@ -157,18 +179,18 @@ __meta__ = {
157 179
 }
158 180
 
159 181
 [node name="ColorRect" type="ColorRect" parent="TextBubble/NameLabel"]
182
+visible = false
160 183
 show_behind_parent = true
161 184
 anchor_right = 1.0
162 185
 anchor_bottom = 1.0
163 186
 size_flags_horizontal = 15
164 187
 size_flags_vertical = 15
165
-color = Color( 0, 0, 0, 0.721569 )
188
+color = Color( 0.156863, 0.156863, 0.156863, 1 )
166 189
 __meta__ = {
167 190
 "_edit_use_anchors_": false
168 191
 }
169 192
 
170 193
 [node name="TextureRect" type="TextureRect" parent="TextBubble/NameLabel"]
171
-visible = false
172 194
 show_behind_parent = true
173 195
 anchor_right = 1.0
174 196
 anchor_bottom = 1.0
@@ -249,7 +271,7 @@ margin_right = 208.0
249 271
 mouse_filter = 1
250 272
 size_flags_horizontal = 3
251 273
 size_flags_vertical = 3
252
-custom_styles/panel = SubResource( 4 )
274
+custom_styles/panel = SubResource( 6 )
253 275
 script = ExtResource( 5 )
254 276
 __meta__ = {
255 277
 "_edit_group_": true,
@@ -318,7 +340,6 @@ __meta__ = {
318 340
 [node name="Timer" type="Timer" parent="DefinitionInfo"]
319 341
 
320 342
 [node name="WaitSeconds" type="Timer" parent="."]
321
-
322 343
 [connection signal="meta_hover_ended" from="TextBubble/RichTextLabel" to="." method="_on_RichTextLabel_meta_hover_ended"]
323 344
 [connection signal="meta_hover_started" from="TextBubble/RichTextLabel" to="." method="_on_RichTextLabel_meta_hover_started"]
324 345
 [connection signal="tween_completed" from="TextBubble/Tween" to="." method="_on_Tween_tween_completed"]

+ 2
- 0
addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd View File

@@ -27,6 +27,8 @@ func _ready():
27 27
 	nodes['display_name_checkbox'].connect('toggled', self, '_on_display_name_toggled')
28 28
 	nodes['name'].connect('text_changed', self, '_on_name_changed')
29 29
 	nodes['color'].connect('color_changed', self, '_on_color_changed')
30
+	var style = get('custom_styles/bg')
31
+	style.set('bg_color', get_color("base_color", "Editor"))
30 32
 
31 33
 
32 34
 func is_selected(file: String):

+ 1
- 6
addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn View File

@@ -8,12 +8,7 @@ content_margin_left = 5.0
8 8
 content_margin_right = 5.0
9 9
 content_margin_top = 5.0
10 10
 content_margin_bottom = 5.0
11
-bg_color = Color( 0.2, 0.219608, 0.278431, 1 )
12
-border_width_left = 1
13
-border_width_top = 1
14
-border_width_right = 1
15
-border_width_bottom = 1
16
-border_color = Color( 0.0980392, 0.113725, 0.152941, 1 )
11
+bg_color = Color( 0.2, 0.23, 0.31, 1 )
17 12
 
18 13
 [node name="CharacterEditor" type="ScrollContainer"]
19 14
 margin_left = 192.0

+ 0
- 4
addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd View File

@@ -8,10 +8,6 @@ func _ready():
8 8
 	pass
9 9
 
10 10
 
11
-func _process(_delta):
12
-	pass
13
-
14
-
15 11
 func _on_ButtonDelete_pressed():
16 12
 	if $NameEdit.text == 'Default':
17 13
 		$PathEdit.text = ''

+ 6
- 2
addons/dialogic/Editor/MasterTree/MasterTree.gd View File

@@ -105,6 +105,8 @@ func _add_timeline(timeline, select = false):
105 105
 		item.set_text(0, timeline['file'])
106 106
 	timeline['editor'] = 'Timeline'
107 107
 	item.set_metadata(0, timeline)
108
+	if not get_constant("dark_theme", "Editor"):
109
+		item.set_icon_modulate(0, get_color("property_color", "Editor"))
108 110
 	#item.set_editable(0, true)
109 111
 	if select: # Auto selecting
110 112
 		item.select(0)
@@ -122,7 +124,8 @@ func _add_theme(theme_item, select = false):
122 124
 	item.set_text(0, theme_item['name'])
123 125
 	theme_item['editor'] = 'Theme'
124 126
 	item.set_metadata(0, theme_item)
125
-	#item.set_editable(0, true)
127
+	if not get_constant("dark_theme", "Editor"):
128
+		item.set_icon_modulate(0, get_color("property_color", "Editor"))
126 129
 	if select: # Auto selecting
127 130
 		item.select(0)
128 131
 
@@ -162,9 +165,10 @@ func _add_definition(definition, select = false):
162 165
 	item.set_icon(0, definition_icon)
163 166
 	if definition['type'] == 1:
164 167
 		item.set_icon(0, glossary_icon)
165
-		
166 168
 	definition['editor'] = 'Definition'
167 169
 	item.set_metadata(0, definition)
170
+	if not get_constant("dark_theme", "Editor"):
171
+		item.set_icon_modulate(0, get_color("property_color", "Editor"))
168 172
 	if select: # Auto selecting
169 173
 		item.select(0)
170 174
 

+ 12
- 14
addons/dialogic/Editor/Pieces/AudioBlock.tscn View File

@@ -1,11 +1,10 @@
1
-[gd_scene load_steps=9 format=2]
1
+[gd_scene load_steps=8 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/AudioBlock.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5
-[ext_resource path="res://addons/dialogic/Images/audio-event.svg" type="Texture" id=3]
5
+[ext_resource path="res://addons/dialogic/Images/Events/audio-event.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7 7
 [ext_resource path="res://addons/dialogic/Images/play.svg" type="Texture" id=5]
8
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=7]
10 9
 
11 10
 [sub_resource type="StyleBoxFlat" id=1]
@@ -13,7 +12,7 @@ content_margin_left = 16.0
13 12
 content_margin_right = 6.0
14 13
 content_margin_top = 6.0
15 14
 content_margin_bottom = 6.0
16
-bg_color = Color( 0.580392, 0.286275, 0.227451, 0.447059 )
15
+bg_color = Color( 0.160784, 0.423529, 0.309804, 0.447059 )
17 16
 border_width_left = 2
18 17
 border_width_top = 2
19 18
 border_width_right = 2
@@ -75,25 +74,26 @@ text = "  Audio   "
75 74
 [node name="Name" type="Label" parent="PanelContainer/VBoxContainer/Header"]
76 75
 margin_left = 87.0
77 76
 margin_top = 7.0
78
-margin_right = 87.0
77
+margin_right = 352.0
79 78
 margin_bottom = 21.0
79
+text = "No sound (will stop previous audio event)"
80 80
 
81 81
 [node name="ButtonAudio" type="Button" parent="PanelContainer/VBoxContainer/Header"]
82
-margin_left = 91.0
83
-margin_right = 115.0
82
+margin_left = 356.0
83
+margin_right = 380.0
84 84
 margin_bottom = 28.0
85 85
 text = "..."
86 86
 
87 87
 [node name="ButtonClear" type="Button" parent="PanelContainer/VBoxContainer/Header"]
88
-margin_left = 119.0
89
-margin_right = 147.0
88
+margin_left = 384.0
89
+margin_right = 412.0
90 90
 margin_bottom = 28.0
91 91
 disabled = true
92 92
 icon = ExtResource( 7 )
93 93
 
94 94
 [node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"]
95
-margin_left = 151.0
96
-margin_right = 185.0
95
+margin_left = 416.0
96
+margin_right = 450.0
97 97
 margin_bottom = 28.0
98 98
 disabled = true
99 99
 icon = ExtResource( 5 )
@@ -108,7 +108,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
108 108
 text = "    ..."
109 109
 
110 110
 [node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 2 )]
111
-margin_left = 189.0
111
+margin_left = 454.0
112 112
 margin_right = 1735.0
113 113
 margin_bottom = 28.0
114 114
 
@@ -119,8 +119,6 @@ margin_bottom = 28.0
119 119
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
120 120
 
121 121
 [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"]
122
-
123
-[node name="DragController" parent="." instance=ExtResource( 6 )]
124 122
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"]
125 123
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonClear" to="." method="_on_ButtonClear_pressed"]
126 124
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"]

+ 12
- 15
addons/dialogic/Editor/Pieces/BackgroundMusic.tscn View File

@@ -1,11 +1,10 @@
1
-[gd_scene load_steps=9 format=2]
1
+[gd_scene load_steps=8 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/BackgroundMusic.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5
-[ext_resource path="res://addons/dialogic/Images/audio-event.svg" type="Texture" id=3]
5
+[ext_resource path="res://addons/dialogic/Images/Events/background-music.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7 7
 [ext_resource path="res://addons/dialogic/Images/play.svg" type="Texture" id=5]
8
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=7]
10 9
 
11 10
 [sub_resource type="StyleBoxFlat" id=1]
@@ -13,7 +12,7 @@ content_margin_left = 16.0
13 12
 content_margin_right = 6.0
14 13
 content_margin_top = 6.0
15 14
 content_margin_bottom = 6.0
16
-bg_color = Color( 0.298039, 0.172549, 0.14902, 0.447059 )
15
+bg_color = Color( 0.160784, 0.423529, 0.309804, 0.447059 )
17 16
 border_width_left = 2
18 17
 border_width_top = 2
19 18
 border_width_right = 2
@@ -75,26 +74,26 @@ text = "  Background Music"
75 74
 [node name="Name" type="Label" parent="PanelContainer/VBoxContainer/Header"]
76 75
 margin_left = 154.0
77 76
 margin_top = 7.0
78
-margin_right = 188.0
77
+margin_right = 368.0
79 78
 margin_bottom = 21.0
80
-text = "None"
79
+text = "No music (will stop with fade out)"
81 80
 
82 81
 [node name="ButtonAudio" type="Button" parent="PanelContainer/VBoxContainer/Header"]
83
-margin_left = 192.0
84
-margin_right = 216.0
82
+margin_left = 372.0
83
+margin_right = 396.0
85 84
 margin_bottom = 28.0
86 85
 text = "..."
87 86
 
88 87
 [node name="ButtonClear" type="Button" parent="PanelContainer/VBoxContainer/Header"]
89
-margin_left = 220.0
90
-margin_right = 248.0
88
+margin_left = 400.0
89
+margin_right = 428.0
91 90
 margin_bottom = 28.0
92 91
 disabled = true
93 92
 icon = ExtResource( 7 )
94 93
 
95 94
 [node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"]
96
-margin_left = 252.0
97
-margin_right = 286.0
95
+margin_left = 432.0
96
+margin_right = 466.0
98 97
 margin_bottom = 28.0
99 98
 disabled = true
100 99
 icon = ExtResource( 5 )
@@ -109,7 +108,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
109 108
 text = "    ..."
110 109
 
111 110
 [node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 2 )]
112
-margin_left = 290.0
111
+margin_left = 470.0
113 112
 margin_right = 1735.0
114 113
 margin_bottom = 28.0
115 114
 
@@ -120,8 +119,6 @@ margin_bottom = 28.0
120 119
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
121 120
 
122 121
 [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"]
123
-
124
-[node name="DragController" parent="." instance=ExtResource( 6 )]
125 122
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"]
126 123
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonClear" to="." method="_on_ButtonClear_pressed"]
127 124
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"]

+ 2
- 5
addons/dialogic/Editor/Pieces/ChangeScene.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/ChangeScene.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5
-[ext_resource path="res://addons/dialogic/Images/change-scene.svg" type="Texture" id=3]
5
+[ext_resource path="res://addons/dialogic/Images/Events/change-scene.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
@@ -103,7 +102,5 @@ margin_bottom = 28.0
103 102
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
104 103
 
105 104
 [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"]
106
-
107
-[node name="DragController" parent="." instance=ExtResource( 6 )]
108 105
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonScenePicker" to="." method="_on_ButtonScenePicker_pressed"]
109 106
 [connection signal="finished" from="PanelContainer/AudioPreview" to="." method="_on_AudioPreview_finished"]

+ 2
- 5
addons/dialogic/Editor/Pieces/ChangeTimeline.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/ChangeTimeline.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5
-[ext_resource path="res://addons/dialogic/Images/change-timeline.svg" type="Texture" id=3]
5
+[ext_resource path="res://addons/dialogic/Images/Events/change-timeline.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
@@ -91,6 +90,4 @@ margin_left = 1739.0
91 90
 margin_right = 1776.0
92 91
 margin_bottom = 28.0
93 92
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
94
-
95
-[node name="DragController" parent="." instance=ExtResource( 5 )]
96 93
 [connection signal="about_to_show" from="PanelContainer/VBoxContainer/Header/MenuButton" to="." method="_on_MenuButton_about_to_show"]

+ 1
- 4
addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn View File

@@ -1,11 +1,10 @@
1
-[gd_scene load_steps=10 format=2]
1
+[gd_scene load_steps=9 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CharacterJoinBlock.gd" type="Script" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Images/character-join.svg" type="Texture" id=4]
7 7
 [ext_resource path="res://addons/dialogic/Images/character.svg" type="Texture" id=5]
8
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn" type="PackedScene" id=7]
10 9
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn" type="PackedScene" id=8]
11 10
 
@@ -134,5 +133,3 @@ margin_bottom = 30.0
134 133
 margin_left = 1739.0
135 134
 margin_right = 1776.0
136 135
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
137
-
138
-[node name="DragController" parent="." instance=ExtResource( 6 )]

+ 1
- 4
addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CharacterLeaveBlock.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Images/character-leave.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
@@ -99,6 +98,4 @@ margin_left = 1739.0
99 98
 margin_right = 1776.0
100 99
 margin_bottom = 28.0
101 100
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
102
-
103
-[node name="DragController" parent="." instance=ExtResource( 5 )]
104 101
 [connection signal="about_to_show" from="PanelContainer/VBoxContainer/Header/CharacterDropdown" to="." method="_on_CharacterDropdown_about_to_show"]

+ 1
- 4
addons/dialogic/Editor/Pieces/Choice.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=9 format=2]
1
+[gd_scene load_steps=8 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Images/choice.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Choice.gd" type="Script" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 [ext_resource path="res://addons/dialogic/Images/warning.svg" type="Texture" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CustomLineEdit.tscn" type="PackedScene" id=7]
10 9
 
@@ -109,6 +108,4 @@ margin_left = 945.0
109 108
 margin_right = 982.0
110 109
 margin_bottom = 28.0
111 110
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
112
-
113
-[node name="DragController" parent="." instance=ExtResource( 5 )]
114 111
 [connection signal="visibility_changed" from="Indent" to="." method="_on_Indent_visibility_changed"]

+ 1
- 4
addons/dialogic/Editor/Pieces/CloseDialog.tscn View File

@@ -1,6 +1,5 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=1]
4 3
 [ext_resource path="res://addons/dialogic/Images/end-dialog.svg" type="Texture" id=2]
5 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=3]
6 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CloseDialog.gd" type="Script" id=4]
@@ -85,5 +84,3 @@ margin_left = 1739.0
85 84
 margin_right = 1776.0
86 85
 margin_bottom = 28.0
87 86
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
88
-
89
-[node name="DragController" parent="." instance=ExtResource( 1 )]

+ 0
- 49
addons/dialogic/Editor/Pieces/Common/DragController.gd View File

@@ -1,49 +0,0 @@
1
-tool
2
-extends Control
3
-
4
-var moving
5
-var hover = false
6
-
7
-func _ready():
8
-	get_parent().connect("gui_input", self, '_on_gui_input')
9
-	get_parent().connect("mouse_entered", self, '_on_mouse_entered')
10
-	get_parent().connect("mouse_exited", self, '_on_mouse_exited')
11
-
12
-func _process(delta):
13
-	if moving:
14
-		var current_position = get_global_mouse_position()
15
-		var movement_offset = 15
16
-		var height = get_parent().get_node("PanelContainer").rect_size.y + movement_offset
17
-		var node_position = get_parent().rect_global_position.y
18
-		if current_position.y < node_position - movement_offset:
19
-			get_parent().get_node("PanelContainer/VBoxContainer/Header/OptionButton")._on_OptionSelected(0)
20
-		if current_position.y > node_position + height:
21
-			get_parent().get_node("PanelContainer/VBoxContainer/Header/OptionButton")._on_OptionSelected(1)
22
-	
23
-	# TODO: I have to figure out a way to modify only an instance's theme. 
24
-	# This code modifies the custom theme of all the same kind of scenes.
25
-	
26
-	#if hover:
27
-	#	get_parent().get_node("PanelContainer").self_modulate = Color("#dd42ff")
28
-	#	var panel = get_parent().get_node("PanelContainer").get('custom_styles/panel')
29
-	#	panel.set('border_color', '#ffffff')
30
-	#else:
31
-	#	get_parent().get_node("PanelContainer").self_modulate = Color("#ffffff")
32
-	#	var panel = get_parent().get_node("PanelContainer").get('custom_styles/panel')
33
-	#	panel.set('border_color', '#202020')
34
-
35
-
36
-func _on_gui_input(event):
37
-	if event is InputEventMouseButton and event.button_index == 1:
38
-		if moving:
39
-			moving = false
40
-		else:
41
-			moving = true
42
-
43
-
44
-func _on_mouse_entered():
45
-	hover = true
46
-
47
-
48
-func _on_mouse_exited():
49
-	hover = false

+ 0
- 10
addons/dialogic/Editor/Pieces/Common/DragController.tscn View File

@@ -1,10 +0,0 @@
1
-[gd_scene load_steps=2 format=2]
2
-
3
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.gd" type="Script" id=1]
4
-
5
-[node name="DragController" type="Control"]
6
-visible = false
7
-margin_left = 1024.0
8
-margin_right = 1024.0
9
-margin_bottom = 126.0
10
-script = ExtResource( 1 )

+ 1
- 4
addons/dialogic/Editor/Pieces/EmitSignal.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=8 format=2]
1
+[gd_scene load_steps=7 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Images/signal.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/EmitSignal.gd" type="Script" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
@@ -115,6 +114,4 @@ margin_left = 945.0
115 114
 margin_right = 982.0
116 115
 margin_bottom = 28.0
117 116
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
118
-
119
-[node name="DragController" parent="." instance=ExtResource( 5 )]
120 117
 [connection signal="text_changed" from="PanelContainer/VBoxContainer/Header/LineEdit" to="." method="_on_LineEdit_text_changed"]

+ 1
- 4
addons/dialogic/Editor/Pieces/EndBranch.tscn View File

@@ -1,8 +1,7 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=3]
6 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/EndBranch.gd" type="Script" id=4]
7 6
 [ext_resource path="res://addons/dialogic/Images/end-choice.svg" type="Texture" id=5]
8 7
 
@@ -88,5 +87,3 @@ margin_left = 965.0
88 87
 margin_right = 1002.0
89 88
 margin_bottom = 28.0
90 89
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
91
-
92
-[node name="DragController" parent="." instance=ExtResource( 3 )]

+ 1
- 4
addons/dialogic/Editor/Pieces/IfCondition.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=10 format=2]
1
+[gd_scene load_steps=9 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Images/condition.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/IfCondition.gd" type="Script" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/ConditionPicker.tscn" type="PackedScene" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CustomLineEdit.tscn" type="PackedScene" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DefinitionPicker.tscn" type="PackedScene" id=7]
10 9
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=8]
@@ -96,5 +95,3 @@ margin_left = 945.0
96 95
 margin_right = 982.0
97 96
 margin_bottom = 28.0
98 97
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
99
-
100
-[node name="DragController" parent="." instance=ExtResource( 5 )]

+ 1
- 4
addons/dialogic/Editor/Pieces/Question.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Images/question.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Question.gd" type="Script" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
@@ -98,6 +97,4 @@ margin_left = 945.0
98 97
 margin_right = 982.0
99 98
 margin_bottom = 28.0
100 99
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
101
-
102
-[node name="DragController" parent="." instance=ExtResource( 5 )]
103 100
 [connection signal="text_changed" from="PanelContainer/VBoxContainer/Header/LineEdit" to="." method="_on_LineEdit_text_changed"]

+ 5
- 8
addons/dialogic/Editor/Pieces/SceneEvent.tscn View File

@@ -1,8 +1,7 @@
1
-[gd_scene load_steps=8 format=2]
1
+[gd_scene load_steps=7 format=2]
2 2
 
3
-[ext_resource path="res://addons/dialogic/Images/scene.svg" type="Texture" id=1]
3
+[ext_resource path="res://addons/dialogic/Images/Events/scene.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=2]
5
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=3]
6 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn" type="PackedScene" id=4]
7 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/SceneEvent.gd" type="Script" id=5]
8 7
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=6]
@@ -38,7 +37,7 @@ margin_bottom = 74.0
38 37
 
39 38
 [node name="PanelContainer" type="PanelContainer" parent="."]
40 39
 margin_right = 1024.0
41
-margin_bottom = 78.0
40
+margin_bottom = 74.0
42 41
 mouse_filter = 1
43 42
 size_flags_horizontal = 3
44 43
 size_flags_vertical = 3
@@ -48,7 +47,7 @@ custom_styles/panel = SubResource( 1 )
48 47
 margin_left = 16.0
49 48
 margin_top = 6.0
50 49
 margin_right = 1018.0
51
-margin_bottom = 72.0
50
+margin_bottom = 68.0
52 51
 size_flags_horizontal = 3
53 52
 
54 53
 [node name="Header" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
@@ -125,11 +124,9 @@ size_flags_horizontal = 3
125 124
 [node name="TextureRect" type="TextureRect" parent="PanelContainer/VBoxContainer"]
126 125
 margin_top = 62.0
127 126
 margin_right = 1002.0
128
-margin_bottom = 66.0
127
+margin_bottom = 62.0
129 128
 size_flags_horizontal = 3
130 129
 size_flags_vertical = 3
131 130
 expand = true
132 131
 stretch_mode = 5
133
-
134
-[node name="DragController" parent="." instance=ExtResource( 3 )]
135 132
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/ImageButton" to="." method="_on_ImageButton_pressed"]

+ 2
- 5
addons/dialogic/Editor/Pieces/SetTheme.tscn View File

@@ -1,17 +1,16 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/SetTheme.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Images/theme.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
11 10
 content_margin_right = 6.0
12 11
 content_margin_top = 6.0
13 12
 content_margin_bottom = 6.0
14
-bg_color = Color( 0.203922, 0.478431, 0.45098, 0.443137 )
13
+bg_color = Color( 0.219608, 0.34902, 0.701961, 0.443137 )
15 14
 border_width_left = 2
16 15
 border_width_top = 2
17 16
 border_width_right = 2
@@ -91,6 +90,4 @@ margin_left = 1739.0
91 90
 margin_right = 1776.0
92 91
 margin_bottom = 28.0
93 92
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
94
-
95
-[node name="DragController" parent="." instance=ExtResource( 5 )]
96 93
 [connection signal="about_to_show" from="PanelContainer/VBoxContainer/Header/MenuButton" to="." method="_on_MenuButton_about_to_show"]

+ 1
- 5
addons/dialogic/Editor/Pieces/SetValue.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=10 format=2]
1
+[gd_scene load_steps=9 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/SetValue.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Images/Resources/definition.svg" type="Texture" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DefinitionPicker.tscn" type="PackedScene" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/OperationPicker.tscn" type="PackedScene" id=7]
10 9
 
@@ -125,7 +124,4 @@ margin_left = 945.0
125 124
 margin_right = 982.0
126 125
 margin_bottom = 28.0
127 126
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
128
-
129
-[node name="DragController" parent="." instance=ExtResource( 5 )]
130
-
131 127
 [connection signal="text_changed" from="PanelContainer/VBoxContainer/Header/LineEdit" to="." method="_on_LineEdit_text_changed"]

+ 1
- 4
addons/dialogic/Editor/Pieces/TextBlock.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=10 format=2]
1
+[gd_scene load_steps=9 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Editor/Pieces/TextBlock.gd" type="Script" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn" type="PackedScene" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Images/dialog.svg" type="Texture" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn" type="PackedScene" id=6]
9 8
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn" type="PackedScene" id=7]
10 9
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=8]
@@ -128,6 +127,4 @@ size_flags_vertical = 3
128 127
 show_line_numbers = true
129 128
 smooth_scrolling = true
130 129
 wrap_enabled = true
131
-
132
-[node name="DragController" parent="." instance=ExtResource( 5 )]
133 130
 [connection signal="text_changed" from="PanelContainer/VBoxContainer/TextEdit" to="." method="_on_TextEdit_text_changed"]

+ 2
- 5
addons/dialogic/Editor/Pieces/WaitSeconds.tscn View File

@@ -1,10 +1,9 @@
1
-[gd_scene load_steps=7 format=2]
1
+[gd_scene load_steps=6 format=2]
2 2
 
3
-[ext_resource path="res://addons/dialogic/Images/Wait.svg" type="Texture" id=1]
3
+[ext_resource path="res://addons/dialogic/Images/Events/Wait.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/Pieces/WaitSeconds.gd" type="Script" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
6 6
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7
-[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5]
8 7
 
9 8
 [sub_resource type="StyleBoxFlat" id=1]
10 9
 content_margin_left = 16.0
@@ -104,6 +103,4 @@ margin_left = 945.0
104 103
 margin_right = 982.0
105 104
 margin_bottom = 28.0
106 105
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
107
-
108
-[node name="DragController" parent="." instance=ExtResource( 5 )]
109 106
 [connection signal="value_changed" from="PanelContainer/VBoxContainer/Header/SpinBox" to="." method="_on_SpinBox_value_changed"]

+ 17
- 0
addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres View File

@@ -0,0 +1,17 @@
1
+[gd_resource type="StyleBoxFlat" format=2]
2
+
3
+[resource]
4
+content_margin_left = 6.0
5
+content_margin_right = 6.0
6
+content_margin_top = 6.0
7
+content_margin_bottom = 6.0
8
+bg_color = Color( 0.0980392, 0.329412, 0.509804, 1 )
9
+border_width_left = 2
10
+border_width_top = 2
11
+border_width_right = 2
12
+border_width_bottom = 2
13
+border_color = Color( 0.0901961, 0.560784, 0.937255, 1 )
14
+corner_radius_top_left = 6
15
+corner_radius_top_right = 6
16
+corner_radius_bottom_right = 6
17
+corner_radius_bottom_left = 6

+ 19
- 1
addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd View File

@@ -25,6 +25,7 @@ onready var n = {
25 25
 	'background_texture_button_visible': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/CheckBox,
26 26
 	'theme_background_image': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/BackgroundTextureButton,
27 27
 	'theme_next_image': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextIndicatorButton,
28
+	'next_animation': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextAnimation,
28 29
 	'theme_action_key': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/BoxContainer/ActionOptionButton,
29 30
 	'theme_background_color_visible': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2/CheckBox,
30 31
 	'theme_background_color': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2/ColorPickerButton,
@@ -68,6 +69,10 @@ onready var n = {
68 69
 func _ready():
69 70
 	# Signal connection to free up some memory
70 71
 	connect("visibility_changed", self, "_on_visibility_changed")
72
+	if get_constant("dark_theme", "Editor"):
73
+		$VBoxContainer/HBoxContainer3/PreviewButton.icon = load("res://addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg")
74
+	else:
75
+		$VBoxContainer/HBoxContainer3/PreviewButton.icon = load("res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg")
71 76
 	# Force preview update
72 77
 	_on_visibility_changed()
73 78
 
@@ -141,6 +146,16 @@ func load_theme(filename):
141 146
 	n['name_bottom_gap'].value = theme.get_value('name', 'bottom_gap', 48)
142 147
 	
143 148
 	
149
+	# Next indicator animations
150
+	var animations = ['Up and down', 'Pulse', 'Static'] # TODO: dynamically get all the animations from the Dialog.tscn NextIndicator
151
+	n['next_animation'].clear()
152
+	var next_animation_selected = theme.get_value('next_indicator', 'animation', 'Up and down')
153
+	var nix = 0
154
+	for a in animations:
155
+		n['next_animation'].add_item(a)
156
+		if a == next_animation_selected:
157
+			n['next_animation'].select(nix)
158
+		nix += 1
144 159
 	
145 160
 	# Preview text
146 161
 	n['text_preview'].text = theme.get_value('text', 'preview', 'This is preview text. You can use  [color=#A5EFAC]BBCode[/color] to style it.\n[wave amp=50 freq=2]You can even use effects![/wave]')
@@ -180,6 +195,10 @@ func _on_indicator_selected(path, target):
180 195
 	n['theme_next_image'].text = DialogicResources.get_filename_from_path(path)
181 196
 
182 197
 
198
+func _on_NextAnimation_item_selected(index):
199
+	DialogicResources.set_theme_value(current_theme, 'next_indicator', 'animation', n['next_animation'].get_item_text(index))
200
+
201
+
183 202
 func _on_ColorPickerButton_color_changed(color):
184 203
 	DialogicResources.set_theme_value(current_theme, 'text','color', '#' + color.to_html())
185 204
 
@@ -203,7 +222,6 @@ func _on_PreviewButton_pressed():
203 222
 	var preview_dialog = dialogic_node.instance()
204 223
 	preview_dialog.preview = true
205 224
 	preview_dialog.get_node('DefinitionInfo').in_theme_editor = true
206
-	preview_dialog.get_node('TextBubble/NextIndicator/AnimationPlayer').play('IDLE')
207 225
 	
208 226
 	# Random character preview if there are any
209 227
 	var characters = DialogicUtil.get_character_list()

+ 56
- 40
addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn View File

@@ -1,6 +1,6 @@
1 1
 [gd_scene load_steps=4 format=2]
2 2
 
3
-[ext_resource path="res://addons/dialogic/Images/plugin-editor-icon.svg" type="Texture" id=1]
3
+[ext_resource path="res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd" type="Script" id=2]
5 5
 [ext_resource path="res://addons/dialogic/Editor/ThemeEditor/SectionTitle.tscn" type="PackedScene" id=3]
6 6
 
@@ -444,20 +444,20 @@ __meta__ = {
444 444
 [node name="GridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer2/DialogBox"]
445 445
 margin_top = 34.0
446 446
 margin_right = 315.0
447
-margin_bottom = 218.0
447
+margin_bottom = 242.0
448 448
 size_flags_horizontal = 3
449 449
 custom_constants/hseparation = 10
450 450
 columns = 2
451 451
 
452 452
 [node name="Label5" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
453 453
 margin_top = 5.0
454
-margin_right = 132.0
454
+margin_right = 126.0
455 455
 margin_bottom = 19.0
456 456
 text = "Background Color"
457 457
 
458 458
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
459
-margin_left = 142.0
460
-margin_right = 294.0
459
+margin_left = 136.0
460
+margin_right = 288.0
461 461
 margin_bottom = 24.0
462 462
 
463 463
 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2"]
@@ -472,14 +472,14 @@ size_flags_horizontal = 3
472 472
 
473 473
 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
474 474
 margin_top = 33.0
475
-margin_right = 132.0
475
+margin_right = 126.0
476 476
 margin_bottom = 47.0
477 477
 text = "Background Texture"
478 478
 
479 479
 [node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
480
-margin_left = 142.0
480
+margin_left = 136.0
481 481
 margin_top = 28.0
482
-margin_right = 294.0
482
+margin_right = 288.0
483 483
 margin_bottom = 52.0
484 484
 
485 485
 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3"]
@@ -496,28 +496,43 @@ text = "background-2"
496 496
 
497 497
 [node name="Label2" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
498 498
 margin_top = 59.0
499
-margin_right = 132.0
499
+margin_right = 126.0
500 500
 margin_bottom = 73.0
501
-text = "Next dialog indicator"
501
+text = "Next indicator"
502 502
 
503 503
 [node name="NextIndicatorButton" type="Button" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
504
-margin_left = 142.0
504
+margin_left = 136.0
505 505
 margin_top = 56.0
506
-margin_right = 294.0
506
+margin_right = 288.0
507 507
 margin_bottom = 76.0
508 508
 text = "next-indicator"
509 509
 
510
+[node name="Label4" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
511
+margin_top = 83.0
512
+margin_right = 126.0
513
+margin_bottom = 97.0
514
+text = "Next animation"
515
+
516
+[node name="NextAnimation" type="OptionButton" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
517
+margin_left = 136.0
518
+margin_top = 80.0
519
+margin_right = 288.0
520
+margin_bottom = 100.0
521
+__meta__ = {
522
+"_edit_use_anchors_": false
523
+}
524
+
510 525
 [node name="Label6" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
511
-margin_top = 85.0
512
-margin_right = 132.0
513
-margin_bottom = 99.0
526
+margin_top = 109.0
527
+margin_right = 126.0
528
+margin_bottom = 123.0
514 529
 text = "Box padding"
515 530
 
516 531
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
517
-margin_left = 142.0
518
-margin_top = 80.0
519
-margin_right = 294.0
520
-margin_bottom = 104.0
532
+margin_left = 136.0
533
+margin_top = 104.0
534
+margin_right = 288.0
535
+margin_bottom = 128.0
521 536
 
522 537
 [node name="TextOffsetV" type="SpinBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer"]
523 538
 margin_right = 74.0
@@ -535,16 +550,16 @@ rounded = true
535 550
 allow_lesser = true
536 551
 
537 552
 [node name="Label7" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
538
-margin_top = 113.0
539
-margin_right = 132.0
540
-margin_bottom = 127.0
553
+margin_top = 137.0
554
+margin_right = 126.0
555
+margin_bottom = 151.0
541 556
 text = "Box Size (pixels)"
542 557
 
543 558
 [node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
544
-margin_left = 142.0
545
-margin_top = 108.0
546
-margin_right = 294.0
547
-margin_bottom = 132.0
559
+margin_left = 136.0
560
+margin_top = 132.0
561
+margin_right = 288.0
562
+margin_bottom = 156.0
548 563
 
549 564
 [node name="BoxSizeW" type="SpinBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer4"]
550 565
 margin_right = 74.0
@@ -565,16 +580,16 @@ allow_greater = true
565 580
 allow_lesser = true
566 581
 
567 582
 [node name="Label8" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
568
-margin_top = 141.0
569
-margin_right = 132.0
570
-margin_bottom = 155.0
583
+margin_top = 165.0
584
+margin_right = 126.0
585
+margin_bottom = 179.0
571 586
 text = "Bottom gap"
572 587
 
573 588
 [node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
574
-margin_left = 142.0
575
-margin_top = 136.0
576
-margin_right = 294.0
577
-margin_bottom = 160.0
589
+margin_left = 136.0
590
+margin_top = 160.0
591
+margin_right = 288.0
592
+margin_bottom = 184.0
578 593
 
579 594
 [node name="BottomGap" type="SpinBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer5"]
580 595
 margin_right = 74.0
@@ -586,17 +601,17 @@ allow_greater = true
586 601
 allow_lesser = true
587 602
 
588 603
 [node name="Label3" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
589
-margin_top = 164.0
590
-margin_right = 132.0
591
-margin_bottom = 184.0
604
+margin_top = 188.0
605
+margin_right = 126.0
606
+margin_bottom = 208.0
592 607
 size_flags_vertical = 5
593 608
 text = "Action key"
594 609
 
595 610
 [node name="BoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
596
-margin_left = 142.0
597
-margin_top = 164.0
598
-margin_right = 294.0
599
-margin_bottom = 184.0
611
+margin_left = 136.0
612
+margin_top = 188.0
613
+margin_right = 288.0
614
+margin_bottom = 208.0
600 615
 
601 616
 [node name="ActionOptionButton" type="OptionButton" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/BoxContainer"]
602 617
 margin_right = 152.0
@@ -821,6 +836,7 @@ size_flags_vertical = 3
821 836
 [connection signal="toggled" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/CheckBox" to="." method="_on_BackgroundTexture_CheckBox_toggled"]
822 837
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/BackgroundTextureButton" to="." method="_on_BackgroundTextureButton_pressed"]
823 838
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextIndicatorButton" to="." method="_on_NextIndicatorButton_pressed"]
839
+[connection signal="item_selected" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextAnimation" to="." method="_on_NextAnimation_item_selected"]
824 840
 [connection signal="value_changed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer/TextOffsetV" to="." method="_on_TextMargin_value_changed"]
825 841
 [connection signal="value_changed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer/TextOffsetH" to="." method="_on_TextMargin_value_changed"]
826 842
 [connection signal="value_changed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer4/BoxSizeW" to="." method="_on_BoxSize_value_changed"]

+ 63
- 4
addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd View File

@@ -12,9 +12,13 @@ onready var events_warning = $ScrollContainer/EventContainer/EventsWarning
12 12
 
13 13
 var hovered_item = null
14 14
 var selected_style : StyleBoxFlat = load("res://addons/dialogic/Editor/Pieces/selected_styleboxflat.tres")
15
+var selected_style_text : StyleBoxFlat = load("res://addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres")
15 16
 var saved_style : StyleBoxFlat
16 17
 var selected_item : Node
17 18
 
19
+
20
+var moving_piece = null
21
+
18 22
 func _ready():
19 23
 	# We connect all the event buttons to the event creation functions
20 24
 	for b in $ScrollContainer/EventContainer.get_children():
@@ -25,6 +29,26 @@ func _ready():
25 29
 				b.connect('pressed', self, "_on_ButtonCondition_pressed", [])
26 30
 			else:
27 31
 				b.connect('pressed', self, "_create_event_button_pressed", [b.name])
32
+	
33
+	var style = $TimelineArea.get('custom_styles/bg')
34
+	style.set('bg_color', get_color("dark_color_1", "Editor"))
35
+
36
+
37
+func _process(delta):
38
+	if moving_piece != null:
39
+		var current_position = get_global_mouse_position()
40
+		var node_position = moving_piece.rect_global_position.y
41
+		var height = get_block_height(moving_piece)
42
+		var up_offset = get_block_height(get_block_above(moving_piece))
43
+		var down_offset = get_block_height(get_block_below(moving_piece))
44
+		if up_offset != null:
45
+			up_offset = (up_offset / 2) + 5
46
+			if current_position.y < node_position - up_offset:
47
+				move_block(moving_piece, 'up')
48
+		if down_offset != null:
49
+			down_offset = height + (down_offset / 2) + 5
50
+			if current_position.y > node_position + down_offset:
51
+				move_block(moving_piece, 'down')
28 52
 
29 53
 
30 54
 func _clear_selection():
@@ -36,21 +60,33 @@ func _clear_selection():
36 60
 	saved_style = null
37 61
 
38 62
 
63
+func _is_item_selected(item: Node):
64
+	return item == selected_item
65
+
66
+
39 67
 func _select_item(item: Node):
40
-	if item != selected_item:
68
+	if item != null and not _is_item_selected(item):
41 69
 		_clear_selection()
42 70
 		var panel: PanelContainer = item.get_node("PanelContainer")
43 71
 		if panel != null:
44 72
 			saved_style = panel.get('custom_styles/panel')
45 73
 			selected_item = item
46
-			panel.set('custom_styles/panel', selected_style)
74
+			if selected_item.event_data.has('text') and selected_item.event_data.has('character'):
75
+				panel.set('custom_styles/panel', selected_style_text)
76
+			else:
77
+				panel.set('custom_styles/panel', selected_style)
47 78
 	else:
48 79
 		_clear_selection()
49 80
 
50 81
 
51 82
 func _on_gui_input(event, item: Node):
52
-	if event is InputEventMouseButton and event.button_index == 1 and event.is_pressed():
53
-		_select_item(item)
83
+	if event is InputEventMouseButton and event.button_index == 1:
84
+		if event.is_pressed():
85
+			if not _is_item_selected(item):
86
+				_select_item(item)
87
+			moving_piece = item
88
+		else:
89
+			moving_piece = null
54 90
 
55 91
 
56 92
 # Event Creation signal for buttons
@@ -216,6 +252,29 @@ func clear_timeline():
216 252
 		event.free()
217 253
 
218 254
 
255
+func get_block_above(block):
256
+	var block_index = block.get_index()
257
+	var item = null
258
+	if block_index > 0:
259
+		item = timeline.get_child(block_index - 1)
260
+	return item
261
+
262
+
263
+func get_block_below(block):
264
+	var block_index = block.get_index()
265
+	var item = null
266
+	if block_index < timeline.get_child_count() - 1:
267
+		item = timeline.get_child(block_index + 1)
268
+	return item
269
+
270
+
271
+func get_block_height(block):
272
+	if block != null:
273
+		return block.get_node("PanelContainer").rect_size.y
274
+	else:
275
+		return null
276
+
277
+
219 278
 # ordering blocks in timeline
220 279
 func move_block(block, direction):
221 280
 	var block_index = block.get_index()

+ 93
- 91
addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn View File

@@ -1,30 +1,31 @@
1
-[gd_scene load_steps=21 format=2]
1
+[gd_scene load_steps=22 format=2]
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Images/character-join.svg" type="Texture" id=1]
4 4
 [ext_resource path="res://addons/dialogic/Images/dialog.svg" type="Texture" id=2]
5
-[ext_resource path="res://addons/dialogic/Images/audio-event.svg" type="Texture" id=3]
6
-[ext_resource path="res://addons/dialogic/Images/scene.svg" type="Texture" id=4]
5
+[ext_resource path="res://addons/dialogic/Images/Events/audio-event.svg" type="Texture" id=3]
6
+[ext_resource path="res://addons/dialogic/Images/Events/scene.svg" type="Texture" id=4]
7 7
 [ext_resource path="res://addons/dialogic/Images/condition.svg" type="Texture" id=5]
8 8
 [ext_resource path="res://addons/dialogic/Images/end-dialog.svg" type="Texture" id=6]
9 9
 [ext_resource path="res://addons/dialogic/Images/character-leave.svg" type="Texture" id=7]
10 10
 [ext_resource path="res://addons/dialogic/Images/question.svg" type="Texture" id=8]
11 11
 [ext_resource path="res://addons/dialogic/Images/end-choice.svg" type="Texture" id=9]
12
-[ext_resource path="res://addons/dialogic/Images/change-timeline.svg" type="Texture" id=10]
12
+[ext_resource path="res://addons/dialogic/Images/Events/change-timeline.svg" type="Texture" id=10]
13 13
 [ext_resource path="res://addons/dialogic/Images/Resources/definition.svg" type="Texture" id=11]
14 14
 [ext_resource path="res://addons/dialogic/Images/choice.svg" type="Texture" id=12]
15 15
 [ext_resource path="res://addons/dialogic/Images/tutorials/arrow-down.svg" type="Texture" id=13]
16
-[ext_resource path="res://addons/dialogic/Images/Wait.svg" type="Texture" id=14]
17
-[ext_resource path="res://addons/dialogic/Images/change-scene.svg" type="Texture" id=15]
16
+[ext_resource path="res://addons/dialogic/Images/Events/Wait.svg" type="Texture" id=14]
17
+[ext_resource path="res://addons/dialogic/Images/Events/change-scene.svg" type="Texture" id=15]
18 18
 [ext_resource path="res://addons/dialogic/Images/signal.svg" type="Texture" id=16]
19 19
 [ext_resource path="res://addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd" type="Script" id=17]
20 20
 [ext_resource path="res://addons/dialogic/Images/theme.svg" type="Texture" id=18]
21
+[ext_resource path="res://addons/dialogic/Images/Events/background-music.svg" type="Texture" id=19]
21 22
 
22 23
 [sub_resource type="StyleBoxFlat" id=1]
23 24
 content_margin_left = 5.0
24 25
 content_margin_right = 5.0
25 26
 content_margin_top = 5.0
26 27
 content_margin_bottom = 5.0
27
-bg_color = Color( 0.14902, 0.172549, 0.231373, 1 )
28
+bg_color = Color( 0, 0, 0, 1 )
28 29
 border_width_left = 1
29 30
 border_width_top = 1
30 31
 border_width_right = 1
@@ -44,6 +45,7 @@ corner_radius_bottom_left = 5
44 45
 [node name="TimelineEditor" type="HSplitContainer"]
45 46
 anchor_right = 1.0
46 47
 anchor_bottom = 1.0
48
+margin_bottom = 138.0
47 49
 size_flags_horizontal = 3
48 50
 size_flags_vertical = 3
49 51
 custom_constants/separation = 0
@@ -55,7 +57,7 @@ __meta__ = {
55 57
 
56 58
 [node name="TimelineArea" type="ScrollContainer" parent="."]
57 59
 margin_right = 816.0
58
-margin_bottom = 600.0
60
+margin_bottom = 738.0
59 61
 size_flags_horizontal = 3
60 62
 size_flags_vertical = 3
61 63
 custom_styles/bg = SubResource( 1 )
@@ -67,7 +69,7 @@ __meta__ = {
67 69
 margin_left = 5.0
68 70
 margin_top = 5.0
69 71
 margin_right = 811.0
70
-margin_bottom = 595.0
72
+margin_bottom = 733.0
71 73
 grow_horizontal = 2
72 74
 grow_vertical = 2
73 75
 size_flags_horizontal = 3
@@ -76,12 +78,12 @@ size_flags_vertical = 3
76 78
 [node name="ScrollContainer" type="ScrollContainer" parent="."]
77 79
 margin_left = 824.0
78 80
 margin_right = 1024.0
79
-margin_bottom = 600.0
81
+margin_bottom = 738.0
80 82
 rect_min_size = Vector2( 200, 0 )
81 83
 
82 84
 [node name="EventContainer" type="VBoxContainer" parent="ScrollContainer"]
83
-margin_right = 188.0
84
-margin_bottom = 702.0
85
+margin_right = 200.0
86
+margin_bottom = 738.0
85 87
 size_flags_horizontal = 3
86 88
 size_flags_vertical = 3
87 89
 __meta__ = {
@@ -89,14 +91,14 @@ __meta__ = {
89 91
 }
90 92
 
91 93
 [node name="EventsWarning" type="PanelContainer" parent="ScrollContainer/EventContainer"]
92
-margin_right = 188.0
93
-margin_bottom = 68.0
94
+margin_right = 200.0
95
+margin_bottom = 60.0
94 96
 custom_styles/panel = SubResource( 2 )
95 97
 
96 98
 [node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/EventContainer/EventsWarning"]
97 99
 margin_top = 10.0
98
-margin_right = 182.0
99
-margin_bottom = 58.0
100
+margin_right = 194.0
101
+margin_bottom = 50.0
100 102
 size_flags_horizontal = 3
101 103
 size_flags_vertical = 3
102 104
 __meta__ = {
@@ -105,15 +107,15 @@ __meta__ = {
105 107
 
106 108
 [node name="TextureRect" type="TextureRect" parent="ScrollContainer/EventContainer/EventsWarning/HBoxContainer"]
107 109
 margin_right = 40.0
108
-margin_bottom = 48.0
110
+margin_bottom = 40.0
109 111
 rect_min_size = Vector2( 40, 40 )
110 112
 texture = ExtResource( 13 )
111 113
 stretch_mode = 4
112 114
 
113 115
 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/EventsWarning/HBoxContainer"]
114 116
 margin_left = 44.0
115
-margin_right = 182.0
116
-margin_bottom = 48.0
117
+margin_right = 194.0
118
+margin_bottom = 40.0
117 119
 rect_min_size = Vector2( 100, 0 )
118 120
 size_flags_horizontal = 3
119 121
 size_flags_vertical = 1
@@ -122,9 +124,9 @@ text = "Add an event to start building your timeline"
122 124
 autowrap = true
123 125
 
124 126
 [node name="HBoxContainer6" type="HBoxContainer" parent="ScrollContainer/EventContainer"]
125
-margin_top = 72.0
126
-margin_right = 188.0
127
-margin_bottom = 86.0
127
+margin_top = 64.0
128
+margin_right = 200.0
129
+margin_bottom = 78.0
128 130
 
129 131
 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer6"]
130 132
 margin_right = 77.0
@@ -133,38 +135,38 @@ text = "Main Events"
133 135
 
134 136
 [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer6"]
135 137
 margin_left = 81.0
136
-margin_right = 188.0
138
+margin_right = 200.0
137 139
 margin_bottom = 14.0
138 140
 size_flags_horizontal = 3
139 141
 
140 142
 [node name="TextBlock" type="Button" parent="ScrollContainer/EventContainer"]
141
-margin_top = 90.0
142
-margin_right = 188.0
143
-margin_bottom = 118.0
143
+margin_top = 82.0
144
+margin_right = 200.0
145
+margin_bottom = 110.0
144 146
 text = "  Text Event"
145 147
 icon = ExtResource( 2 )
146 148
 align = 0
147 149
 
148 150
 [node name="CharacterJoinBlock" type="Button" parent="ScrollContainer/EventContainer"]
149
-margin_top = 122.0
150
-margin_right = 188.0
151
-margin_bottom = 150.0
151
+margin_top = 114.0
152
+margin_right = 200.0
153
+margin_bottom = 142.0
152 154
 text = "  Character Join"
153 155
 icon = ExtResource( 1 )
154 156
 align = 0
155 157
 
156 158
 [node name="CharacterLeaveBlock" type="Button" parent="ScrollContainer/EventContainer"]
157
-margin_top = 154.0
158
-margin_right = 188.0
159
-margin_bottom = 182.0
159
+margin_top = 146.0
160
+margin_right = 200.0
161
+margin_bottom = 174.0
160 162
 text = "  Character Leave"
161 163
 icon = ExtResource( 7 )
162 164
 align = 0
163 165
 
164 166
 [node name="HBoxContainer5" type="HBoxContainer" parent="ScrollContainer/EventContainer"]
165
-margin_top = 186.0
166
-margin_right = 188.0
167
-margin_bottom = 200.0
167
+margin_top = 178.0
168
+margin_right = 200.0
169
+margin_bottom = 192.0
168 170
 
169 171
 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer5"]
170 172
 margin_right = 33.0
@@ -173,54 +175,54 @@ text = "Logic"
173 175
 
174 176
 [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer5"]
175 177
 margin_left = 37.0
176
-margin_right = 188.0
178
+margin_right = 200.0
177 179
 margin_bottom = 14.0
178 180
 size_flags_horizontal = 3
179 181
 
180 182
 [node name="ButtonQuestion" type="Button" parent="ScrollContainer/EventContainer"]
181
-margin_top = 204.0
182
-margin_right = 188.0
183
-margin_bottom = 232.0
183
+margin_top = 196.0
184
+margin_right = 200.0
185
+margin_bottom = 224.0
184 186
 text = "  Question"
185 187
 icon = ExtResource( 8 )
186 188
 align = 0
187 189
 
188 190
 [node name="Choice" type="Button" parent="ScrollContainer/EventContainer"]
189
-margin_top = 236.0
190
-margin_right = 188.0
191
-margin_bottom = 264.0
191
+margin_top = 228.0
192
+margin_right = 200.0
193
+margin_bottom = 256.0
192 194
 text = "  Choice"
193 195
 icon = ExtResource( 12 )
194 196
 align = 0
195 197
 
196 198
 [node name="IfCondition" type="Button" parent="ScrollContainer/EventContainer"]
197
-margin_top = 268.0
198
-margin_right = 188.0
199
-margin_bottom = 296.0
199
+margin_top = 260.0
200
+margin_right = 200.0
201
+margin_bottom = 288.0
200 202
 text = " Condition"
201 203
 icon = ExtResource( 5 )
202 204
 align = 0
203 205
 
204 206
 [node name="EndBranch" type="Button" parent="ScrollContainer/EventContainer"]
205
-margin_top = 300.0
206
-margin_right = 188.0
207
-margin_bottom = 328.0
207
+margin_top = 292.0
208
+margin_right = 200.0
209
+margin_bottom = 320.0
208 210
 text = "  End Branch"
209 211
 icon = ExtResource( 9 )
210 212
 align = 0
211 213
 
212 214
 [node name="SetValue" type="Button" parent="ScrollContainer/EventContainer"]
213
-margin_top = 332.0
214
-margin_right = 188.0
215
-margin_bottom = 360.0
215
+margin_top = 324.0
216
+margin_right = 200.0
217
+margin_bottom = 352.0
216 218
 text = "  Set Value"
217 219
 icon = ExtResource( 11 )
218 220
 align = 0
219 221
 
220 222
 [node name="HBoxContainer3" type="HBoxContainer" parent="ScrollContainer/EventContainer"]
221
-margin_top = 364.0
222
-margin_right = 188.0
223
-margin_bottom = 378.0
223
+margin_top = 356.0
224
+margin_right = 200.0
225
+margin_bottom = 370.0
224 226
 
225 227
 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer3"]
226 228
 margin_right = 56.0
@@ -229,55 +231,55 @@ text = "Timeline"
229 231
 
230 232
 [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer3"]
231 233
 margin_left = 60.0
232
-margin_right = 188.0
234
+margin_right = 200.0
233 235
 margin_bottom = 14.0
234 236
 size_flags_horizontal = 3
235 237
 
236 238
 [node name="ChangeTimeline" type="Button" parent="ScrollContainer/EventContainer"]
237
-margin_top = 382.0
238
-margin_right = 188.0
239
-margin_bottom = 410.0
239
+margin_top = 374.0
240
+margin_right = 200.0
241
+margin_bottom = 402.0
240 242
 hint_tooltip = "This will instantly teleport you to the start of the desired timeline."
241 243
 text = "  Change Timeline"
242 244
 icon = ExtResource( 10 )
243 245
 align = 0
244 246
 
245 247
 [node name="SceneEvent" type="Button" parent="ScrollContainer/EventContainer"]
246
-margin_top = 414.0
247
-margin_right = 188.0
248
-margin_bottom = 442.0
248
+margin_top = 406.0
249
+margin_right = 200.0
250
+margin_bottom = 434.0
249 251
 text = "  Scene Event"
250 252
 icon = ExtResource( 4 )
251 253
 align = 0
252 254
 
253 255
 [node name="CloseDialog" type="Button" parent="ScrollContainer/EventContainer"]
254
-margin_top = 446.0
255
-margin_right = 188.0
256
-margin_bottom = 474.0
256
+margin_top = 438.0
257
+margin_right = 200.0
258
+margin_bottom = 466.0
257 259
 text = "  Close Dialog"
258 260
 icon = ExtResource( 6 )
259 261
 align = 0
260 262
 
261 263
 [node name="WaitSeconds" type="Button" parent="ScrollContainer/EventContainer"]
262
-margin_top = 478.0
263
-margin_right = 188.0
264
-margin_bottom = 506.0
264
+margin_top = 470.0
265
+margin_right = 200.0
266
+margin_bottom = 498.0
265 267
 text = "  Wait Seconds"
266 268
 icon = ExtResource( 14 )
267 269
 align = 0
268 270
 
269 271
 [node name="SetTheme" type="Button" parent="ScrollContainer/EventContainer"]
270
-margin_top = 510.0
271
-margin_right = 188.0
272
-margin_bottom = 538.0
272
+margin_top = 502.0
273
+margin_right = 200.0
274
+margin_bottom = 530.0
273 275
 text = "  Set Theme"
274 276
 icon = ExtResource( 18 )
275 277
 align = 0
276 278
 
277 279
 [node name="HBoxContainer4" type="HBoxContainer" parent="ScrollContainer/EventContainer"]
278
-margin_top = 542.0
279
-margin_right = 188.0
280
-margin_bottom = 556.0
280
+margin_top = 534.0
281
+margin_right = 200.0
282
+margin_bottom = 548.0
281 283
 
282 284
 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer4"]
283 285
 margin_right = 37.0
@@ -286,30 +288,30 @@ text = "Audio"
286 288
 
287 289
 [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer4"]
288 290
 margin_left = 41.0
289
-margin_right = 188.0
291
+margin_right = 200.0
290 292
 margin_bottom = 14.0
291 293
 size_flags_horizontal = 3
292 294
 
293 295
 [node name="AudioBlock" type="Button" parent="ScrollContainer/EventContainer"]
294
-margin_top = 560.0
295
-margin_right = 188.0
296
-margin_bottom = 588.0
296
+margin_top = 552.0
297
+margin_right = 200.0
298
+margin_bottom = 580.0
297 299
 text = "  Audio Event"
298 300
 icon = ExtResource( 3 )
299 301
 align = 0
300 302
 
301 303
 [node name="BackgroundMusic" type="Button" parent="ScrollContainer/EventContainer"]
302
-margin_top = 592.0
303
-margin_right = 188.0
304
-margin_bottom = 620.0
304
+margin_top = 584.0
305
+margin_right = 200.0
306
+margin_bottom = 612.0
305 307
 text = "  Background Music"
306
-icon = ExtResource( 3 )
308
+icon = ExtResource( 19 )
307 309
 align = 0
308 310
 
309 311
 [node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/EventContainer"]
310
-margin_top = 624.0
311
-margin_right = 188.0
312
-margin_bottom = 638.0
312
+margin_top = 616.0
313
+margin_right = 200.0
314
+margin_bottom = 630.0
313 315
 
314 316
 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer"]
315 317
 margin_right = 39.0
@@ -318,22 +320,22 @@ text = "Godot"
318 320
 
319 321
 [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer"]
320 322
 margin_left = 43.0
321
-margin_right = 188.0
323
+margin_right = 200.0
322 324
 margin_bottom = 14.0
323 325
 size_flags_horizontal = 3
324 326
 
325 327
 [node name="EmitSignal" type="Button" parent="ScrollContainer/EventContainer"]
326
-margin_top = 642.0
327
-margin_right = 188.0
328
-margin_bottom = 670.0
328
+margin_top = 634.0
329
+margin_right = 200.0
330
+margin_bottom = 662.0
329 331
 text = "  Emit Signal"
330 332
 icon = ExtResource( 16 )
331 333
 align = 0
332 334
 
333 335
 [node name="ChangeScene" type="Button" parent="ScrollContainer/EventContainer"]
334
-margin_top = 674.0
335
-margin_right = 188.0
336
-margin_bottom = 702.0
336
+margin_top = 666.0
337
+margin_right = 200.0
338
+margin_bottom = 694.0
337 339
 hint_tooltip = "This will instantly change
338 340
 the current scene."
339 341
 text = "  Change Scene"

addons/dialogic/Images/Wait.svg → addons/dialogic/Images/Events/Wait.svg View File


addons/dialogic/Images/Wait.svg.import → addons/dialogic/Images/Events/Wait.svg.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/Wait.svg-3067f9c4ae9af9327c6bfe7ece5d6521.stex"
5
+path="res://.import/Wait.svg-967925959cce4f8e3ee840598b69a612.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://addons/dialogic/Images/Wait.svg"
13
-dest_files=[ "res://.import/Wait.svg-3067f9c4ae9af9327c6bfe7ece5d6521.stex" ]
12
+source_file="res://addons/dialogic/Images/Events/Wait.svg"
13
+dest_files=[ "res://.import/Wait.svg-967925959cce4f8e3ee840598b69a612.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 4
- 0
addons/dialogic/Images/Events/audio-event.svg View File

@@ -0,0 +1,4 @@
1
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 14V8C3 7.44772 3.44772 7 4 7H6.7132C6.90062 7 7.08427 6.94733 7.2432 6.848L13.47 2.95625C14.136 2.53997 15 3.01881 15 3.80425V10.6313C14.7507 10.5508 14.4911 10.507 14.2299 10.5008L14.2119 10.5003H14.2075C12.7898 10.479 11.4999 11.5842 11.5 13.1117V13.112V17.8125L7.2432 15.152C7.08427 15.0527 6.90062 15 6.7132 15H4C3.44772 15 3 14.5523 3 14ZM15 14.0686V17.9309L14.5 18.2403V13.7592L15 14.0686Z" fill="white"/>
3
+<path d="M14.1939 12.0003C13.539 11.9855 12.9999 12.4877 13 13.1117V18.888C13.0008 19.7431 13.9725 20.2769 14.7499 19.8495L19.4164 16.9625C20.1945 16.5347 20.1945 15.4648 19.4164 15.0371L14.7499 12.15C14.5807 12.0563 14.3895 12.005 14.194 12.0003H14.1939Z" fill="#51B7FF"/>
4
+</svg>

addons/dialogic/Images/audio-event.svg.import → addons/dialogic/Images/Events/audio-event.svg.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/audio-event.svg-f466bed1a2d6642d6551ef16a9c08581.stex"
5
+path="res://.import/audio-event.svg-bd534461a0eafdc8864d2de10c52b1e3.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://addons/dialogic/Images/audio-event.svg"
13
-dest_files=[ "res://.import/audio-event.svg-f466bed1a2d6642d6551ef16a9c08581.stex" ]
12
+source_file="res://addons/dialogic/Images/Events/audio-event.svg"
13
+dest_files=[ "res://.import/audio-event.svg-bd534461a0eafdc8864d2de10c52b1e3.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 4
- 0
addons/dialogic/Images/Events/background-music.svg View File

@@ -0,0 +1,4 @@
1
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path d="M13.5287 11C12.827 10.9838 12.2494 11.5331 12.2495 12.2156V18.5333C12.2503 19.4686 13.2915 20.0524 14.1245 19.5849L19.1245 16.4273C19.9582 15.9594 19.9582 14.7893 19.1245 14.3214L14.1245 11.1638C13.9432 11.0613 13.7383 11.0052 13.5288 11H13.5287Z" fill="#51B7FF"/>
3
+<path d="M15.9637 2.25251C15.8597 2.2551 15.7563 2.27069 15.6561 2.2989L6.90613 4.7989C6.64523 4.87366 6.41574 5.03129 6.25234 5.24799C6.08894 5.46468 6.00049 5.72867 6.00037 6.00007V12.9386C5.79469 12.8965 5.5853 12.8752 5.37537 12.8751C4.54656 12.8751 3.75171 13.2043 3.16566 13.7904C2.57961 14.3764 2.25037 15.1713 2.25037 16.0001C2.25037 16.8289 2.57961 17.6238 3.16566 18.2098C3.75171 18.7959 4.54656 19.1251 5.37537 19.1251C6.18463 19.1243 6.96205 18.8097 7.544 18.2473C8.12594 17.6849 8.46704 16.9187 8.49549 16.11C8.49873 16.0734 8.50036 16.0368 8.50037 16.0001V6.94498L14.7504 5.16036V9.12523L17.2504 7.87523V3.50023C17.2501 3.33316 17.2163 3.16784 17.1511 3.01404C17.0859 2.86024 16.9904 2.72107 16.8705 2.60477C16.7505 2.48847 16.6085 2.39739 16.4528 2.33691C16.297 2.27644 16.1307 2.24779 15.9637 2.25267L15.9637 2.25251Z" fill="white"/>
4
+</svg>

+ 34
- 0
addons/dialogic/Images/Events/background-music.svg.import View File

@@ -0,0 +1,34 @@
1
+[remap]
2
+
3
+importer="texture"
4
+type="StreamTexture"
5
+path="res://.import/background-music.svg-ce4f516e1adc748da06ba03cfc5f5aea.stex"
6
+metadata={
7
+"vram_texture": false
8
+}
9
+
10
+[deps]
11
+
12
+source_file="res://addons/dialogic/Images/Events/background-music.svg"
13
+dest_files=[ "res://.import/background-music.svg-ce4f516e1adc748da06ba03cfc5f5aea.stex" ]
14
+
15
+[params]
16
+
17
+compress/mode=0
18
+compress/lossy_quality=0.7
19
+compress/hdr_mode=0
20
+compress/bptc_ldr=0
21
+compress/normal_map=0
22
+flags/repeat=0
23
+flags/filter=true
24
+flags/mipmaps=false
25
+flags/anisotropic=false
26
+flags/srgb=2
27
+process/fix_alpha_border=true
28
+process/premult_alpha=false
29
+process/HDR_as_SRGB=false
30
+process/invert_color=false
31
+stream=false
32
+size_limit=0
33
+detect_3d=true
34
+svg/scale=1.0

+ 4
- 0
addons/dialogic/Images/Events/change-scene.svg View File

@@ -0,0 +1,4 @@
1
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6245 2.42908L19.4514 2L19.8155 4.5873L17.6554 4.91423L16.6245 2.42908ZM11.6397 3.18254L14.132 2.80453L15.1629 5.29216L12.6706 5.67016L11.6397 3.18254ZM6.65249 3.93854L9.14482 3.56054L10.1757 6.04817L7.68338 6.42617L6.65249 3.93854ZM2 4.64347L4.16015 4.31654L5.19105 6.80166L2.36413 7.23074L2 4.64347ZM2.36406 16.3846V8.53844H20V12.6075L17.4024 12.5359C16.0416 12.4985 14.908 13.5713 14.8705 14.9321C14.8567 15.4334 14.9935 15.9038 15.2399 16.3C14.7353 16.4628 14.2827 16.4937 13.9025 16.4567C12.8164 16.3512 11.7699 15.6475 11.1538 14.5406C10.4918 13.3511 8.99072 12.9235 7.80118 13.5856C6.61165 14.2477 6.18406 15.7487 6.84615 16.9382C7.26641 17.6933 7.79823 18.3912 8.42228 19H4.88348C3.49204 19 2.36406 17.8291 2.36406 16.3846Z" fill="white"/>
3
+<path d="M19.939 15.7394C15.8678 20.7388 10.9236 19.1954 9 15.7394M19.8447 18.2901L20.8202 15.096L17.3346 15" stroke="#51B7FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
4
+</svg>

addons/dialogic/Images/change-scene.svg.import → addons/dialogic/Images/Events/change-scene.svg.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/change-scene.svg-6741e154480a026a1704d39dc9993684.stex"
5
+path="res://.import/change-scene.svg-4ec53c6e2be3e1a24d1aeb9767277503.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://addons/dialogic/Images/change-scene.svg"
13
-dest_files=[ "res://.import/change-scene.svg-6741e154480a026a1704d39dc9993684.stex" ]
12
+source_file="res://addons/dialogic/Images/Events/change-scene.svg"
13
+dest_files=[ "res://.import/change-scene.svg-4ec53c6e2be3e1a24d1aeb9767277503.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 4
- 0
addons/dialogic/Images/Events/change-timeline.svg View File

@@ -0,0 +1,4 @@
1
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 2C2.44772 2 2 2.44772 2 3V4C2 4.55228 2.44772 5 3 5H19C19.5523 5 20 4.55228 20 4V3C20 2.44772 19.5523 2 19 2H3ZM3 7C2.44772 7 2 7.44772 2 8V9C2 9.55228 2.44772 10 3 10H19C19.5523 10 20 9.55228 20 9V8C20 7.44772 19.5523 7 19 7H3ZM2 13C2 12.4477 2.44772 12 3 12H19C19.4121 12 19.766 12.2493 19.9191 12.6053L17.4024 12.5359C16.0416 12.4985 14.908 13.5713 14.8705 14.9321C14.8699 14.9548 14.8695 14.9774 14.8695 15H11.4507C11.3434 14.8559 11.244 14.7026 11.1538 14.5406C10.4918 13.3511 8.99072 12.9235 7.80118 13.5856C7.22745 13.9049 6.83097 14.4194 6.64851 15H3C2.44772 15 2 14.5523 2 14V13ZM6.88085 17H3C2.44772 17 2 17.4477 2 18V19C2 19.5523 2.44772 20 3 20H9.65183C8.50244 19.2281 7.55346 18.1862 6.88085 17Z" fill="white"/>
3
+<path d="M19.939 15.7394C15.8678 20.7388 10.9236 19.1954 9 15.7394M19.8447 18.2901L20.8202 15.096L17.3346 15" stroke="#51B7FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
4
+</svg>

addons/dialogic/Images/change-timeline.svg.import → addons/dialogic/Images/Events/change-timeline.svg.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/change-timeline.svg-783cf6946622396a13124d15e21599a3.stex"
5
+path="res://.import/change-timeline.svg-6aceaf7d093889feea334bbe4350d8be.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://addons/dialogic/Images/change-timeline.svg"
13
-dest_files=[ "res://.import/change-timeline.svg-783cf6946622396a13124d15e21599a3.stex" ]
12
+source_file="res://addons/dialogic/Images/Events/change-timeline.svg"
13
+dest_files=[ "res://.import/change-timeline.svg-6aceaf7d093889feea334bbe4350d8be.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 4
- 0
addons/dialogic/Images/Events/scene.svg View File

@@ -0,0 +1,4 @@
1
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path d="M3.07188 2C2.7876 2 2.51496 2.10536 2.31395 2.29289C2.11293 2.48043 2 2.73478 2 3V19C2 19.2652 2.11293 19.5196 2.31395 19.7071C2.51496 19.8946 2.7876 20 3.07188 20H18.9281C18.9281 20 19.485 19.8946 19.6861 19.7071C19.8871 19.5196 20 19.2652 20 19C20 18.7348 20 3 20 3C20 2.73478 19.8871 2.48043 19.6861 2.29289C19.485 2.10536 19.2124 2 18.9281 2H3.07188ZM4 4H18V16H4V4Z" fill="white"/>
3
+<path d="M14.9894 14.3602H7.17412C6.49264 14.3602 5.98862 13.761 6.14272 13.1341L6.68913 10.9111C6.80974 10.4204 7.29797 10.0911 7.82855 10.1425L9.53217 10.3075C9.87368 10.3406 10.211 10.2152 10.437 9.97121L12.5385 7.70295C13.0832 7.11506 14.0993 7.31757 14.346 8.06318L16 13.062C16.2131 13.7059 15.7037 14.3602 14.9894 14.3602Z" fill="white"/>
4
+</svg>

addons/dialogic/Images/scene.svg.import → addons/dialogic/Images/Events/scene.svg.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/scene.svg-7e486b606631b7f10f94075876ec8fce.stex"
5
+path="res://.import/scene.svg-ca26fe974139b6679b31bddcfc26e995.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://addons/dialogic/Images/scene.svg"
13
-dest_files=[ "res://.import/scene.svg-7e486b606631b7f10f94075876ec8fce.stex" ]
12
+source_file="res://addons/dialogic/Images/Events/scene.svg"
13
+dest_files=[ "res://.import/scene.svg-ca26fe974139b6679b31bddcfc26e995.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 3
- 0
addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg View File

@@ -0,0 +1,3 @@
1
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 2C1 1.44771 1.44772 1 2 1H14C14.5523 1 15 1.44772 15 2V11C15 13.5 7 15 7 15L9.24 12H2C1.44772 12 1 11.5523 1 11V2ZM3 8C3 7.68776 3.10876 7.44304 3.32629 7.26582C3.54381 7.08861 3.82931 7 4.18279 7C4.54534 7 4.83537 7.08861 5.05289 7.26582C5.27042 7.44304 5.37918 7.68776 5.37918 8C5.37918 8.29536 5.27042 8.53586 5.05289 8.72152C4.83537 8.90717 4.54534 9 4.18279 9C3.82931 9 3.54381 8.90717 3.32629 8.72152C3.10876 8.53586 3 8.29536 3 8ZM6.81041 8C6.81041 7.68776 6.91917 7.44304 7.1367 7.26582C7.35422 7.08861 7.63972 7 7.9932 7C8.35574 7 8.64578 7.08861 8.8633 7.26582C9.08083 7.44304 9.18959 7.68776 9.18959 8C9.18959 8.29536 9.08083 8.53586 8.8633 8.72152C8.64578 8.90717 8.35574 9 7.9932 9C7.63972 9 7.35422 8.90717 7.1367 8.72152C6.91917 8.53586 6.81041 8.29536 6.81041 8ZM10.9471 7.26582C10.7296 7.44304 10.6208 7.68776 10.6208 8C10.6208 8.29536 10.7296 8.53586 10.9471 8.72152C11.1646 8.90717 11.4501 9 11.8036 9C12.1662 9 12.4562 8.90717 12.6737 8.72152C12.8912 8.53586 13 8.29536 13 8C13 7.68776 12.8912 7.44304 12.6737 7.26582C12.4562 7.08861 12.1662 7 11.8036 7C11.4501 7 11.1646 7.08861 10.9471 7.26582Z" fill="#E0E0E0"/>
3
+</svg>

+ 34
- 0
addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg.import View File

@@ -0,0 +1,34 @@
1
+[remap]
2
+
3
+importer="texture"
4
+type="StreamTexture"
5
+path="res://.import/plugin-editor-icon-dark-theme.svg-4945c419e7e7434b4eff87c00fedb862.stex"
6
+metadata={
7
+"vram_texture": false
8
+}
9
+
10
+[deps]
11
+
12
+source_file="res://addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg"
13
+dest_files=[ "res://.import/plugin-editor-icon-dark-theme.svg-4945c419e7e7434b4eff87c00fedb862.stex" ]
14
+
15
+[params]
16
+
17
+compress/mode=0
18
+compress/lossy_quality=0.7
19
+compress/hdr_mode=0
20
+compress/bptc_ldr=0
21
+compress/normal_map=0
22
+flags/repeat=0
23
+flags/filter=true
24
+flags/mipmaps=false
25
+flags/anisotropic=false
26
+flags/srgb=2
27
+process/fix_alpha_border=true
28
+process/premult_alpha=false
29
+process/HDR_as_SRGB=false
30
+process/invert_color=false
31
+stream=false
32
+size_limit=0
33
+detect_3d=true
34
+svg/scale=1.0

+ 3
- 0
addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg View File

@@ -0,0 +1,3 @@
1
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 2C1 1.44771 1.44772 1 2 1H14C14.5523 1 15 1.44772 15 2V11C15 13.5 7 15 7 15L9.24 12H2C1.44772 12 1 11.5523 1 11V2ZM3 8C3 7.68776 3.10876 7.44304 3.32629 7.26582C3.54381 7.08861 3.82931 7 4.18279 7C4.54534 7 4.83537 7.08861 5.05289 7.26582C5.27042 7.44304 5.37918 7.68776 5.37918 8C5.37918 8.29536 5.27042 8.53586 5.05289 8.72152C4.83537 8.90717 4.54534 9 4.18279 9C3.82931 9 3.54381 8.90717 3.32629 8.72152C3.10876 8.53586 3 8.29536 3 8ZM6.81041 8C6.81041 7.68776 6.91917 7.44304 7.1367 7.26582C7.35422 7.08861 7.63972 7 7.9932 7C8.35574 7 8.64578 7.08861 8.8633 7.26582C9.08083 7.44304 9.18959 7.68776 9.18959 8C9.18959 8.29536 9.08083 8.53586 8.8633 8.72152C8.64578 8.90717 8.35574 9 7.9932 9C7.63972 9 7.35422 8.90717 7.1367 8.72152C6.91917 8.53586 6.81041 8.29536 6.81041 8ZM10.9471 7.26582C10.7296 7.44304 10.6208 7.68776 10.6208 8C10.6208 8.29536 10.7296 8.53586 10.9471 8.72152C11.1646 8.90717 11.4501 9 11.8036 9C12.1662 9 12.4562 8.90717 12.6737 8.72152C12.8912 8.53586 13 8.29536 13 8C13 7.68776 12.8912 7.44304 12.6737 7.26582C12.4562 7.08861 12.1662 7 11.8036 7C11.4501 7 11.1646 7.08861 10.9471 7.26582Z" fill="#5A5A5A"/>
3
+</svg>

+ 34
- 0
addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg.import View File

@@ -0,0 +1,34 @@
1
+[remap]
2
+
3
+importer="texture"
4
+type="StreamTexture"
5
+path="res://.import/plugin-editor-icon-light-theme.svg-fbd42cd06e4ce1cb7eef3585a7eb830a.stex"
6
+metadata={
7
+"vram_texture": false
8
+}
9
+
10
+[deps]
11
+
12
+source_file="res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg"
13
+dest_files=[ "res://.import/plugin-editor-icon-light-theme.svg-fbd42cd06e4ce1cb7eef3585a7eb830a.stex" ]
14
+
15
+[params]
16
+
17
+compress/mode=0
18
+compress/lossy_quality=0.7
19
+compress/hdr_mode=0
20
+compress/bptc_ldr=0
21
+compress/normal_map=0
22
+flags/repeat=0
23
+flags/filter=true
24
+flags/mipmaps=false
25
+flags/anisotropic=false
26
+flags/srgb=2
27
+process/fix_alpha_border=true
28
+process/premult_alpha=false
29
+process/HDR_as_SRGB=false
30
+process/invert_color=false
31
+stream=false
32
+size_limit=0
33
+detect_3d=true
34
+svg/scale=1.0

+ 0
- 4
addons/dialogic/Images/audio-event.svg View File

@@ -1,4 +0,0 @@
1
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
-<path d="M13.5288 11C12.827 10.9838 12.2494 11.5331 12.2495 12.2156V18.5333C12.2504 19.4686 13.2915 20.0524 14.1245 19.5849L19.1245 16.4273C19.9582 15.9594 19.9582 14.7893 19.1245 14.3214L14.1245 11.1638C13.9432 11.0613 13.7383 11.0052 13.5288 11H13.5288Z" fill="white"/>
3
-<path d="M15.9638 2.25251C15.8597 2.2551 15.7563 2.27069 15.6561 2.2989L6.90614 4.7989C6.64524 4.87366 6.41576 5.03129 6.25236 5.24799C6.08895 5.46468 6.00051 5.72867 6.00038 6.00007V12.9386C5.79471 12.8965 5.58532 12.8752 5.37538 12.8751C4.54658 12.8751 3.75172 13.2043 3.16567 13.7904C2.57962 14.3764 2.25038 15.1713 2.25038 16.0001C2.25038 16.8289 2.57962 17.6238 3.16567 18.2098C3.75172 18.7959 4.54658 19.1251 5.37538 19.1251C6.18465 19.1243 6.96206 18.8097 7.54401 18.2473C8.12596 17.6849 8.46705 16.9187 8.49551 16.11C8.49874 16.0734 8.50037 16.0368 8.50039 16.0001V6.94498L14.7504 5.16036V9.12523L17.2504 7.87523V3.50023C17.2501 3.33316 17.2164 3.16784 17.1511 3.01404C17.0859 2.86024 16.9905 2.72107 16.8705 2.60477C16.7506 2.48847 16.6085 2.39739 16.4528 2.33691C16.297 2.27644 16.1308 2.24779 15.9638 2.25267L15.9638 2.25251Z" fill="#A5EFAC"/>
4
-</svg>

+ 0
- 4
addons/dialogic/Images/change-scene.svg View File

@@ -1,4 +0,0 @@
1
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
-<path d="M17.8535 4L15.6094 4.32812L16.4278 6.22852L18.1426 5.97852L17.8535 4ZM13.6308 4.61523L11.6523 4.90429L12.4707 6.80659L14.4492 6.51753L13.6308 4.61523ZM9.6718 5.19335L7.6933 5.48241L8.51166 7.38471L10.4902 7.09565L9.6718 5.19335ZM5.7148 5.77147L4 6.02147L4.28906 7.99997L6.53316 7.67185L5.7148 5.77147ZM4.289 8.99997V15C4.289 16.1046 5.18443 17 6.289 17H18.289V8.99997H4.289Z" fill="white"/>
3
-<path d="M18.5 11V13C16.8038 13.9451 15.8145 14.1267 14 14V16L11 13L14 10V12C15.904 12.0262 16.8791 11.7785 18.5 11Z" fill="#72DDFF"/>
4
-</svg>

+ 0
- 4
addons/dialogic/Images/change-timeline.svg View File

@@ -1,4 +0,0 @@
1
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2C6.44772 2 6 2.44772 6 3V19H8V4H15V19H17V3C17 2.44772 16.5523 2 16 2H7Z" fill="white"/>
3
-<path d="M18.5 11V13C16.8038 13.9451 15.8145 14.1267 14 14V16L11 13L14 10V12C15.904 12.0262 16.8791 11.7785 18.5 11Z" fill="#72DDFF"/>
4
-</svg>

+ 0
- 3
addons/dialogic/Images/plugin-editor-icon.svg View File

@@ -1,3 +0,0 @@
1
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
2
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 2C1 1.44771 1.44772 1 2 1H14C14.5523 1 15 1.44772 15 2V10V11V12L7 15L9.24 12H2C1.44772 12 1 11.5523 1 11V2ZM3 8C3 7.68776 3.10876 7.44304 3.32629 7.26582C3.54381 7.08861 3.82931 7 4.18279 7C4.54534 7 4.83537 7.08861 5.05289 7.26582C5.27042 7.44304 5.37918 7.68776 5.37918 8C5.37918 8.29536 5.27042 8.53586 5.05289 8.72152C4.83537 8.90717 4.54534 9 4.18279 9C3.82931 9 3.54381 8.90717 3.32629 8.72152C3.10876 8.53586 3 8.29536 3 8ZM6.81041 8C6.81041 7.68776 6.91917 7.44304 7.1367 7.26582C7.35422 7.08861 7.63972 7 7.9932 7C8.35574 7 8.64578 7.08861 8.8633 7.26582C9.08083 7.44304 9.18959 7.68776 9.18959 8C9.18959 8.29536 9.08083 8.53586 8.8633 8.72152C8.64578 8.90717 8.35574 9 7.9932 9C7.63972 9 7.35422 8.90717 7.1367 8.72152C6.91917 8.53586 6.81041 8.29536 6.81041 8ZM10.9471 7.26582C10.7296 7.44304 10.6208 7.68776 10.6208 8C10.6208 8.29536 10.7296 8.53586 10.9471 8.72152C11.1646 8.90717 11.4501 9 11.8036 9C12.1662 9 12.4562 8.90717 12.6737 8.72152C12.8912 8.53586 13 8.29536 13 8C13 7.68776 12.8912 7.44304 12.6737 7.26582C12.4562 7.08861 12.1662 7 11.8036 7C11.4501 7 11.1646 7.08861 10.9471 7.26582Z" fill="#E0E0E0"/>
3
-</svg>

+ 0
- 34
addons/dialogic/Images/plugin-editor-icon.svg.import View File

@@ -1,34 +0,0 @@
1
-[remap]
2
-
3
-importer="texture"
4
-type="StreamTexture"
5
-path="res://.import/plugin-editor-icon.svg-b27733904a7899b70bf2e32c6ffbb24b.stex"
6
-metadata={
7
-"vram_texture": false
8
-}
9
-
10
-[deps]
11
-
12
-source_file="res://addons/dialogic/Images/plugin-editor-icon.svg"
13
-dest_files=[ "res://.import/plugin-editor-icon.svg-b27733904a7899b70bf2e32c6ffbb24b.stex" ]
14
-
15
-[params]
16
-
17
-compress/mode=0
18
-compress/lossy_quality=0.7
19
-compress/hdr_mode=0
20
-compress/bptc_ldr=0
21
-compress/normal_map=0
22
-flags/repeat=0
23
-flags/filter=true
24
-flags/mipmaps=false
25
-flags/anisotropic=false
26
-flags/srgb=2
27
-process/fix_alpha_border=true
28
-process/premult_alpha=false
29
-process/HDR_as_SRGB=false
30
-process/invert_color=false
31
-stream=false
32
-size_limit=0
33
-detect_3d=true
34
-svg/scale=1.0

+ 0
- 3
addons/dialogic/Images/scene.svg View File

@@ -1,3 +0,0 @@
1
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
2
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2C3.44772 2 3 2.44772 3 3V18C3 18.5523 3.44772 19 4 19H19C19.5523 19 20 18.5523 20 18V3C20 2.44772 19.5523 2 19 2H4ZM5 17V4H18V12C15.5 7 12 8.5 11 10C10 11.5 6.5 16.6667 5 17Z" fill="white"/>
3
-</svg>

+ 17
- 12
addons/dialogic/Nodes/BackgroundMusic.gd View File

@@ -5,20 +5,25 @@ onready var _anim_player := $AnimationPlayer
5 5
 onready var _track1 := $Track1
6 6
 onready var _track2 := $Track2
7 7
 
8
+var current_path = ""
8 9
 
9
-func crossfade_to(audio_stream: AudioStream) -> void:
10
-	if _track1.playing and _track2.playing:
11
-		return
12
-	
13
-	if _track2.playing:
14
-		_track1.stream = audio_stream
15
-		_track1.play()
16
-		_anim_player.play("FadeToTrack1")
17
-	else:
18
-		_track2.stream = audio_stream
19
-		_track2.play()
20
-		_anim_player.play("FadeToTrack2")
10
+func crossfade_to(path: String) -> void:
11
+	if current_path != path:
12
+		current_path = path
13
+		var stream: AudioStream = load(current_path)
14
+		if _track1.playing and _track2.playing:
15
+			return
16
+		
17
+		if _track2.playing:
18
+			_track1.stream = stream
19
+			_track1.play()
20
+			_anim_player.play("FadeToTrack1")
21
+		else:
22
+			_track2.stream = stream
23
+			_track2.play()
24
+			_anim_player.play("FadeToTrack2")
21 25
 
22 26
 
23 27
 func fade_out() -> void:
28
+	current_path = ""
24 29
 	_anim_player.play("FadeOut")

+ 8
- 9
addons/dialogic/Nodes/BackgroundMusic.tscn View File

@@ -2,9 +2,9 @@
2 2
 
3 3
 [ext_resource path="res://addons/dialogic/Nodes/BackgroundMusic.gd" type="Script" id=1]
4 4
 
5
-
6
-[sub_resource type="Animation" id=3]
5
+[sub_resource type="Animation" id=1]
7 6
 resource_name = "FadeOut"
7
+length = 0.5
8 8
 tracks/0/type = "value"
9 9
 tracks/0/path = NodePath("Track1:volume_db")
10 10
 tracks/0/interp = 1
@@ -54,8 +54,7 @@ tracks/3/keys = {
54 54
 "values": [ false ]
55 55
 }
56 56
 
57
-[sub_resource type="Animation" id=1]
58
-resource_name = "FadeToTrack1"
57
+[sub_resource type="Animation" id=2]
59 58
 length = 0.5
60 59
 tracks/0/type = "value"
61 60
 tracks/0/path = NodePath("Track1:volume_db")
@@ -94,8 +93,7 @@ tracks/2/keys = {
94 93
 "values": [ false ]
95 94
 }
96 95
 
97
-[sub_resource type="Animation" id=2]
98
-resource_name = "FadeToTrack2"
96
+[sub_resource type="Animation" id=3]
99 97
 length = 0.5
100 98
 tracks/0/type = "value"
101 99
 tracks/0/path = NodePath("Track1:volume_db")
@@ -145,8 +143,9 @@ __meta__ = {
145 143
 [node name="Track1" type="AudioStreamPlayer" parent="."]
146 144
 
147 145
 [node name="Track2" type="AudioStreamPlayer" parent="."]
146
+volume_db = -80.0
148 147
 
149 148
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
150
-anims/FadeOut = SubResource( 3 )
151
-anims/FadeToTrack1 = SubResource( 1 )
152
-anims/FadeToTrack2 = SubResource( 2 )
149
+anims/FadeOut = SubResource( 1 )
150
+anims/FadeToTrack1 = SubResource( 2 )
151
+anims/FadeToTrack2 = SubResource( 3 )

+ 10
- 4
addons/dialogic/Nodes/dialog_node.gd View File

@@ -68,8 +68,8 @@ func _ready():
68 68
 
69 69
 func load_config_files():
70 70
 	if not Engine.is_editor_hint():
71
-		# Make sure saves are ready
72
-		DialogicSingleton.init(reset_saves)
71
+		if reset_saves:
72
+			DialogicSingleton.init(reset_saves)
73 73
 		definitions = DialogicSingleton.get_definitions()
74 74
 	else:
75 75
 		definitions = DialogicResources.get_default_definitions()
@@ -468,8 +468,7 @@ func event_handler(event: Dictionary):
468 468
 		{'background-music'}, {'background-music', 'file'}:
469 469
 			emit_signal("event_start", "background-music", event)
470 470
 			if event['background-music'] == 'play' and 'file' in event.keys() and not event['file'].empty():
471
-				var stream: AudioStream = load(event['file'])
472
-				$FX/BackgroundMusic.crossfade_to(stream)
471
+				$FX/BackgroundMusic.crossfade_to(event['file'])
473 472
 			else:
474 473
 				$FX/BackgroundMusic.fade_out()
475 474
 			go_to_next_event()
@@ -738,6 +737,13 @@ func load_theme(filename):
738 737
 		$TextBubble/NameLabel.set('custom_constants/shadow_offset_y', name_shadow_offset.y)
739 738
 	$TextBubble/NameLabel.rect_position.y = theme.get_value('name', 'bottom_gap', 48) * -1
740 739
 	
740
+	
741
+	# Setting next indicator animation
742
+	$TextBubble/NextIndicator.self_modulate = Color('#ffffff')
743
+	$TextBubble/NextIndicator/AnimationPlayer.play(
744
+		theme.get_value('next_indicator', 'animation', 'Up and down')
745
+	)
746
+	
741 747
 	return theme
742 748
 
743 749
 

+ 9
- 9
addons/dialogic/Other/DialogicResources.gd View File

@@ -73,7 +73,7 @@ static func init_saves(overwrite: bool=true):
73 73
 		init_state_saves(overwrite)
74 74
 		init_definitions_saves(overwrite)
75 75
 	else:
76
-		print('Error creating working directory: ' + str(err))
76
+		print('[Dialogic] Error creating working directory: ' + str(err))
77 77
 
78 78
 
79 79
 static func init_working_dir():
@@ -91,7 +91,7 @@ static func init_state_saves(overwrite: bool=true):
91 91
 			file.store_string('')
92 92
 			file.close()
93 93
 		else:
94
-			print('Error opening saved state file: ' + str(err))
94
+			print('[Dialogic] Error opening saved state file: ' + str(err))
95 95
 
96 96
 
97 97
 static func init_definitions_saves(overwrite: bool=true):
@@ -102,12 +102,12 @@ static func init_definitions_saves(overwrite: bool=true):
102 102
 	var err
103 103
 	if not directory.file_exists(paths["SAVED_DEFINITIONS_FILE"]):
104 104
 		err = sink.open(paths["SAVED_DEFINITIONS_FILE"], File.WRITE)
105
-		print('Saved definitions not present, creating file: ' + str(err))
105
+		print('[Dialogic] Saved definitions not present, creating file: ' + str(err))
106 106
 		if err == OK:
107 107
 			sink.store_string('')
108 108
 			sink.close()
109 109
 		else:
110
-			print('Error opening saved definitions file: ' + str(err))
110
+			print('[Dialogic] Error opening saved definitions file: ' + str(err))
111 111
 	
112 112
 	err = sink.open(paths["SAVED_DEFINITIONS_FILE"], File.READ_WRITE)
113 113
 	if err == OK:
@@ -116,11 +116,11 @@ static func init_definitions_saves(overwrite: bool=true):
116 116
 			if err == OK:
117 117
 				sink.store_string(source.get_as_text())
118 118
 			else:
119
-				print('Error opening default definitions file: ' + str(err))
119
+				print('[Dialogic] Error opening default definitions file: ' + str(err))
120 120
 		else:
121
-			print('Did not overwrite previous saved definitions')
121
+			print('[Dialogic] Did not overwrite previous saved definitions')
122 122
 	else:
123
-		print('Error opening saved definitions file: ' + str(err))
123
+		print('[Dialogic] Error opening saved definitions file: ' + str(err))
124 124
 	
125 125
 	source.close()
126 126
 	sink.close()
@@ -155,7 +155,7 @@ static func listdir(path: String) -> Array:
155 155
 			file_name = dir.get_next()
156 156
 		dir.list_dir_end()
157 157
 	else:
158
-		print("Error while accessing path " + path + " - Error: " + str(err))
158
+		print("[Dialogic] Error while accessing path " + path + " - Error: " + str(err))
159 159
 	return files
160 160
 
161 161
 
@@ -175,7 +175,7 @@ static func get_config(id: String) -> ConfigFile:
175 175
 	if id in paths.keys():
176 176
 		var err = config.load(paths[id])
177 177
 		if err != OK:
178
-			print("Error while opening config file " + paths[id] + ". Error: " + str(err))
178
+			print("[Dialogic] Error while opening config file " + paths[id] + ". Error: " + str(err))
179 179
 	return config
180 180
 
181 181
 

+ 1
- 0
addons/dialogic/Other/DialogicSingleton.gd View File

@@ -6,6 +6,7 @@ var default_definitions := {}
6 6
 var current_timeline := ''
7 7
 
8 8
 func _init() -> void:
9
+	# Load saves on script init
9 10
 	init(false)
10 11
 
11 12
 

+ 4
- 1
addons/dialogic/dialogic.gd View File

@@ -45,7 +45,10 @@ func make_visible(visible):
45 45
 
46 46
 
47 47
 func get_plugin_icon():
48
-	return preload("res://addons/dialogic/Images/plugin-editor-icon.svg")
48
+	# https://github.com/godotengine/godot-proposals/issues/572
49
+	if get_editor_interface().get_editor_settings().get_setting("interface/theme/base_color").v > 0.5:
50
+		return preload("res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg")
51
+	return preload("res://addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg")
49 52
 
50 53
 
51 54
 func _add_custom_editor_view():

+ 2
- 0
dialogic/themes/theme-1616657657.cfg View File

@@ -24,3 +24,5 @@ color="#ffffffff"
24 24
 [name]
25 25
 
26 26
 image_visible=true
27
+auto_color=true
28
+shadow_visible=true

Loading…
Cancel
Save