Skip to content

Commit 63830bc

Browse files
Pre alpha-9 fixes (#1695)
- fix event moving & stop branch events from getting entangled - remove error message when moving events to end of timeline - fix the content list updating correctly and keeping selection when updated - update version - reimplement settings quick-goto feature (mainly for tips)
1 parent 64b5edb commit 63830bc

File tree

10 files changed

+551
-524
lines changed

10 files changed

+551
-524
lines changed

addons/dialogic/Editor/Common/sidebar.gd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,16 @@ func _on_logo_gui_input(event:InputEvent) -> void:
139139

140140

141141
func update_content_list(list:PackedStringArray) -> void:
142+
var prev_selected := ""
143+
if %ContentList.is_anything_selected():
144+
prev_selected = %ContentList.get_item_text(%ContentList.get_selected_items()[0])
142145
%ContentList.clear()
143146
%ContentList.add_item('~ Top')
144147
for i in list:
145148
if i.is_empty(): continue
146149
%ContentList.add_item(i)
150+
if i == prev_selected:
151+
%ContentList.select(%ContentList.item_count-1)
147152
if list.is_empty():
148153
return
149154

addons/dialogic/Editor/Events/BranchEnd.gd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ func visual_select() -> void:
2626

2727
## Called by the visual timeline editor
2828
func visual_deselect() -> void:
29+
if !parent_node:return
2930
modulate = parent_node.resource.event_color.lerp(get_theme_color("font_color", "Editor"), 0.3)
3031

3132

3233
## Called by the visual timeline editor
3334
func highlight() -> void:
35+
if !parent_node:return
3436
modulate = parent_node.resource.event_color.lerp(get_theme_color("font_color", "Editor"), 0.6)
3537

3638

addons/dialogic/Editor/Events/EventBlock/event_block.tscn

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ corner_radius_top_right = 5
1111
corner_radius_bottom_right = 5
1212
corner_radius_bottom_left = 5
1313

14-
[sub_resource type="Image" id="Image_tmsys"]
14+
[sub_resource type="Image" id="Image_y3447"]
1515
data = {
1616
"data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 44, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 94, 94, 234, 255, 95, 95, 43, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
1717
"format": "RGBA8",
@@ -20,8 +20,8 @@ data = {
2020
"width": 16
2121
}
2222

23-
[sub_resource type="ImageTexture" id="ImageTexture_wps7w"]
24-
image = SubResource("Image_tmsys")
23+
[sub_resource type="ImageTexture" id="ImageTexture_vg181"]
24+
image = SubResource("Image_y3447")
2525

2626
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ee4ub"]
2727

@@ -84,7 +84,7 @@ offset_left = -5.0
8484
offset_top = -10.0
8585
offset_right = 11.0
8686
offset_bottom = 6.0
87-
texture = SubResource("ImageTexture_wps7w")
87+
texture = SubResource("ImageTexture_vg181")
8888
stretch_mode = 5
8989

9090
[node name="TitleLabel" type="Label" parent="PanelContainer/VBoxContainer/Header"]
@@ -111,16 +111,17 @@ size_flags_horizontal = 0
111111
tooltip_text = "Fold/Unfold Settings"
112112
theme_override_styles/focus = SubResource("StyleBoxEmpty_ee4ub")
113113
toggle_mode = true
114-
icon = SubResource("ImageTexture_wps7w")
114+
icon = SubResource("ImageTexture_vg181")
115115
flat = true
116116

117117
[node name="CollapseButton" type="Button" parent="PanelContainer/VBoxContainer/Header"]
118118
unique_name_in_owner = true
119+
visible = false
119120
layout_mode = 2
120121
size_flags_horizontal = 10
121122
tooltip_text = "Collapse Contained Events"
122123
toggle_mode = true
123-
icon = SubResource("ImageTexture_wps7w")
124+
icon = SubResource("ImageTexture_vg181")
124125
flat = true
125126

126127
[node name="Body" type="MarginContainer" parent="PanelContainer/VBoxContainer"]

addons/dialogic/Editor/HomePage/tips.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ If there are events you never need, you can hide them from the list in the edito
44
Did you know that dialogic supports translations? It does!; editor://Settings->Translations
55
You can use [b]bbcode effects[/b] in text events! What are they though???; https://docs.godotengine.org/en/latest/tutorials/ui/bbcode_in_richtextlabel.html
66
Writing [/i]<Oh hi/Hello you/Well, well>[i] in a text event will pick a random one of the three strings!
7-
There are a number of cool text effects like [pause=x], [speed=x] and [portrait=x]. Try them out!; editor://Settings->DialogText
7+
There are a number of cool text effects like [pause=x], [speed=x] and [portrait=x]. Try them out!; editor://Settings->Text
88
You can use scenes as portraits! This gives you basically limiteless freedom.; https://github.com/coppolaemilio/dialogic/wiki/Tutorial:-Custom-Portraits
99
You can use scenes as backgrounds. This way they can be animated or whatever you want!
1010
Dialogic has a built in save and load system! It's pretty powerful!; editor://Settings->Saving

addons/dialogic/Editor/Settings/settings_editor.gd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func add_registered_sections() -> void:
6161
var vbox := VBoxContainer.new()
6262
vbox.set_meta('section', section)
6363
vbox.size_flags_vertical = Control.SIZE_EXPAND_FILL
64+
vbox.name = section.name
6465
var hbox := HBoxContainer.new()
6566

6667
var title := Label.new()
@@ -151,9 +152,9 @@ func section_sort(item1:DialogicSettingsPage, item2:DialogicSettingsPage) -> boo
151152

152153
func _open(extra_information:Variant = null) -> void:
153154
refresh()
154-
# TODO recreate scroll to behaviour!
155-
# if typeof(extra_information) == TYPE_STRING and has_node('Tabs/'+extra_information):
156-
# $Tabs.current_tab = get_node('Tabs/'+extra_information).get_index()
155+
if typeof(extra_information) == TYPE_STRING:
156+
if %SettingsContent.has_node(extra_information):
157+
open_tab(%SettingsContent.get_node(extra_information))
157158

158159

159160
func _close():

0 commit comments

Comments
 (0)