diff --git a/addons/dialogic/Dialog.tscn b/addons/dialogic/Dialog.tscn index 7364e2a..d5e15ef 100644 --- a/addons/dialogic/Dialog.tscn +++ b/addons/dialogic/Dialog.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://addons/dialogic/Images/next-indicator.png" type="Texture" id=1] [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 ) expand_margin_left = 10.0 [sub_resource type="Animation" id=2] +resource_name = "Pulse" +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:self_modulate") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.5 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +} + +[sub_resource type="Animation" id=3] +resource_name = "Static" + +[sub_resource type="Animation" id=4] loop = true tracks/0/type = "value" tracks/0/path = NodePath(".:margin_bottom") @@ -27,13 +46,13 @@ tracks/0/keys = { "values": [ 12.0, 55.0 ] } -[sub_resource type="StyleBoxFlat" id=3] +[sub_resource type="StyleBoxFlat" id=5] content_margin_left = 10.0 content_margin_right = 10.0 bg_color = Color( 1, 1, 1, 0 ) expand_margin_left = 10.0 -[sub_resource type="StyleBoxFlat" id=4] +[sub_resource type="StyleBoxFlat" id=6] bg_color = Color( 0.196078, 0.196078, 0.196078, 0 ) [node name="DialogNode" type="Control"] @@ -77,15 +96,15 @@ __meta__ = { } [node name="ColorRect" type="ColorRect" parent="TextBubble"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 -color = Color( 0, 0, 0, 0.639216 ) +color = Color( 0, 0, 0, 1 ) __meta__ = { "_edit_use_anchors_": false } [node name="TextureRect" type="TextureRect" parent="TextBubble"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 texture = ExtResource( 2 ) @@ -128,7 +147,7 @@ anchor_bottom = 1.0 margin_left = -36.4279 margin_top = -35.9016 margin_right = 14.5721 -margin_bottom = 12.0 +margin_bottom = 29.4015 rect_scale = Vector2( 0.4, 0.4 ) texture = ExtResource( 1 ) stretch_mode = 4 @@ -137,17 +156,20 @@ __meta__ = { } [node name="AnimationPlayer" type="AnimationPlayer" parent="TextBubble/NextIndicator"] -autoplay = "IDLE" -anims/IDLE = SubResource( 2 ) +autoplay = "Up and down" +anims/Pulse = SubResource( 2 ) +anims/Static = SubResource( 3 ) +"anims/Up and down" = SubResource( 4 ) [node name="NameLabel" type="Label" parent="TextBubble"] -margin_top = -40.0 +margin_top = -48.0 margin_right = 58.0 +margin_bottom = -8.0 size_flags_vertical = 1 -custom_styles/normal = SubResource( 3 ) +custom_styles/normal = SubResource( 5 ) custom_fonts/font = ExtResource( 3 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) -custom_colors/font_color_shadow = Color( 1, 1, 1, 0 ) +custom_colors/font_color_shadow = Color( 0, 0, 0, 0.619608 ) custom_constants/shadow_offset_x = 2 custom_constants/shadow_offset_y = 2 align = 1 @@ -157,18 +179,18 @@ __meta__ = { } [node name="ColorRect" type="ColorRect" parent="TextBubble/NameLabel"] +visible = false show_behind_parent = true anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 15 size_flags_vertical = 15 -color = Color( 0, 0, 0, 0.721569 ) +color = Color( 0.156863, 0.156863, 0.156863, 1 ) __meta__ = { "_edit_use_anchors_": false } [node name="TextureRect" type="TextureRect" parent="TextBubble/NameLabel"] -visible = false show_behind_parent = true anchor_right = 1.0 anchor_bottom = 1.0 @@ -249,7 +271,7 @@ margin_right = 208.0 mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_styles/panel = SubResource( 4 ) +custom_styles/panel = SubResource( 6 ) script = ExtResource( 5 ) __meta__ = { "_edit_group_": true, @@ -318,7 +340,6 @@ __meta__ = { [node name="Timer" type="Timer" parent="DefinitionInfo"] [node name="WaitSeconds" type="Timer" parent="."] - [connection signal="meta_hover_ended" from="TextBubble/RichTextLabel" to="." method="_on_RichTextLabel_meta_hover_ended"] [connection signal="meta_hover_started" from="TextBubble/RichTextLabel" to="." method="_on_RichTextLabel_meta_hover_started"] [connection signal="tween_completed" from="TextBubble/Tween" to="." method="_on_Tween_tween_completed"] diff --git a/addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd b/addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd index 64d9f66..f426639 100644 --- a/addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd +++ b/addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd @@ -27,6 +27,8 @@ func _ready(): nodes['display_name_checkbox'].connect('toggled', self, '_on_display_name_toggled') nodes['name'].connect('text_changed', self, '_on_name_changed') nodes['color'].connect('color_changed', self, '_on_color_changed') + var style = get('custom_styles/bg') + style.set('bg_color', get_color("base_color", "Editor")) func is_selected(file: String): diff --git a/addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn b/addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn index f997a9d..098d5b4 100644 --- a/addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn +++ b/addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn @@ -8,12 +8,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.2, 0.219608, 0.278431, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color( 0.0980392, 0.113725, 0.152941, 1 ) +bg_color = Color( 0.2, 0.23, 0.31, 1 ) [node name="CharacterEditor" type="ScrollContainer"] margin_left = 192.0 diff --git a/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd b/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd index 2f3c48a..f584b10 100644 --- a/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd +++ b/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd @@ -8,10 +8,6 @@ func _ready(): pass -func _process(_delta): - pass - - func _on_ButtonDelete_pressed(): if $NameEdit.text == 'Default': $PathEdit.text = '' diff --git a/addons/dialogic/Editor/MasterTree/MasterTree.gd b/addons/dialogic/Editor/MasterTree/MasterTree.gd index 423f93a..0cc661c 100644 --- a/addons/dialogic/Editor/MasterTree/MasterTree.gd +++ b/addons/dialogic/Editor/MasterTree/MasterTree.gd @@ -105,6 +105,8 @@ func _add_timeline(timeline, select = false): item.set_text(0, timeline['file']) timeline['editor'] = 'Timeline' item.set_metadata(0, timeline) + if not get_constant("dark_theme", "Editor"): + item.set_icon_modulate(0, get_color("property_color", "Editor")) #item.set_editable(0, true) if select: # Auto selecting item.select(0) @@ -122,7 +124,8 @@ func _add_theme(theme_item, select = false): item.set_text(0, theme_item['name']) theme_item['editor'] = 'Theme' item.set_metadata(0, theme_item) - #item.set_editable(0, true) + if not get_constant("dark_theme", "Editor"): + item.set_icon_modulate(0, get_color("property_color", "Editor")) if select: # Auto selecting item.select(0) @@ -162,9 +165,10 @@ func _add_definition(definition, select = false): item.set_icon(0, definition_icon) if definition['type'] == 1: item.set_icon(0, glossary_icon) - definition['editor'] = 'Definition' item.set_metadata(0, definition) + if not get_constant("dark_theme", "Editor"): + item.set_icon_modulate(0, get_color("property_color", "Editor")) if select: # Auto selecting item.select(0) diff --git a/addons/dialogic/Editor/Pieces/AudioBlock.tscn b/addons/dialogic/Editor/Pieces/AudioBlock.tscn index b4ca512..381fe85 100644 --- a/addons/dialogic/Editor/Pieces/AudioBlock.tscn +++ b/addons/dialogic/Editor/Pieces/AudioBlock.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/AudioBlock.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] -[ext_resource path="res://addons/dialogic/Images/audio-event.svg" type="Texture" id=3] +[ext_resource path="res://addons/dialogic/Images/Events/audio-event.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/dialogic/Images/play.svg" type="Texture" id=5] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=7] [sub_resource type="StyleBoxFlat" id=1] @@ -13,7 +12,7 @@ content_margin_left = 16.0 content_margin_right = 6.0 content_margin_top = 6.0 content_margin_bottom = 6.0 -bg_color = Color( 0.580392, 0.286275, 0.227451, 0.447059 ) +bg_color = Color( 0.160784, 0.423529, 0.309804, 0.447059 ) border_width_left = 2 border_width_top = 2 border_width_right = 2 @@ -75,25 +74,26 @@ text = " Audio " [node name="Name" type="Label" parent="PanelContainer/VBoxContainer/Header"] margin_left = 87.0 margin_top = 7.0 -margin_right = 87.0 +margin_right = 352.0 margin_bottom = 21.0 +text = "No sound (will stop previous audio event)" [node name="ButtonAudio" type="Button" parent="PanelContainer/VBoxContainer/Header"] -margin_left = 91.0 -margin_right = 115.0 +margin_left = 356.0 +margin_right = 380.0 margin_bottom = 28.0 text = "..." [node name="ButtonClear" type="Button" parent="PanelContainer/VBoxContainer/Header"] -margin_left = 119.0 -margin_right = 147.0 +margin_left = 384.0 +margin_right = 412.0 margin_bottom = 28.0 disabled = true icon = ExtResource( 7 ) [node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"] -margin_left = 151.0 -margin_right = 185.0 +margin_left = 416.0 +margin_right = 450.0 margin_bottom = 28.0 disabled = true icon = ExtResource( 5 ) @@ -108,7 +108,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 ) text = " ..." [node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 2 )] -margin_left = 189.0 +margin_left = 454.0 margin_right = 1735.0 margin_bottom = 28.0 @@ -119,8 +119,6 @@ margin_bottom = 28.0 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 ] [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"] - -[node name="DragController" parent="." instance=ExtResource( 6 )] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonClear" to="." method="_on_ButtonClear_pressed"] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"] diff --git a/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn b/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn index 67ec67b..0672328 100644 --- a/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn +++ b/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/BackgroundMusic.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] -[ext_resource path="res://addons/dialogic/Images/audio-event.svg" type="Texture" id=3] +[ext_resource path="res://addons/dialogic/Images/Events/background-music.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/dialogic/Images/play.svg" type="Texture" id=5] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=7] [sub_resource type="StyleBoxFlat" id=1] @@ -13,7 +12,7 @@ content_margin_left = 16.0 content_margin_right = 6.0 content_margin_top = 6.0 content_margin_bottom = 6.0 -bg_color = Color( 0.298039, 0.172549, 0.14902, 0.447059 ) +bg_color = Color( 0.160784, 0.423529, 0.309804, 0.447059 ) border_width_left = 2 border_width_top = 2 border_width_right = 2 @@ -75,26 +74,26 @@ text = " Background Music" [node name="Name" type="Label" parent="PanelContainer/VBoxContainer/Header"] margin_left = 154.0 margin_top = 7.0 -margin_right = 188.0 +margin_right = 368.0 margin_bottom = 21.0 -text = "None" +text = "No music (will stop with fade out)" [node name="ButtonAudio" type="Button" parent="PanelContainer/VBoxContainer/Header"] -margin_left = 192.0 -margin_right = 216.0 +margin_left = 372.0 +margin_right = 396.0 margin_bottom = 28.0 text = "..." [node name="ButtonClear" type="Button" parent="PanelContainer/VBoxContainer/Header"] -margin_left = 220.0 -margin_right = 248.0 +margin_left = 400.0 +margin_right = 428.0 margin_bottom = 28.0 disabled = true icon = ExtResource( 7 ) [node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"] -margin_left = 252.0 -margin_right = 286.0 +margin_left = 432.0 +margin_right = 466.0 margin_bottom = 28.0 disabled = true icon = ExtResource( 5 ) @@ -109,7 +108,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 ) text = " ..." [node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 2 )] -margin_left = 290.0 +margin_left = 470.0 margin_right = 1735.0 margin_bottom = 28.0 @@ -120,8 +119,6 @@ margin_bottom = 28.0 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 ] [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"] - -[node name="DragController" parent="." instance=ExtResource( 6 )] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonClear" to="." method="_on_ButtonClear_pressed"] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"] diff --git a/addons/dialogic/Editor/Pieces/ChangeScene.tscn b/addons/dialogic/Editor/Pieces/ChangeScene.tscn index f467be9..305b22c 100644 --- a/addons/dialogic/Editor/Pieces/ChangeScene.tscn +++ b/addons/dialogic/Editor/Pieces/ChangeScene.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/ChangeScene.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] -[ext_resource path="res://addons/dialogic/Images/change-scene.svg" type="Texture" id=3] +[ext_resource path="res://addons/dialogic/Images/Events/change-scene.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 @@ -103,7 +102,5 @@ margin_bottom = 28.0 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 ] [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"] - -[node name="DragController" parent="." instance=ExtResource( 6 )] [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonScenePicker" to="." method="_on_ButtonScenePicker_pressed"] [connection signal="finished" from="PanelContainer/AudioPreview" to="." method="_on_AudioPreview_finished"] diff --git a/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn b/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn index 62a08ee..819b3b6 100644 --- a/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn +++ b/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/ChangeTimeline.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] -[ext_resource path="res://addons/dialogic/Images/change-timeline.svg" type="Texture" id=3] +[ext_resource path="res://addons/dialogic/Images/Events/change-timeline.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 @@ -91,6 +90,4 @@ margin_left = 1739.0 margin_right = 1776.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="about_to_show" from="PanelContainer/VBoxContainer/Header/MenuButton" to="." method="_on_MenuButton_about_to_show"] diff --git a/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn b/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn index ccc34e3..134dccc 100644 --- a/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn +++ b/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/CharacterJoinBlock.gd" type="Script" id=3] [ext_resource path="res://addons/dialogic/Images/character-join.svg" type="Texture" id=4] [ext_resource path="res://addons/dialogic/Images/character.svg" type="Texture" id=5] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn" type="PackedScene" id=8] @@ -134,5 +133,3 @@ margin_bottom = 30.0 margin_left = 1739.0 margin_right = 1776.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 6 )] diff --git a/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn b/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn index fd35f24..4de05e7 100644 --- a/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn +++ b/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/CharacterLeaveBlock.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] [ext_resource path="res://addons/dialogic/Images/character-leave.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 @@ -99,6 +98,4 @@ margin_left = 1739.0 margin_right = 1776.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="about_to_show" from="PanelContainer/VBoxContainer/Header/CharacterDropdown" to="." method="_on_CharacterDropdown_about_to_show"] diff --git a/addons/dialogic/Editor/Pieces/Choice.tscn b/addons/dialogic/Editor/Pieces/Choice.tscn index 783867a..76472d0 100644 --- a/addons/dialogic/Editor/Pieces/Choice.tscn +++ b/addons/dialogic/Editor/Pieces/Choice.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://addons/dialogic/Images/choice.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Choice.gd" type="Script" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [ext_resource path="res://addons/dialogic/Images/warning.svg" type="Texture" id=6] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CustomLineEdit.tscn" type="PackedScene" id=7] @@ -109,6 +108,4 @@ margin_left = 945.0 margin_right = 982.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="visibility_changed" from="Indent" to="." method="_on_Indent_visibility_changed"] diff --git a/addons/dialogic/Editor/Pieces/CloseDialog.tscn b/addons/dialogic/Editor/Pieces/CloseDialog.tscn index dc76f5a..8561884 100644 --- a/addons/dialogic/Editor/Pieces/CloseDialog.tscn +++ b/addons/dialogic/Editor/Pieces/CloseDialog.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/dialogic/Images/end-dialog.svg" type="Texture" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/CloseDialog.gd" type="Script" id=4] @@ -85,5 +84,3 @@ margin_left = 1739.0 margin_right = 1776.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 1 )] diff --git a/addons/dialogic/Editor/Pieces/Common/DragController.gd b/addons/dialogic/Editor/Pieces/Common/DragController.gd deleted file mode 100644 index b918fb2..0000000 --- a/addons/dialogic/Editor/Pieces/Common/DragController.gd +++ /dev/null @@ -1,49 +0,0 @@ -tool -extends Control - -var moving -var hover = false - -func _ready(): - get_parent().connect("gui_input", self, '_on_gui_input') - get_parent().connect("mouse_entered", self, '_on_mouse_entered') - get_parent().connect("mouse_exited", self, '_on_mouse_exited') - -func _process(delta): - if moving: - var current_position = get_global_mouse_position() - var movement_offset = 15 - var height = get_parent().get_node("PanelContainer").rect_size.y + movement_offset - var node_position = get_parent().rect_global_position.y - if current_position.y < node_position - movement_offset: - get_parent().get_node("PanelContainer/VBoxContainer/Header/OptionButton")._on_OptionSelected(0) - if current_position.y > node_position + height: - get_parent().get_node("PanelContainer/VBoxContainer/Header/OptionButton")._on_OptionSelected(1) - - # TODO: I have to figure out a way to modify only an instance's theme. - # This code modifies the custom theme of all the same kind of scenes. - - #if hover: - # get_parent().get_node("PanelContainer").self_modulate = Color("#dd42ff") - # var panel = get_parent().get_node("PanelContainer").get('custom_styles/panel') - # panel.set('border_color', '#ffffff') - #else: - # get_parent().get_node("PanelContainer").self_modulate = Color("#ffffff") - # var panel = get_parent().get_node("PanelContainer").get('custom_styles/panel') - # panel.set('border_color', '#202020') - - -func _on_gui_input(event): - if event is InputEventMouseButton and event.button_index == 1: - if moving: - moving = false - else: - moving = true - - -func _on_mouse_entered(): - hover = true - - -func _on_mouse_exited(): - hover = false diff --git a/addons/dialogic/Editor/Pieces/Common/DragController.tscn b/addons/dialogic/Editor/Pieces/Common/DragController.tscn deleted file mode 100644 index 5a9115c..0000000 --- a/addons/dialogic/Editor/Pieces/Common/DragController.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.gd" type="Script" id=1] - -[node name="DragController" type="Control"] -visible = false -margin_left = 1024.0 -margin_right = 1024.0 -margin_bottom = 126.0 -script = ExtResource( 1 ) diff --git a/addons/dialogic/Editor/Pieces/EmitSignal.tscn b/addons/dialogic/Editor/Pieces/EmitSignal.tscn index ddefe43..43e63a9 100644 --- a/addons/dialogic/Editor/Pieces/EmitSignal.tscn +++ b/addons/dialogic/Editor/Pieces/EmitSignal.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://addons/dialogic/Images/signal.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/EmitSignal.gd" type="Script" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 @@ -115,6 +114,4 @@ margin_left = 945.0 margin_right = 982.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="text_changed" from="PanelContainer/VBoxContainer/Header/LineEdit" to="." method="_on_LineEdit_text_changed"] diff --git a/addons/dialogic/Editor/Pieces/EndBranch.tscn b/addons/dialogic/Editor/Pieces/EndBranch.tscn index 0fb8ae3..79192f2 100644 --- a/addons/dialogic/Editor/Pieces/EndBranch.tscn +++ b/addons/dialogic/Editor/Pieces/EndBranch.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/EndBranch.gd" type="Script" id=4] [ext_resource path="res://addons/dialogic/Images/end-choice.svg" type="Texture" id=5] @@ -88,5 +87,3 @@ margin_left = 965.0 margin_right = 1002.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 3 )] diff --git a/addons/dialogic/Editor/Pieces/IfCondition.tscn b/addons/dialogic/Editor/Pieces/IfCondition.tscn index 00d12ad..a06688b 100644 --- a/addons/dialogic/Editor/Pieces/IfCondition.tscn +++ b/addons/dialogic/Editor/Pieces/IfCondition.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://addons/dialogic/Images/condition.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/IfCondition.gd" type="Script" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/ConditionPicker.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CustomLineEdit.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DefinitionPicker.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=8] @@ -96,5 +95,3 @@ margin_left = 945.0 margin_right = 982.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] diff --git a/addons/dialogic/Editor/Pieces/Question.tscn b/addons/dialogic/Editor/Pieces/Question.tscn index 74bb624..14ffd00 100644 --- a/addons/dialogic/Editor/Pieces/Question.tscn +++ b/addons/dialogic/Editor/Pieces/Question.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/dialogic/Images/question.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Question.gd" type="Script" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 @@ -98,6 +97,4 @@ margin_left = 945.0 margin_right = 982.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="text_changed" from="PanelContainer/VBoxContainer/Header/LineEdit" to="." method="_on_LineEdit_text_changed"] diff --git a/addons/dialogic/Editor/Pieces/SceneEvent.tscn b/addons/dialogic/Editor/Pieces/SceneEvent.tscn index 2a7ff9c..a900c5b 100644 --- a/addons/dialogic/Editor/Pieces/SceneEvent.tscn +++ b/addons/dialogic/Editor/Pieces/SceneEvent.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=7 format=2] -[ext_resource path="res://addons/dialogic/Images/scene.svg" type="Texture" id=1] +[ext_resource path="res://addons/dialogic/Images/Events/scene.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=2] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/dialogic/Editor/Pieces/SceneEvent.gd" type="Script" id=5] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=6] @@ -38,7 +37,7 @@ margin_bottom = 74.0 [node name="PanelContainer" type="PanelContainer" parent="."] margin_right = 1024.0 -margin_bottom = 78.0 +margin_bottom = 74.0 mouse_filter = 1 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -48,7 +47,7 @@ custom_styles/panel = SubResource( 1 ) margin_left = 16.0 margin_top = 6.0 margin_right = 1018.0 -margin_bottom = 72.0 +margin_bottom = 68.0 size_flags_horizontal = 3 [node name="Header" type="HBoxContainer" parent="PanelContainer/VBoxContainer"] @@ -125,11 +124,9 @@ size_flags_horizontal = 3 [node name="TextureRect" type="TextureRect" parent="PanelContainer/VBoxContainer"] margin_top = 62.0 margin_right = 1002.0 -margin_bottom = 66.0 +margin_bottom = 62.0 size_flags_horizontal = 3 size_flags_vertical = 3 expand = true stretch_mode = 5 - -[node name="DragController" parent="." instance=ExtResource( 3 )] [connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/ImageButton" to="." method="_on_ImageButton_pressed"] diff --git a/addons/dialogic/Editor/Pieces/SetTheme.tscn b/addons/dialogic/Editor/Pieces/SetTheme.tscn index cda6ae0..d666c86 100644 --- a/addons/dialogic/Editor/Pieces/SetTheme.tscn +++ b/addons/dialogic/Editor/Pieces/SetTheme.tscn @@ -1,17 +1,16 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/SetTheme.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2] [ext_resource path="res://addons/dialogic/Images/theme.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 content_margin_right = 6.0 content_margin_top = 6.0 content_margin_bottom = 6.0 -bg_color = Color( 0.203922, 0.478431, 0.45098, 0.443137 ) +bg_color = Color( 0.219608, 0.34902, 0.701961, 0.443137 ) border_width_left = 2 border_width_top = 2 border_width_right = 2 @@ -91,6 +90,4 @@ margin_left = 1739.0 margin_right = 1776.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="about_to_show" from="PanelContainer/VBoxContainer/Header/MenuButton" to="." method="_on_MenuButton_about_to_show"] diff --git a/addons/dialogic/Editor/Pieces/SetValue.tscn b/addons/dialogic/Editor/Pieces/SetValue.tscn index a35ecd8..a121161 100644 --- a/addons/dialogic/Editor/Pieces/SetValue.tscn +++ b/addons/dialogic/Editor/Pieces/SetValue.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/SetValue.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Images/Resources/definition.svg" type="Texture" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DefinitionPicker.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/OperationPicker.tscn" type="PackedScene" id=7] @@ -125,7 +124,4 @@ margin_left = 945.0 margin_right = 982.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] - [connection signal="text_changed" from="PanelContainer/VBoxContainer/Header/LineEdit" to="." method="_on_LineEdit_text_changed"] diff --git a/addons/dialogic/Editor/Pieces/TextBlock.tscn b/addons/dialogic/Editor/Pieces/TextBlock.tscn index a7e421f..fa5541d 100644 --- a/addons/dialogic/Editor/Pieces/TextBlock.tscn +++ b/addons/dialogic/Editor/Pieces/TextBlock.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/TextBlock.gd" type="Script" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn" type="PackedScene" id=2] [ext_resource path="res://addons/dialogic/Images/dialog.svg" type="Texture" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=8] @@ -128,6 +127,4 @@ size_flags_vertical = 3 show_line_numbers = true smooth_scrolling = true wrap_enabled = true - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="text_changed" from="PanelContainer/VBoxContainer/TextEdit" to="." method="_on_TextEdit_text_changed"] diff --git a/addons/dialogic/Editor/Pieces/WaitSeconds.tscn b/addons/dialogic/Editor/Pieces/WaitSeconds.tscn index 645f456..3a60230 100644 --- a/addons/dialogic/Editor/Pieces/WaitSeconds.tscn +++ b/addons/dialogic/Editor/Pieces/WaitSeconds.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] -[ext_resource path="res://addons/dialogic/Images/Wait.svg" type="Texture" id=1] +[ext_resource path="res://addons/dialogic/Images/Events/Wait.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/Pieces/WaitSeconds.gd" type="Script" id=2] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DragController.tscn" type="PackedScene" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 16.0 @@ -104,6 +103,4 @@ margin_left = 945.0 margin_right = 982.0 margin_bottom = 28.0 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 ] - -[node name="DragController" parent="." instance=ExtResource( 5 )] [connection signal="value_changed" from="PanelContainer/VBoxContainer/Header/SpinBox" to="." method="_on_SpinBox_value_changed"] diff --git a/addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres b/addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres new file mode 100644 index 0000000..eff22ef --- /dev/null +++ b/addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres @@ -0,0 +1,17 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +content_margin_left = 6.0 +content_margin_right = 6.0 +content_margin_top = 6.0 +content_margin_bottom = 6.0 +bg_color = Color( 0.0980392, 0.329412, 0.509804, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.0901961, 0.560784, 0.937255, 1 ) +corner_radius_top_left = 6 +corner_radius_top_right = 6 +corner_radius_bottom_right = 6 +corner_radius_bottom_left = 6 diff --git a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd index e8bb6ef..d98d4de 100644 --- a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd +++ b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd @@ -25,6 +25,7 @@ onready var n = { 'background_texture_button_visible': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/CheckBox, 'theme_background_image': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/BackgroundTextureButton, 'theme_next_image': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextIndicatorButton, + 'next_animation': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextAnimation, 'theme_action_key': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/BoxContainer/ActionOptionButton, 'theme_background_color_visible': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2/CheckBox, 'theme_background_color': $VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2/ColorPickerButton, @@ -68,6 +69,10 @@ onready var n = { func _ready(): # Signal connection to free up some memory connect("visibility_changed", self, "_on_visibility_changed") + if get_constant("dark_theme", "Editor"): + $VBoxContainer/HBoxContainer3/PreviewButton.icon = load("res://addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg") + else: + $VBoxContainer/HBoxContainer3/PreviewButton.icon = load("res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg") # Force preview update _on_visibility_changed() @@ -141,6 +146,16 @@ func load_theme(filename): n['name_bottom_gap'].value = theme.get_value('name', 'bottom_gap', 48) + # Next indicator animations + var animations = ['Up and down', 'Pulse', 'Static'] # TODO: dynamically get all the animations from the Dialog.tscn NextIndicator + n['next_animation'].clear() + var next_animation_selected = theme.get_value('next_indicator', 'animation', 'Up and down') + var nix = 0 + for a in animations: + n['next_animation'].add_item(a) + if a == next_animation_selected: + n['next_animation'].select(nix) + nix += 1 # Preview text 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): n['theme_next_image'].text = DialogicResources.get_filename_from_path(path) +func _on_NextAnimation_item_selected(index): + DialogicResources.set_theme_value(current_theme, 'next_indicator', 'animation', n['next_animation'].get_item_text(index)) + + func _on_ColorPickerButton_color_changed(color): DialogicResources.set_theme_value(current_theme, 'text','color', '#' + color.to_html()) @@ -203,7 +222,6 @@ func _on_PreviewButton_pressed(): var preview_dialog = dialogic_node.instance() preview_dialog.preview = true preview_dialog.get_node('DefinitionInfo').in_theme_editor = true - preview_dialog.get_node('TextBubble/NextIndicator/AnimationPlayer').play('IDLE') # Random character preview if there are any var characters = DialogicUtil.get_character_list() diff --git a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn index 924d0b0..7c16786 100644 --- a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn +++ b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://addons/dialogic/Images/plugin-editor-icon.svg" type="Texture" id=1] +[ext_resource path="res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd" type="Script" id=2] [ext_resource path="res://addons/dialogic/Editor/ThemeEditor/SectionTitle.tscn" type="PackedScene" id=3] @@ -444,20 +444,20 @@ __meta__ = { [node name="GridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer2/DialogBox"] margin_top = 34.0 margin_right = 315.0 -margin_bottom = 218.0 +margin_bottom = 242.0 size_flags_horizontal = 3 custom_constants/hseparation = 10 columns = 2 [node name="Label5" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] margin_top = 5.0 -margin_right = 132.0 +margin_right = 126.0 margin_bottom = 19.0 text = "Background Color" [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 -margin_right = 294.0 +margin_left = 136.0 +margin_right = 288.0 margin_bottom = 24.0 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2"] @@ -472,14 +472,14 @@ size_flags_horizontal = 3 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] margin_top = 33.0 -margin_right = 132.0 +margin_right = 126.0 margin_bottom = 47.0 text = "Background Texture" [node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 +margin_left = 136.0 margin_top = 28.0 -margin_right = 294.0 +margin_right = 288.0 margin_bottom = 52.0 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3"] @@ -496,28 +496,43 @@ text = "background-2" [node name="Label2" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] margin_top = 59.0 -margin_right = 132.0 +margin_right = 126.0 margin_bottom = 73.0 -text = "Next dialog indicator" +text = "Next indicator" [node name="NextIndicatorButton" type="Button" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 +margin_left = 136.0 margin_top = 56.0 -margin_right = 294.0 +margin_right = 288.0 margin_bottom = 76.0 text = "next-indicator" +[node name="Label4" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] +margin_top = 83.0 +margin_right = 126.0 +margin_bottom = 97.0 +text = "Next animation" + +[node name="NextAnimation" type="OptionButton" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] +margin_left = 136.0 +margin_top = 80.0 +margin_right = 288.0 +margin_bottom = 100.0 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="Label6" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_top = 85.0 -margin_right = 132.0 -margin_bottom = 99.0 +margin_top = 109.0 +margin_right = 126.0 +margin_bottom = 123.0 text = "Box padding" [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 -margin_top = 80.0 -margin_right = 294.0 -margin_bottom = 104.0 +margin_left = 136.0 +margin_top = 104.0 +margin_right = 288.0 +margin_bottom = 128.0 [node name="TextOffsetV" type="SpinBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer"] margin_right = 74.0 @@ -535,16 +550,16 @@ rounded = true allow_lesser = true [node name="Label7" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_top = 113.0 -margin_right = 132.0 -margin_bottom = 127.0 +margin_top = 137.0 +margin_right = 126.0 +margin_bottom = 151.0 text = "Box Size (pixels)" [node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 -margin_top = 108.0 -margin_right = 294.0 -margin_bottom = 132.0 +margin_left = 136.0 +margin_top = 132.0 +margin_right = 288.0 +margin_bottom = 156.0 [node name="BoxSizeW" type="SpinBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer4"] margin_right = 74.0 @@ -565,16 +580,16 @@ allow_greater = true allow_lesser = true [node name="Label8" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_top = 141.0 -margin_right = 132.0 -margin_bottom = 155.0 +margin_top = 165.0 +margin_right = 126.0 +margin_bottom = 179.0 text = "Bottom gap" [node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 -margin_top = 136.0 -margin_right = 294.0 -margin_bottom = 160.0 +margin_left = 136.0 +margin_top = 160.0 +margin_right = 288.0 +margin_bottom = 184.0 [node name="BottomGap" type="SpinBox" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer5"] margin_right = 74.0 @@ -586,17 +601,17 @@ allow_greater = true allow_lesser = true [node name="Label3" type="Label" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_top = 164.0 -margin_right = 132.0 -margin_bottom = 184.0 +margin_top = 188.0 +margin_right = 126.0 +margin_bottom = 208.0 size_flags_vertical = 5 text = "Action key" [node name="BoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer"] -margin_left = 142.0 -margin_top = 164.0 -margin_right = 294.0 -margin_bottom = 184.0 +margin_left = 136.0 +margin_top = 188.0 +margin_right = 288.0 +margin_bottom = 208.0 [node name="ActionOptionButton" type="OptionButton" parent="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/BoxContainer"] margin_right = 152.0 @@ -821,6 +836,7 @@ size_flags_vertical = 3 [connection signal="toggled" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/CheckBox" to="." method="_on_BackgroundTexture_CheckBox_toggled"] [connection signal="pressed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3/BackgroundTextureButton" to="." method="_on_BackgroundTextureButton_pressed"] [connection signal="pressed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextIndicatorButton" to="." method="_on_NextIndicatorButton_pressed"] +[connection signal="item_selected" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/NextAnimation" to="." method="_on_NextAnimation_item_selected"] [connection signal="value_changed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer/TextOffsetV" to="." method="_on_TextMargin_value_changed"] [connection signal="value_changed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer/TextOffsetH" to="." method="_on_TextMargin_value_changed"] [connection signal="value_changed" from="VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer4/BoxSizeW" to="." method="_on_BoxSize_value_changed"] diff --git a/addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd b/addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd index 16bb4f3..c1bcb54 100644 --- a/addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd +++ b/addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd @@ -12,9 +12,13 @@ onready var events_warning = $ScrollContainer/EventContainer/EventsWarning var hovered_item = null var selected_style : StyleBoxFlat = load("res://addons/dialogic/Editor/Pieces/selected_styleboxflat.tres") +var selected_style_text : StyleBoxFlat = load("res://addons/dialogic/Editor/Pieces/selected_styleboxflat_text_event.tres") var saved_style : StyleBoxFlat var selected_item : Node + +var moving_piece = null + func _ready(): # We connect all the event buttons to the event creation functions for b in $ScrollContainer/EventContainer.get_children(): @@ -25,6 +29,26 @@ func _ready(): b.connect('pressed', self, "_on_ButtonCondition_pressed", []) else: b.connect('pressed', self, "_create_event_button_pressed", [b.name]) + + var style = $TimelineArea.get('custom_styles/bg') + style.set('bg_color', get_color("dark_color_1", "Editor")) + + +func _process(delta): + if moving_piece != null: + var current_position = get_global_mouse_position() + var node_position = moving_piece.rect_global_position.y + var height = get_block_height(moving_piece) + var up_offset = get_block_height(get_block_above(moving_piece)) + var down_offset = get_block_height(get_block_below(moving_piece)) + if up_offset != null: + up_offset = (up_offset / 2) + 5 + if current_position.y < node_position - up_offset: + move_block(moving_piece, 'up') + if down_offset != null: + down_offset = height + (down_offset / 2) + 5 + if current_position.y > node_position + down_offset: + move_block(moving_piece, 'down') func _clear_selection(): @@ -36,21 +60,33 @@ func _clear_selection(): saved_style = null +func _is_item_selected(item: Node): + return item == selected_item + + func _select_item(item: Node): - if item != selected_item: + if item != null and not _is_item_selected(item): _clear_selection() var panel: PanelContainer = item.get_node("PanelContainer") if panel != null: saved_style = panel.get('custom_styles/panel') selected_item = item - panel.set('custom_styles/panel', selected_style) + if selected_item.event_data.has('text') and selected_item.event_data.has('character'): + panel.set('custom_styles/panel', selected_style_text) + else: + panel.set('custom_styles/panel', selected_style) else: _clear_selection() func _on_gui_input(event, item: Node): - if event is InputEventMouseButton and event.button_index == 1 and event.is_pressed(): - _select_item(item) + if event is InputEventMouseButton and event.button_index == 1: + if event.is_pressed(): + if not _is_item_selected(item): + _select_item(item) + moving_piece = item + else: + moving_piece = null # Event Creation signal for buttons @@ -216,6 +252,29 @@ func clear_timeline(): event.free() +func get_block_above(block): + var block_index = block.get_index() + var item = null + if block_index > 0: + item = timeline.get_child(block_index - 1) + return item + + +func get_block_below(block): + var block_index = block.get_index() + var item = null + if block_index < timeline.get_child_count() - 1: + item = timeline.get_child(block_index + 1) + return item + + +func get_block_height(block): + if block != null: + return block.get_node("PanelContainer").rect_size.y + else: + return null + + # ordering blocks in timeline func move_block(block, direction): var block_index = block.get_index() diff --git a/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn b/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn index fa569aa..b377d42 100644 --- a/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn +++ b/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn @@ -1,30 +1,31 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://addons/dialogic/Images/character-join.svg" type="Texture" id=1] [ext_resource path="res://addons/dialogic/Images/dialog.svg" type="Texture" id=2] -[ext_resource path="res://addons/dialogic/Images/audio-event.svg" type="Texture" id=3] -[ext_resource path="res://addons/dialogic/Images/scene.svg" type="Texture" id=4] +[ext_resource path="res://addons/dialogic/Images/Events/audio-event.svg" type="Texture" id=3] +[ext_resource path="res://addons/dialogic/Images/Events/scene.svg" type="Texture" id=4] [ext_resource path="res://addons/dialogic/Images/condition.svg" type="Texture" id=5] [ext_resource path="res://addons/dialogic/Images/end-dialog.svg" type="Texture" id=6] [ext_resource path="res://addons/dialogic/Images/character-leave.svg" type="Texture" id=7] [ext_resource path="res://addons/dialogic/Images/question.svg" type="Texture" id=8] [ext_resource path="res://addons/dialogic/Images/end-choice.svg" type="Texture" id=9] -[ext_resource path="res://addons/dialogic/Images/change-timeline.svg" type="Texture" id=10] +[ext_resource path="res://addons/dialogic/Images/Events/change-timeline.svg" type="Texture" id=10] [ext_resource path="res://addons/dialogic/Images/Resources/definition.svg" type="Texture" id=11] [ext_resource path="res://addons/dialogic/Images/choice.svg" type="Texture" id=12] [ext_resource path="res://addons/dialogic/Images/tutorials/arrow-down.svg" type="Texture" id=13] -[ext_resource path="res://addons/dialogic/Images/Wait.svg" type="Texture" id=14] -[ext_resource path="res://addons/dialogic/Images/change-scene.svg" type="Texture" id=15] +[ext_resource path="res://addons/dialogic/Images/Events/Wait.svg" type="Texture" id=14] +[ext_resource path="res://addons/dialogic/Images/Events/change-scene.svg" type="Texture" id=15] [ext_resource path="res://addons/dialogic/Images/signal.svg" type="Texture" id=16] [ext_resource path="res://addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd" type="Script" id=17] [ext_resource path="res://addons/dialogic/Images/theme.svg" type="Texture" id=18] +[ext_resource path="res://addons/dialogic/Images/Events/background-music.svg" type="Texture" id=19] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.14902, 0.172549, 0.231373, 1 ) +bg_color = Color( 0, 0, 0, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 @@ -44,6 +45,7 @@ corner_radius_bottom_left = 5 [node name="TimelineEditor" type="HSplitContainer"] anchor_right = 1.0 anchor_bottom = 1.0 +margin_bottom = 138.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 @@ -55,7 +57,7 @@ __meta__ = { [node name="TimelineArea" type="ScrollContainer" parent="."] margin_right = 816.0 -margin_bottom = 600.0 +margin_bottom = 738.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_styles/bg = SubResource( 1 ) @@ -67,7 +69,7 @@ __meta__ = { margin_left = 5.0 margin_top = 5.0 margin_right = 811.0 -margin_bottom = 595.0 +margin_bottom = 733.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3 @@ -76,12 +78,12 @@ size_flags_vertical = 3 [node name="ScrollContainer" type="ScrollContainer" parent="."] margin_left = 824.0 margin_right = 1024.0 -margin_bottom = 600.0 +margin_bottom = 738.0 rect_min_size = Vector2( 200, 0 ) [node name="EventContainer" type="VBoxContainer" parent="ScrollContainer"] -margin_right = 188.0 -margin_bottom = 702.0 +margin_right = 200.0 +margin_bottom = 738.0 size_flags_horizontal = 3 size_flags_vertical = 3 __meta__ = { @@ -89,14 +91,14 @@ __meta__ = { } [node name="EventsWarning" type="PanelContainer" parent="ScrollContainer/EventContainer"] -margin_right = 188.0 -margin_bottom = 68.0 +margin_right = 200.0 +margin_bottom = 60.0 custom_styles/panel = SubResource( 2 ) [node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/EventContainer/EventsWarning"] margin_top = 10.0 -margin_right = 182.0 -margin_bottom = 58.0 +margin_right = 194.0 +margin_bottom = 50.0 size_flags_horizontal = 3 size_flags_vertical = 3 __meta__ = { @@ -105,15 +107,15 @@ __meta__ = { [node name="TextureRect" type="TextureRect" parent="ScrollContainer/EventContainer/EventsWarning/HBoxContainer"] margin_right = 40.0 -margin_bottom = 48.0 +margin_bottom = 40.0 rect_min_size = Vector2( 40, 40 ) texture = ExtResource( 13 ) stretch_mode = 4 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/EventsWarning/HBoxContainer"] margin_left = 44.0 -margin_right = 182.0 -margin_bottom = 48.0 +margin_right = 194.0 +margin_bottom = 40.0 rect_min_size = Vector2( 100, 0 ) size_flags_horizontal = 3 size_flags_vertical = 1 @@ -122,9 +124,9 @@ text = "Add an event to start building your timeline" autowrap = true [node name="HBoxContainer6" type="HBoxContainer" parent="ScrollContainer/EventContainer"] -margin_top = 72.0 -margin_right = 188.0 -margin_bottom = 86.0 +margin_top = 64.0 +margin_right = 200.0 +margin_bottom = 78.0 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer6"] margin_right = 77.0 @@ -133,38 +135,38 @@ text = "Main Events" [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer6"] margin_left = 81.0 -margin_right = 188.0 +margin_right = 200.0 margin_bottom = 14.0 size_flags_horizontal = 3 [node name="TextBlock" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 90.0 -margin_right = 188.0 -margin_bottom = 118.0 +margin_top = 82.0 +margin_right = 200.0 +margin_bottom = 110.0 text = " Text Event" icon = ExtResource( 2 ) align = 0 [node name="CharacterJoinBlock" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 122.0 -margin_right = 188.0 -margin_bottom = 150.0 +margin_top = 114.0 +margin_right = 200.0 +margin_bottom = 142.0 text = " Character Join" icon = ExtResource( 1 ) align = 0 [node name="CharacterLeaveBlock" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 154.0 -margin_right = 188.0 -margin_bottom = 182.0 +margin_top = 146.0 +margin_right = 200.0 +margin_bottom = 174.0 text = " Character Leave" icon = ExtResource( 7 ) align = 0 [node name="HBoxContainer5" type="HBoxContainer" parent="ScrollContainer/EventContainer"] -margin_top = 186.0 -margin_right = 188.0 -margin_bottom = 200.0 +margin_top = 178.0 +margin_right = 200.0 +margin_bottom = 192.0 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer5"] margin_right = 33.0 @@ -173,54 +175,54 @@ text = "Logic" [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer5"] margin_left = 37.0 -margin_right = 188.0 +margin_right = 200.0 margin_bottom = 14.0 size_flags_horizontal = 3 [node name="ButtonQuestion" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 204.0 -margin_right = 188.0 -margin_bottom = 232.0 +margin_top = 196.0 +margin_right = 200.0 +margin_bottom = 224.0 text = " Question" icon = ExtResource( 8 ) align = 0 [node name="Choice" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 236.0 -margin_right = 188.0 -margin_bottom = 264.0 +margin_top = 228.0 +margin_right = 200.0 +margin_bottom = 256.0 text = " Choice" icon = ExtResource( 12 ) align = 0 [node name="IfCondition" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 268.0 -margin_right = 188.0 -margin_bottom = 296.0 +margin_top = 260.0 +margin_right = 200.0 +margin_bottom = 288.0 text = " Condition" icon = ExtResource( 5 ) align = 0 [node name="EndBranch" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 300.0 -margin_right = 188.0 -margin_bottom = 328.0 +margin_top = 292.0 +margin_right = 200.0 +margin_bottom = 320.0 text = " End Branch" icon = ExtResource( 9 ) align = 0 [node name="SetValue" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 332.0 -margin_right = 188.0 -margin_bottom = 360.0 +margin_top = 324.0 +margin_right = 200.0 +margin_bottom = 352.0 text = " Set Value" icon = ExtResource( 11 ) align = 0 [node name="HBoxContainer3" type="HBoxContainer" parent="ScrollContainer/EventContainer"] -margin_top = 364.0 -margin_right = 188.0 -margin_bottom = 378.0 +margin_top = 356.0 +margin_right = 200.0 +margin_bottom = 370.0 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer3"] margin_right = 56.0 @@ -229,55 +231,55 @@ text = "Timeline" [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer3"] margin_left = 60.0 -margin_right = 188.0 +margin_right = 200.0 margin_bottom = 14.0 size_flags_horizontal = 3 [node name="ChangeTimeline" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 382.0 -margin_right = 188.0 -margin_bottom = 410.0 +margin_top = 374.0 +margin_right = 200.0 +margin_bottom = 402.0 hint_tooltip = "This will instantly teleport you to the start of the desired timeline." text = " Change Timeline" icon = ExtResource( 10 ) align = 0 [node name="SceneEvent" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 414.0 -margin_right = 188.0 -margin_bottom = 442.0 +margin_top = 406.0 +margin_right = 200.0 +margin_bottom = 434.0 text = " Scene Event" icon = ExtResource( 4 ) align = 0 [node name="CloseDialog" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 446.0 -margin_right = 188.0 -margin_bottom = 474.0 +margin_top = 438.0 +margin_right = 200.0 +margin_bottom = 466.0 text = " Close Dialog" icon = ExtResource( 6 ) align = 0 [node name="WaitSeconds" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 478.0 -margin_right = 188.0 -margin_bottom = 506.0 +margin_top = 470.0 +margin_right = 200.0 +margin_bottom = 498.0 text = " Wait Seconds" icon = ExtResource( 14 ) align = 0 [node name="SetTheme" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 510.0 -margin_right = 188.0 -margin_bottom = 538.0 +margin_top = 502.0 +margin_right = 200.0 +margin_bottom = 530.0 text = " Set Theme" icon = ExtResource( 18 ) align = 0 [node name="HBoxContainer4" type="HBoxContainer" parent="ScrollContainer/EventContainer"] -margin_top = 542.0 -margin_right = 188.0 -margin_bottom = 556.0 +margin_top = 534.0 +margin_right = 200.0 +margin_bottom = 548.0 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer4"] margin_right = 37.0 @@ -286,30 +288,30 @@ text = "Audio" [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer4"] margin_left = 41.0 -margin_right = 188.0 +margin_right = 200.0 margin_bottom = 14.0 size_flags_horizontal = 3 [node name="AudioBlock" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 560.0 -margin_right = 188.0 -margin_bottom = 588.0 +margin_top = 552.0 +margin_right = 200.0 +margin_bottom = 580.0 text = " Audio Event" icon = ExtResource( 3 ) align = 0 [node name="BackgroundMusic" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 592.0 -margin_right = 188.0 -margin_bottom = 620.0 +margin_top = 584.0 +margin_right = 200.0 +margin_bottom = 612.0 text = " Background Music" -icon = ExtResource( 3 ) +icon = ExtResource( 19 ) align = 0 [node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/EventContainer"] -margin_top = 624.0 -margin_right = 188.0 -margin_bottom = 638.0 +margin_top = 616.0 +margin_right = 200.0 +margin_bottom = 630.0 [node name="Label" type="Label" parent="ScrollContainer/EventContainer/HBoxContainer"] margin_right = 39.0 @@ -318,22 +320,22 @@ text = "Godot" [node name="HSeparator2" type="HSeparator" parent="ScrollContainer/EventContainer/HBoxContainer"] margin_left = 43.0 -margin_right = 188.0 +margin_right = 200.0 margin_bottom = 14.0 size_flags_horizontal = 3 [node name="EmitSignal" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 642.0 -margin_right = 188.0 -margin_bottom = 670.0 +margin_top = 634.0 +margin_right = 200.0 +margin_bottom = 662.0 text = " Emit Signal" icon = ExtResource( 16 ) align = 0 [node name="ChangeScene" type="Button" parent="ScrollContainer/EventContainer"] -margin_top = 674.0 -margin_right = 188.0 -margin_bottom = 702.0 +margin_top = 666.0 +margin_right = 200.0 +margin_bottom = 694.0 hint_tooltip = "This will instantly change the current scene." text = " Change Scene" diff --git a/addons/dialogic/Images/Wait.svg b/addons/dialogic/Images/Events/Wait.svg similarity index 100% rename from addons/dialogic/Images/Wait.svg rename to addons/dialogic/Images/Events/Wait.svg diff --git a/addons/dialogic/Images/Wait.svg.import b/addons/dialogic/Images/Events/Wait.svg.import similarity index 70% rename from addons/dialogic/Images/Wait.svg.import rename to addons/dialogic/Images/Events/Wait.svg.import index 602a45c..d4026f2 100644 --- a/addons/dialogic/Images/Wait.svg.import +++ b/addons/dialogic/Images/Events/Wait.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Wait.svg-3067f9c4ae9af9327c6bfe7ece5d6521.stex" +path="res://.import/Wait.svg-967925959cce4f8e3ee840598b69a612.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/dialogic/Images/Wait.svg" -dest_files=[ "res://.import/Wait.svg-3067f9c4ae9af9327c6bfe7ece5d6521.stex" ] +source_file="res://addons/dialogic/Images/Events/Wait.svg" +dest_files=[ "res://.import/Wait.svg-967925959cce4f8e3ee840598b69a612.stex" ] [params] diff --git a/addons/dialogic/Images/Events/audio-event.svg b/addons/dialogic/Images/Events/audio-event.svg new file mode 100644 index 0000000..76689e0 --- /dev/null +++ b/addons/dialogic/Images/Events/audio-event.svg @@ -0,0 +1,4 @@ + + + + diff --git a/addons/dialogic/Images/audio-event.svg.import b/addons/dialogic/Images/Events/audio-event.svg.import similarity index 67% rename from addons/dialogic/Images/audio-event.svg.import rename to addons/dialogic/Images/Events/audio-event.svg.import index 7ce6130..fd4f264 100644 --- a/addons/dialogic/Images/audio-event.svg.import +++ b/addons/dialogic/Images/Events/audio-event.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/audio-event.svg-f466bed1a2d6642d6551ef16a9c08581.stex" +path="res://.import/audio-event.svg-bd534461a0eafdc8864d2de10c52b1e3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/dialogic/Images/audio-event.svg" -dest_files=[ "res://.import/audio-event.svg-f466bed1a2d6642d6551ef16a9c08581.stex" ] +source_file="res://addons/dialogic/Images/Events/audio-event.svg" +dest_files=[ "res://.import/audio-event.svg-bd534461a0eafdc8864d2de10c52b1e3.stex" ] [params] diff --git a/addons/dialogic/Images/Events/background-music.svg b/addons/dialogic/Images/Events/background-music.svg new file mode 100644 index 0000000..56219e4 --- /dev/null +++ b/addons/dialogic/Images/Events/background-music.svg @@ -0,0 +1,4 @@ + + + + diff --git a/addons/dialogic/Images/Events/background-music.svg.import b/addons/dialogic/Images/Events/background-music.svg.import new file mode 100644 index 0000000..525fedc --- /dev/null +++ b/addons/dialogic/Images/Events/background-music.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/background-music.svg-ce4f516e1adc748da06ba03cfc5f5aea.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/dialogic/Images/Events/background-music.svg" +dest_files=[ "res://.import/background-music.svg-ce4f516e1adc748da06ba03cfc5f5aea.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/addons/dialogic/Images/Events/change-scene.svg b/addons/dialogic/Images/Events/change-scene.svg new file mode 100644 index 0000000..3d42574 --- /dev/null +++ b/addons/dialogic/Images/Events/change-scene.svg @@ -0,0 +1,4 @@ + + + + diff --git a/addons/dialogic/Images/change-scene.svg.import b/addons/dialogic/Images/Events/change-scene.svg.import similarity index 67% rename from addons/dialogic/Images/change-scene.svg.import rename to addons/dialogic/Images/Events/change-scene.svg.import index 7d59b6c..8dbd836 100644 --- a/addons/dialogic/Images/change-scene.svg.import +++ b/addons/dialogic/Images/Events/change-scene.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/change-scene.svg-6741e154480a026a1704d39dc9993684.stex" +path="res://.import/change-scene.svg-4ec53c6e2be3e1a24d1aeb9767277503.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/dialogic/Images/change-scene.svg" -dest_files=[ "res://.import/change-scene.svg-6741e154480a026a1704d39dc9993684.stex" ] +source_file="res://addons/dialogic/Images/Events/change-scene.svg" +dest_files=[ "res://.import/change-scene.svg-4ec53c6e2be3e1a24d1aeb9767277503.stex" ] [params] diff --git a/addons/dialogic/Images/Events/change-timeline.svg b/addons/dialogic/Images/Events/change-timeline.svg new file mode 100644 index 0000000..5efb8d7 --- /dev/null +++ b/addons/dialogic/Images/Events/change-timeline.svg @@ -0,0 +1,4 @@ + + + + diff --git a/addons/dialogic/Images/change-timeline.svg.import b/addons/dialogic/Images/Events/change-timeline.svg.import similarity index 66% rename from addons/dialogic/Images/change-timeline.svg.import rename to addons/dialogic/Images/Events/change-timeline.svg.import index 7be7caa..7f08e40 100644 --- a/addons/dialogic/Images/change-timeline.svg.import +++ b/addons/dialogic/Images/Events/change-timeline.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/change-timeline.svg-783cf6946622396a13124d15e21599a3.stex" +path="res://.import/change-timeline.svg-6aceaf7d093889feea334bbe4350d8be.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/dialogic/Images/change-timeline.svg" -dest_files=[ "res://.import/change-timeline.svg-783cf6946622396a13124d15e21599a3.stex" ] +source_file="res://addons/dialogic/Images/Events/change-timeline.svg" +dest_files=[ "res://.import/change-timeline.svg-6aceaf7d093889feea334bbe4350d8be.stex" ] [params] diff --git a/addons/dialogic/Images/Events/scene.svg b/addons/dialogic/Images/Events/scene.svg new file mode 100644 index 0000000..c6f180e --- /dev/null +++ b/addons/dialogic/Images/Events/scene.svg @@ -0,0 +1,4 @@ + + + + diff --git a/addons/dialogic/Images/scene.svg.import b/addons/dialogic/Images/Events/scene.svg.import similarity index 69% rename from addons/dialogic/Images/scene.svg.import rename to addons/dialogic/Images/Events/scene.svg.import index d279702..1713390 100644 --- a/addons/dialogic/Images/scene.svg.import +++ b/addons/dialogic/Images/Events/scene.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/scene.svg-7e486b606631b7f10f94075876ec8fce.stex" +path="res://.import/scene.svg-ca26fe974139b6679b31bddcfc26e995.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/dialogic/Images/scene.svg" -dest_files=[ "res://.import/scene.svg-7e486b606631b7f10f94075876ec8fce.stex" ] +source_file="res://addons/dialogic/Images/Events/scene.svg" +dest_files=[ "res://.import/scene.svg-ca26fe974139b6679b31bddcfc26e995.stex" ] [params] diff --git a/addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg b/addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg new file mode 100644 index 0000000..032b806 --- /dev/null +++ b/addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg.import b/addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg.import new file mode 100644 index 0000000..fea879b --- /dev/null +++ b/addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/plugin-editor-icon-dark-theme.svg-4945c419e7e7434b4eff87c00fedb862.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg" +dest_files=[ "res://.import/plugin-editor-icon-dark-theme.svg-4945c419e7e7434b4eff87c00fedb862.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg b/addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg new file mode 100644 index 0000000..3cd57a6 --- /dev/null +++ b/addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg.import b/addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg.import new file mode 100644 index 0000000..82fe988 --- /dev/null +++ b/addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/plugin-editor-icon-light-theme.svg-fbd42cd06e4ce1cb7eef3585a7eb830a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg" +dest_files=[ "res://.import/plugin-editor-icon-light-theme.svg-fbd42cd06e4ce1cb7eef3585a7eb830a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/addons/dialogic/Images/audio-event.svg b/addons/dialogic/Images/audio-event.svg deleted file mode 100644 index 2281437..0000000 --- a/addons/dialogic/Images/audio-event.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/addons/dialogic/Images/change-scene.svg b/addons/dialogic/Images/change-scene.svg deleted file mode 100644 index 50aab26..0000000 --- a/addons/dialogic/Images/change-scene.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/addons/dialogic/Images/change-timeline.svg b/addons/dialogic/Images/change-timeline.svg deleted file mode 100644 index 4391bf1..0000000 --- a/addons/dialogic/Images/change-timeline.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/addons/dialogic/Images/plugin-editor-icon.svg b/addons/dialogic/Images/plugin-editor-icon.svg deleted file mode 100644 index 9ad16ec..0000000 --- a/addons/dialogic/Images/plugin-editor-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/addons/dialogic/Images/plugin-editor-icon.svg.import b/addons/dialogic/Images/plugin-editor-icon.svg.import deleted file mode 100644 index 042b5a3..0000000 --- a/addons/dialogic/Images/plugin-editor-icon.svg.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/plugin-editor-icon.svg-b27733904a7899b70bf2e32c6ffbb24b.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://addons/dialogic/Images/plugin-editor-icon.svg" -dest_files=[ "res://.import/plugin-editor-icon.svg-b27733904a7899b70bf2e32c6ffbb24b.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/addons/dialogic/Images/scene.svg b/addons/dialogic/Images/scene.svg deleted file mode 100644 index 3e903cd..0000000 --- a/addons/dialogic/Images/scene.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/addons/dialogic/Nodes/BackgroundMusic.gd b/addons/dialogic/Nodes/BackgroundMusic.gd index f80ea9e..d8a6417 100644 --- a/addons/dialogic/Nodes/BackgroundMusic.gd +++ b/addons/dialogic/Nodes/BackgroundMusic.gd @@ -5,20 +5,25 @@ onready var _anim_player := $AnimationPlayer onready var _track1 := $Track1 onready var _track2 := $Track2 +var current_path = "" -func crossfade_to(audio_stream: AudioStream) -> void: - if _track1.playing and _track2.playing: - return - - if _track2.playing: - _track1.stream = audio_stream - _track1.play() - _anim_player.play("FadeToTrack1") - else: - _track2.stream = audio_stream - _track2.play() - _anim_player.play("FadeToTrack2") +func crossfade_to(path: String) -> void: + if current_path != path: + current_path = path + var stream: AudioStream = load(current_path) + if _track1.playing and _track2.playing: + return + + if _track2.playing: + _track1.stream = stream + _track1.play() + _anim_player.play("FadeToTrack1") + else: + _track2.stream = stream + _track2.play() + _anim_player.play("FadeToTrack2") func fade_out() -> void: + current_path = "" _anim_player.play("FadeOut") diff --git a/addons/dialogic/Nodes/BackgroundMusic.tscn b/addons/dialogic/Nodes/BackgroundMusic.tscn index 7d3da6e..68129e6 100644 --- a/addons/dialogic/Nodes/BackgroundMusic.tscn +++ b/addons/dialogic/Nodes/BackgroundMusic.tscn @@ -2,9 +2,9 @@ [ext_resource path="res://addons/dialogic/Nodes/BackgroundMusic.gd" type="Script" id=1] - -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id=1] resource_name = "FadeOut" +length = 0.5 tracks/0/type = "value" tracks/0/path = NodePath("Track1:volume_db") tracks/0/interp = 1 @@ -54,8 +54,7 @@ tracks/3/keys = { "values": [ false ] } -[sub_resource type="Animation" id=1] -resource_name = "FadeToTrack1" +[sub_resource type="Animation" id=2] length = 0.5 tracks/0/type = "value" tracks/0/path = NodePath("Track1:volume_db") @@ -94,8 +93,7 @@ tracks/2/keys = { "values": [ false ] } -[sub_resource type="Animation" id=2] -resource_name = "FadeToTrack2" +[sub_resource type="Animation" id=3] length = 0.5 tracks/0/type = "value" tracks/0/path = NodePath("Track1:volume_db") @@ -145,8 +143,9 @@ __meta__ = { [node name="Track1" type="AudioStreamPlayer" parent="."] [node name="Track2" type="AudioStreamPlayer" parent="."] +volume_db = -80.0 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -anims/FadeOut = SubResource( 3 ) -anims/FadeToTrack1 = SubResource( 1 ) -anims/FadeToTrack2 = SubResource( 2 ) +anims/FadeOut = SubResource( 1 ) +anims/FadeToTrack1 = SubResource( 2 ) +anims/FadeToTrack2 = SubResource( 3 ) diff --git a/addons/dialogic/Nodes/dialog_node.gd b/addons/dialogic/Nodes/dialog_node.gd index 2332883..64ae24d 100644 --- a/addons/dialogic/Nodes/dialog_node.gd +++ b/addons/dialogic/Nodes/dialog_node.gd @@ -68,8 +68,8 @@ func _ready(): func load_config_files(): if not Engine.is_editor_hint(): - # Make sure saves are ready - DialogicSingleton.init(reset_saves) + if reset_saves: + DialogicSingleton.init(reset_saves) definitions = DialogicSingleton.get_definitions() else: definitions = DialogicResources.get_default_definitions() @@ -468,8 +468,7 @@ func event_handler(event: Dictionary): {'background-music'}, {'background-music', 'file'}: emit_signal("event_start", "background-music", event) if event['background-music'] == 'play' and 'file' in event.keys() and not event['file'].empty(): - var stream: AudioStream = load(event['file']) - $FX/BackgroundMusic.crossfade_to(stream) + $FX/BackgroundMusic.crossfade_to(event['file']) else: $FX/BackgroundMusic.fade_out() go_to_next_event() @@ -738,6 +737,13 @@ func load_theme(filename): $TextBubble/NameLabel.set('custom_constants/shadow_offset_y', name_shadow_offset.y) $TextBubble/NameLabel.rect_position.y = theme.get_value('name', 'bottom_gap', 48) * -1 + + # Setting next indicator animation + $TextBubble/NextIndicator.self_modulate = Color('#ffffff') + $TextBubble/NextIndicator/AnimationPlayer.play( + theme.get_value('next_indicator', 'animation', 'Up and down') + ) + return theme diff --git a/addons/dialogic/Other/DialogicResources.gd b/addons/dialogic/Other/DialogicResources.gd index 94a108a..b69be38 100644 --- a/addons/dialogic/Other/DialogicResources.gd +++ b/addons/dialogic/Other/DialogicResources.gd @@ -73,7 +73,7 @@ static func init_saves(overwrite: bool=true): init_state_saves(overwrite) init_definitions_saves(overwrite) else: - print('Error creating working directory: ' + str(err)) + print('[Dialogic] Error creating working directory: ' + str(err)) static func init_working_dir(): @@ -91,7 +91,7 @@ static func init_state_saves(overwrite: bool=true): file.store_string('') file.close() else: - print('Error opening saved state file: ' + str(err)) + print('[Dialogic] Error opening saved state file: ' + str(err)) static func init_definitions_saves(overwrite: bool=true): @@ -102,12 +102,12 @@ static func init_definitions_saves(overwrite: bool=true): var err if not directory.file_exists(paths["SAVED_DEFINITIONS_FILE"]): err = sink.open(paths["SAVED_DEFINITIONS_FILE"], File.WRITE) - print('Saved definitions not present, creating file: ' + str(err)) + print('[Dialogic] Saved definitions not present, creating file: ' + str(err)) if err == OK: sink.store_string('') sink.close() else: - print('Error opening saved definitions file: ' + str(err)) + print('[Dialogic] Error opening saved definitions file: ' + str(err)) err = sink.open(paths["SAVED_DEFINITIONS_FILE"], File.READ_WRITE) if err == OK: @@ -116,11 +116,11 @@ static func init_definitions_saves(overwrite: bool=true): if err == OK: sink.store_string(source.get_as_text()) else: - print('Error opening default definitions file: ' + str(err)) + print('[Dialogic] Error opening default definitions file: ' + str(err)) else: - print('Did not overwrite previous saved definitions') + print('[Dialogic] Did not overwrite previous saved definitions') else: - print('Error opening saved definitions file: ' + str(err)) + print('[Dialogic] Error opening saved definitions file: ' + str(err)) source.close() sink.close() @@ -155,7 +155,7 @@ static func listdir(path: String) -> Array: file_name = dir.get_next() dir.list_dir_end() else: - print("Error while accessing path " + path + " - Error: " + str(err)) + print("[Dialogic] Error while accessing path " + path + " - Error: " + str(err)) return files @@ -175,7 +175,7 @@ static func get_config(id: String) -> ConfigFile: if id in paths.keys(): var err = config.load(paths[id]) if err != OK: - print("Error while opening config file " + paths[id] + ". Error: " + str(err)) + print("[Dialogic] Error while opening config file " + paths[id] + ". Error: " + str(err)) return config diff --git a/addons/dialogic/Other/DialogicSingleton.gd b/addons/dialogic/Other/DialogicSingleton.gd index b72e955..346d194 100644 --- a/addons/dialogic/Other/DialogicSingleton.gd +++ b/addons/dialogic/Other/DialogicSingleton.gd @@ -6,6 +6,7 @@ var default_definitions := {} var current_timeline := '' func _init() -> void: + # Load saves on script init init(false) diff --git a/addons/dialogic/dialogic.gd b/addons/dialogic/dialogic.gd index 18a551f..93d7a50 100644 --- a/addons/dialogic/dialogic.gd +++ b/addons/dialogic/dialogic.gd @@ -45,7 +45,10 @@ func make_visible(visible): func get_plugin_icon(): - return preload("res://addons/dialogic/Images/plugin-editor-icon.svg") + # https://github.com/godotengine/godot-proposals/issues/572 + if get_editor_interface().get_editor_settings().get_setting("interface/theme/base_color").v > 0.5: + return preload("res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg") + return preload("res://addons/dialogic/Images/Plugin/plugin-editor-icon-dark-theme.svg") func _add_custom_editor_view(): diff --git a/dialogic/themes/theme-1616657657.cfg b/dialogic/themes/theme-1616657657.cfg index 0c611ed..7e3eb94 100644 --- a/dialogic/themes/theme-1616657657.cfg +++ b/dialogic/themes/theme-1616657657.cfg @@ -24,3 +24,5 @@ color="#ffffffff" [name] image_visible=true +auto_color=true +shadow_visible=true