diff --git a/addons/dialogic/Editor/CharacterEditor/character_editor.tscn b/addons/dialogic/Editor/CharacterEditor/character_editor.tscn index 15c0493c6..64154cc5d 100644 --- a/addons/dialogic/Editor/CharacterEditor/character_editor.tscn +++ b/addons/dialogic/Editor/CharacterEditor/character_editor.tscn @@ -1,11 +1,23 @@ -[gd_scene load_steps=9 format=3 uid="uid://dlskc36c5hrwv"] +[gd_scene load_steps=11 format=3 uid="uid://dlskc36c5hrwv"] [ext_resource type="Script" path="res://addons/dialogic/Editor/CharacterEditor/character_editor.gd" id="2"] [ext_resource type="PackedScene" uid="uid://dbpkta2tjsqim" path="res://addons/dialogic/Editor/Common/hint_tooltip_icon.tscn" id="2_uhhqs"] [ext_resource type="Script" path="res://addons/dialogic/Editor/CharacterEditor/character_editor_portrait_tree.gd" id="2_vad0i"] [ext_resource type="Texture2D" uid="uid://babwe22dqjta" path="res://addons/dialogic/Editor/Images/Pieces/add-folder.svg" id="3_v1qnr"] -[sub_resource type="Image" id="Image_hdno4"] +[sub_resource type="Image" id="Image_3cd31"] +data = { +"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), +"format": "RGBA8", +"height": 16, +"mipmaps": false, +"width": 16 +} + +[sub_resource type="ImageTexture" id="ImageTexture_wvrw5"] +image = SubResource("Image_3cd31") + +[sub_resource type="Image" id="Image_jach8"] data = { "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), "format": "RGBA8", @@ -15,7 +27,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_u1a6g"] -image = SubResource("Image_hdno4") +image = SubResource("Image_jach8") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_es2rd"] @@ -57,8 +69,9 @@ text = "My Character" [node name="NameTooltip" parent="VBoxContainer/TopSection/NameContainer" instance=ExtResource("2_uhhqs")] layout_mode = 2 tooltip_text = "This name is determined from the file name. Use this name in timelines to reference this character." -texture = SubResource("ImageTexture_u1a6g") -hint_text = "This name is determined from the file name. Use this name in timelines to reference this character." +texture = SubResource("ImageTexture_wvrw5") +hint_text = "This unique identifier is based on the file name. You can change it in the Reference Manager. +Use this name in timelines to reference this character." [node name="MainSettingsCollapse" type="Button" parent="VBoxContainer/TopSection"] unique_name_in_owner = true @@ -183,13 +196,13 @@ script = ExtResource("2_vad0i") size = Vector2i(118, 100) item_count = 3 item_0/text = "Rename" -item_0/icon = SubResource("ImageTexture_u1a6g") +item_0/icon = SubResource("ImageTexture_wvrw5") item_0/id = 2 item_1/text = "Duplicate" -item_1/icon = SubResource("ImageTexture_u1a6g") +item_1/icon = SubResource("ImageTexture_wvrw5") item_1/id = 0 item_2/text = "Delete" -item_2/icon = SubResource("ImageTexture_u1a6g") +item_2/icon = SubResource("ImageTexture_wvrw5") item_2/id = 1 [node name="PortraitChangeInfo" type="HBoxContainer" parent="VBoxContainer/MainHSplit/Split/HBoxContainer/MarginContainer/PortraitListSection/Portraits"] diff --git a/addons/dialogic/Editor/Common/sidebar.gd b/addons/dialogic/Editor/Common/sidebar.gd index 6dacf0ad9..74fb1318e 100644 --- a/addons/dialogic/Editor/Common/sidebar.gd +++ b/addons/dialogic/Editor/Common/sidebar.gd @@ -157,8 +157,11 @@ func update_content_list(list:PackedStringArray) -> void: var label_directory := DialogicResourceUtil.get_label_cache() if current_resource != null: for i in timeline_directory: - if timeline_directory[i] == current_resource.resource_path: + if timeline_directory[i] == current_resource.resource_path: label_directory[i] = list + # also always store the current timelines labels for easy access + label_directory[""] = list + DialogicResourceUtil.set_label_cache(label_directory) diff --git a/addons/dialogic/Editor/Common/update_install_window.gd b/addons/dialogic/Editor/Common/update_install_window.gd index 6652e922a..b5f066dad 100644 --- a/addons/dialogic/Editor/Common/update_install_window.gd +++ b/addons/dialogic/Editor/Common/update_install_window.gd @@ -33,20 +33,37 @@ func load_info(info:Dictionary, update_type:int) -> void: %ShortInfo.text = "Huh, what happened here?" %ReadFull.hide() %Install.disabled = true + return + + # If we are up to date (or beyond): + if info.is_empty(): + info['name'] = "You are in the future, Marty!" + info["body"] = "# 😎 You are using the WIP branch!\nSeems like you are using a version that isn't even released yet. Be careful and give us your feedback ;)" + info["published_at"] = "????T" + info["author"] = {'login':"???"} + %State.text = "Where are we Doc?" + %UpdateName.add_theme_color_override("font_color", editor_view.get_theme_color("property_color_z", "Editor")) + %Install.disabled = true + + elif update_type == 0: + %State.text = "Update Available!" + %UpdateName.add_theme_color_override("font_color", editor_view.get_theme_color("warning_color", "Editor")) + %Install.disabled = false else: - %UpdateName.text = info.name - %Content.text = markdown_to_bbcode('#'+info.body.get_slice('#', 1)).strip_edges() - %ShortInfo.text = "Published on "+info.published_at.substr(0, info.published_at.find('T'))+" by "+info.author.login + %State.text = "You are up to date:" + %UpdateName.add_theme_color_override("font_color", editor_view.get_theme_color("success_color", "Editor")) + %Install.disabled = true + + %UpdateName.text = info.name + %Content.text = markdown_to_bbcode('#'+info.body.get_slice('#', 1)).strip_edges() + %ShortInfo.text = "Published on "+info.published_at.substr(0, info.published_at.find('T'))+" by "+info.author.login + if info.has("html_url"): %ReadFull.uri = info.html_url %ReadFull.show() - if update_type == 0: - %State.text = "Update Available!" - %UpdateName.add_theme_color_override("font_color", editor_view.get_theme_color("warning_color", "Editor")) - %Install.disabled = false - else: - %State.text = "You are up to date:" - %UpdateName.add_theme_color_override("font_color", editor_view.get_theme_color("success_color", "Editor")) - %Install.disabled = true + else: + %ReadFull.hide() + if info.has('reactions'): + %Reactions.show() var reactions := {"laugh":"😂", "hooray":"🎉", "confused":"😕", "heart":"❤️", "rocket":"🚀", "eyes":"👀"} for i in reactions: %Reactions.get_node(i.capitalize()).visible = info.reactions[i] > 0 @@ -56,7 +73,8 @@ func load_info(info:Dictionary, update_type:int) -> void: %Reactions.get_node("Likes").text = "👍 "+str(info.reactions['+1']+info.reactions['-1']) else: %Reactions.get_node("Likes").visible = false - + else: + %Reactions.hide() func _on_window_close_requested(): get_parent().visible = false @@ -93,7 +111,7 @@ func _on_resources_reimported(resources:Array) -> void: func markdown_to_bbcode(text:String) -> String: - var font_sizes := {1:16, 2:16, 3:16,4:14, 5:14} + var font_sizes := {1:20, 2:16, 3:16,4:14, 5:14} var title_regex := RegEx.create_from_string('(^|\n)((?#+)(?.*))\\n') var res := title_regex.search(text) while res: diff --git a/addons/dialogic/Editor/Common/update_manager.gd b/addons/dialogic/Editor/Common/update_manager.gd index faee9f49e..5ed80a866 100644 --- a/addons/dialogic/Editor/Common/update_manager.gd +++ b/addons/dialogic/Editor/Common/update_manager.gd @@ -55,7 +55,7 @@ func _on_UpdateCheck_request_completed(result:int, response_code:int, headers:Pa update_info = versions[0] update_check_completed.emit(UpdateCheckResult.UPDATE_AVAILABLE) else: - update_info = {} + update_info = current_info update_check_completed.emit(UpdateCheckResult.UP_TO_DATE) @@ -70,12 +70,15 @@ func compare_versions(release, current_release_info:Dictionary) -> bool: if checked_release_info.state < current_release_info.state: return false + elif checked_release_info.state == current_release_info.state: if checked_release_info.state_version < current_release_info.state_version: return false + if checked_release_info.state_version == current_release_info.state_version: current_info = release return false + if checked_release_info.state == ReleaseState.STABLE: if checked_release_info.minor == current_release_info.minor: current_info = release diff --git a/addons/dialogic/Editor/HomePage/home_page.gd b/addons/dialogic/Editor/HomePage/home_page.gd index a2044e5f4..c666c3282 100644 --- a/addons/dialogic/Editor/HomePage/home_page.gd +++ b/addons/dialogic/Editor/HomePage/home_page.gd @@ -14,7 +14,7 @@ func _get_icon() -> Texture: func _ready(): self_modulate = get_theme_color("font_color", "Editor") self_modulate.a = 0.2 - + var edit_scale := DialogicUtil.get_editor_scale() %HomePageBox.custom_minimum_size = Vector2(600, 350)*edit_scale %TopPanel.custom_minimum_size.y = 100*edit_scale @@ -22,7 +22,7 @@ func _ready(): var plugin_cfg := ConfigFile.new() plugin_cfg.load("res://addons/dialogic/plugin.cfg") %VersionLabel.text = plugin_cfg.get_value('plugin', 'version', 'unknown version') - + %BottomPanel.self_modulate = get_theme_color("dark_color_3", "Editor") %RandomTipLabel.add_theme_color_override("font_color", get_theme_color("property_color_z", "Editor")) @@ -32,7 +32,7 @@ func _ready(): func _register(): editors_manager.register_simple_editor(self) - + self.alternative_text = "Welcome to dialogic!" @@ -42,7 +42,7 @@ func _open(extra_info:Variant="") -> void: var file := FileAccess.open('res://addons/dialogic/Editor/HomePage/tips.txt', FileAccess.READ) tips = file.get_as_text().split('\n') tips = tips.filter(func(item): return !item.is_empty()) - + randomize() var tip :String = tips[randi()%len(tips)] var text := tip.get_slice(';',0).strip_edges() @@ -57,17 +57,17 @@ func show_tip(text:String='', action:String='') -> void: %TipBox.hide() %RandomTipLabel.hide() return - + %TipBox.show() %RandomTipLabel.show() %RandomTip.text = '[i]'+text - + if action.is_empty(): %RandomTipMoreButton.hide() return - + %RandomTipMoreButton.show() - + if %RandomTipMoreButton.pressed.is_connected(_on_tip_action): %RandomTipMoreButton.pressed.disconnect(_on_tip_action) %RandomTipMoreButton.pressed.connect(_on_tip_action.bind(action)) diff --git a/addons/dialogic/Editor/HomePage/home_page.tscn b/addons/dialogic/Editor/HomePage/home_page.tscn index 2aa4d831f..852a095aa 100644 --- a/addons/dialogic/Editor/HomePage/home_page.tscn +++ b/addons/dialogic/Editor/HomePage/home_page.tscn @@ -102,7 +102,7 @@ corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="Image" id="Image_ybad5"] +[sub_resource type="Image" id="Image_a37tn"] data = { "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), "format": "RGBA8", @@ -111,8 +111,8 @@ data = { "width": 16 } -[sub_resource type="ImageTexture" id="ImageTexture_sioln"] -image = SubResource("Image_ybad5") +[sub_resource type="ImageTexture" id="ImageTexture_u5ll8"] +image = SubResource("Image_a37tn") [node name="HomePage" type="TextureRect"] self_modulate = Color(0, 0, 0, 0.2) @@ -234,7 +234,7 @@ modulate = Color(1, 1, 1, 0.501961) layout_mode = 2 size_flags_vertical = 8 theme_override_font_sizes/font_size = 10 -text = "2.0-Alpha-10 (Godot 4.1.2)" +text = "2.0-Alpha-12 (Godot 4.1+)" horizontal_alignment = 2 [node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer/HomePageBox/BottomPanel"] @@ -268,7 +268,7 @@ layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Getting Started" underline = 2 -uri = "https://dialogic-docs.coppolaemilio.com/documentation/getting-started/" +uri = "https://dialogic-docs.coppolaemilio.com/getting-started.html" [node name="Separator" type="Control" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer"] custom_minimum_size = Vector2(0, 10) @@ -362,5 +362,5 @@ grow_vertical = 0 tooltip_text = "Check it out!" theme_override_styles/normal = SubResource("StyleBoxFlat_ckyhx") theme_override_styles/hover = SubResource("StyleBoxFlat_l1doy") -icon = SubResource("ImageTexture_sioln") +icon = SubResource("ImageTexture_u5ll8") expand_icon = true diff --git a/addons/dialogic/Editor/Images/Dropdown/default.svg.import b/addons/dialogic/Editor/Images/Dropdown/default.svg.import index 567d7673f..e8c82b0ad 100644 --- a/addons/dialogic/Editor/Images/Dropdown/default.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/default.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://bsx8dtqf3vych" path="res://.godot/imported/default.svg-3f34de5e45bef5de4d9c15ef78c00c6c.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/divide.svg.import b/addons/dialogic/Editor/Images/Dropdown/divide.svg.import index f461df5b8..9a64c5f5d 100644 --- a/addons/dialogic/Editor/Images/Dropdown/divide.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/divide.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://c5laykjsxaxtl" path="res://.godot/imported/divide.svg-4928f878a07ba93ebc44d8ae73ad4c1f.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/join.svg.import b/addons/dialogic/Editor/Images/Dropdown/join.svg.import index 6ab4c8dc6..834260765 100644 --- a/addons/dialogic/Editor/Images/Dropdown/join.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/join.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://b7j220k0ewh35" path="res://.godot/imported/join.svg-2f0d7b9e8e01cf0e62b8c3a85aff6213.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/leave.svg.import b/addons/dialogic/Editor/Images/Dropdown/leave.svg.import index 9e5d350e7..bd1bff503 100644 --- a/addons/dialogic/Editor/Images/Dropdown/leave.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/leave.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://cspjyvye6c0r6" path="res://.godot/imported/leave.svg-c936f6e3d601b8c12c23f205a765084e.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/minus.svg.import b/addons/dialogic/Editor/Images/Dropdown/minus.svg.import index 9194d7ef5..d44178a5d 100644 --- a/addons/dialogic/Editor/Images/Dropdown/minus.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/minus.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://dwy14qrkfoeb" path="res://.godot/imported/minus.svg-29f22d1aa24635bae2c03057c07be8bc.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/multiply.svg.import b/addons/dialogic/Editor/Images/Dropdown/multiply.svg.import index 52b0ffeaa..a23c37b6d 100644 --- a/addons/dialogic/Editor/Images/Dropdown/multiply.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/multiply.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://ddmapfkunbtg7" path="res://.godot/imported/multiply.svg-0e9db99aafb66d43ee14adcca26c5b47.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/plus.svg.import b/addons/dialogic/Editor/Images/Dropdown/plus.svg.import index 319dd4f01..e86414be7 100644 --- a/addons/dialogic/Editor/Images/Dropdown/plus.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/plus.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://cqqtygfbvgtag" path="res://.godot/imported/plus.svg-e094b0b8505b5d910717883d06553532.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/set.svg.import b/addons/dialogic/Editor/Images/Dropdown/set.svg.import index 57867b268..6c3157263 100644 --- a/addons/dialogic/Editor/Images/Dropdown/set.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/set.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://ddcfl67v0r1lw" path="res://.godot/imported/set.svg-f100fad003be2285d5d0da5c58417203.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Dropdown/update.svg.import b/addons/dialogic/Editor/Images/Dropdown/update.svg.import index 644163ad8..17546a6b1 100644 --- a/addons/dialogic/Editor/Images/Dropdown/update.svg.import +++ b/addons/dialogic/Editor/Images/Dropdown/update.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://t1roknwygcf3" path="res://.godot/imported/update.svg-cefa0fe6bfa50911bb9a77982288e485.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Pieces/add-folder.svg.import b/addons/dialogic/Editor/Images/Pieces/add-folder.svg.import index dd57c01a7..b7765a430 100644 --- a/addons/dialogic/Editor/Images/Pieces/add-folder.svg.import +++ b/addons/dialogic/Editor/Images/Pieces/add-folder.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://babwe22dqjta" path="res://.godot/imported/add-folder.svg-41a970370f904038e63c13bddbdb6450.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Pieces/closed-icon.svg.import b/addons/dialogic/Editor/Images/Pieces/closed-icon.svg.import index 17cb19cdd..146327e59 100644 --- a/addons/dialogic/Editor/Images/Pieces/closed-icon.svg.import +++ b/addons/dialogic/Editor/Images/Pieces/closed-icon.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://dx3o2ild56i76" path="res://.godot/imported/closed-icon.svg-b4f16653b91d6792313a130565319b2f.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Pieces/expand-icon.svg.import b/addons/dialogic/Editor/Images/Pieces/expand-icon.svg.import index b341a2301..0813669ed 100644 --- a/addons/dialogic/Editor/Images/Pieces/expand-icon.svg.import +++ b/addons/dialogic/Editor/Images/Pieces/expand-icon.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://cl03vrbj5wsjk" path="res://.godot/imported/expand-icon.svg-26099b197ab0f314e2253848fcc22962.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Pieces/open-icon.svg.import b/addons/dialogic/Editor/Images/Pieces/open-icon.svg.import index 65c4abd8b..eaec29ceb 100644 --- a/addons/dialogic/Editor/Images/Pieces/open-icon.svg.import +++ b/addons/dialogic/Editor/Images/Pieces/open-icon.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://mc7a24bcvjo3" path="res://.godot/imported/open-icon.svg-1a2ae6d0121a79b624c0fb87cc9ceea2.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Pieces/warning.svg.import b/addons/dialogic/Editor/Images/Pieces/warning.svg.import index 852e46683..ada597638 100644 --- a/addons/dialogic/Editor/Images/Pieces/warning.svg.import +++ b/addons/dialogic/Editor/Images/Pieces/warning.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://d4n3j4lvatwxb" path="res://.godot/imported/warning.svg-a48ae93c4663637f2aca88d055604495.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Resources/character.svg.import b/addons/dialogic/Editor/Images/Resources/character.svg.import index 4ba9d84e3..37eeb11aa 100644 --- a/addons/dialogic/Editor/Images/Resources/character.svg.import +++ b/addons/dialogic/Editor/Images/Resources/character.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://bbea0efx0ybu7" path="res://.godot/imported/character.svg-48bc1c93fa13733a935ca2c669d933a7.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Toolbar/add-character.svg.import b/addons/dialogic/Editor/Images/Toolbar/add-character.svg.import index 2c7d2e1a8..5f2b494d2 100644 --- a/addons/dialogic/Editor/Images/Toolbar/add-character.svg.import +++ b/addons/dialogic/Editor/Images/Toolbar/add-character.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://my600mb32ydt" path="res://.godot/imported/add-character.svg-a658b65c1225b02657a50d5c965e0d5e.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Toolbar/add-timeline.svg.import b/addons/dialogic/Editor/Images/Toolbar/add-timeline.svg.import index 3e6aba613..807fec0a4 100644 --- a/addons/dialogic/Editor/Images/Toolbar/add-timeline.svg.import +++ b/addons/dialogic/Editor/Images/Toolbar/add-timeline.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://bymlbr4o2m3jc" path="res://.godot/imported/add-timeline.svg-86961b528ebdf01f585931a15fea1755.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Editor/Images/Unknown.png.import b/addons/dialogic/Editor/Images/Unknown.png.import index 461064f9e..7be217ad8 100644 --- a/addons/dialogic/Editor/Images/Unknown.png.import +++ b/addons/dialogic/Editor/Images/Unknown.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/Unknown.png-1cc7645f56036e8d378a70ac1dd772bb. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Editor/Images/dialogic-logo.svg.import b/addons/dialogic/Editor/Images/dialogic-logo.svg.import index 5b3a3e131..cc2421bf5 100644 --- a/addons/dialogic/Editor/Images/dialogic-logo.svg.import +++ b/addons/dialogic/Editor/Images/dialogic-logo.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/dialogic-logo.svg-e43201cabc9573eeb3f78fd91ea [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Editor/TimelineEditor/TextEditor/CodeCompletionHelper.gd b/addons/dialogic/Editor/TimelineEditor/TextEditor/CodeCompletionHelper.gd index bf9b2cfb2..2f987786c 100644 --- a/addons/dialogic/Editor/TimelineEditor/TextEditor/CodeCompletionHelper.gd +++ b/addons/dialogic/Editor/TimelineEditor/TextEditor/CodeCompletionHelper.gd @@ -84,7 +84,7 @@ func request_code_completion(force:bool, text:CodeEdit, mode:=Modes.FULL_HIGHLIG var line := get_code_completion_line(text) var word := get_code_completion_word(text) var symbol := get_code_completion_prev_symbol(text) - + var line_part := get_line_untill_caret(line) ## Note on use of KIND types for options. # These types are mostly useless for us. @@ -127,7 +127,7 @@ func request_code_completion(force:bool, text:CodeEdit, mode:=Modes.FULL_HIGHLIG return # suggest parameters - if symbol == ' ': + if symbol == ' ' and line.count('"')%2 == 0: var parameters :Array = shortcode_events[code].get_shortcode_parameters().keys() for param in parameters: if !param+'=' in line: @@ -169,7 +169,7 @@ func request_code_completion(force:bool, text:CodeEdit, mode:=Modes.FULL_HIGHLIG if mode == Modes.TEXT_EVENT_ONLY and !event is DialogicTextEvent: continue - if ! ' ' in line: + if ! ' ' in line_part: event._get_start_code_completion(self, text) if event.is_valid_event(line): @@ -199,8 +199,8 @@ func suggest_timelines(text:CodeEdit, type := CodeEdit.KIND_MEMBER, color:=Color func suggest_labels(text:CodeEdit, timeline:String='', end:='', color:=Color()) -> void: - if timeline in Engine.get_main_loop().get_meta('dialogic_label_directory', {}): - for i in Engine.get_main_loop().get_meta('dialogic_label_directory')[timeline]: + if timeline in DialogicResourceUtil.get_label_cache(): + for i in DialogicResourceUtil.get_label_cache()[timeline]: text.add_code_completion_option(CodeEdit.KIND_MEMBER, i, i+end, color, load("res://addons/dialogic/Modules/Jump/icon_label.png")) diff --git a/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn b/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn index a3d0c1b2b..799d24d1e 100644 --- a/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn +++ b/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn @@ -6,7 +6,7 @@ [ext_resource type="PackedScene" uid="uid://defdeav8rli6o" path="res://addons/dialogic/Editor/TimelineEditor/TextEditor/timeline_editor_text.tscn" id="3_up2bn"] [ext_resource type="Script" path="res://addons/dialogic/Editor/TimelineEditor/TextEditor/syntax_highlighter.gd" id="4_1t6bf"] -[sub_resource type="Image" id="Image_pnrtc"] +[sub_resource type="Image" id="Image_3cd31"] data = { "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), "format": "RGBA8", @@ -15,13 +15,13 @@ data = { "width": 16 } -[sub_resource type="ImageTexture" id="ImageTexture_ajdpw"] -image = SubResource("Image_pnrtc") +[sub_resource type="ImageTexture" id="ImageTexture_wvrw5"] +image = SubResource("Image_3cd31") [sub_resource type="SyntaxHighlighter" id="SyntaxHighlighter_7lpql"] script = ExtResource("4_1t6bf") -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dumog"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3migc"] content_margin_left = 4.0 content_margin_top = 4.0 content_margin_right = 4.0 @@ -66,11 +66,11 @@ tooltip_text = "The name of the timeline is determined from the file name. This is what you should use in a jump event to reference this timeline. Besides the file path, you can also use this name in Dialogic.start()" -texture = SubResource("ImageTexture_ajdpw") -hint_text = "The name of the timeline is determined from the file name. +texture = SubResource("ImageTexture_wvrw5") +hint_text = "This unique identifier is based on the file name. You can change it in the Reference Manager. This is what you should use in a jump event to reference this timeline. -Besides the file path, you can also use this name in Dialogic.start()" +You can also use this name in Dialogic.start()." [node name="SwitchEditorMode" type="Button" parent="VBox/HBox"] unique_name_in_owner = true @@ -80,7 +80,7 @@ size_flags_horizontal = 10 size_flags_vertical = 4 tooltip_text = "Switch between Text Editor and Visual Editor" text = "Text editor" -icon = SubResource("ImageTexture_ajdpw") +icon = SubResource("ImageTexture_wvrw5") [node name="VisualEditor" parent="VBox" instance=ExtResource("2_qs7vc")] unique_name_in_owner = true @@ -108,7 +108,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_dumog") +theme_override_styles/panel = SubResource("StyleBoxFlat_3migc") [node name="CenterContainer" type="CenterContainer" parent="NoTimelineScreen"] layout_mode = 2 diff --git a/addons/dialogic/Example Assets/Fonts/Roboto-Bold.ttf.import b/addons/dialogic/Example Assets/Fonts/Roboto-Bold.ttf.import index 79d54bc21..694a2aeb6 100644 --- a/addons/dialogic/Example Assets/Fonts/Roboto-Bold.ttf.import +++ b/addons/dialogic/Example Assets/Fonts/Roboto-Bold.ttf.import @@ -18,6 +18,7 @@ generate_mipmaps=false multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 +allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 diff --git a/addons/dialogic/Example Assets/Fonts/Roboto-Italic.ttf.import b/addons/dialogic/Example Assets/Fonts/Roboto-Italic.ttf.import index 793e5933e..d7c809a85 100644 --- a/addons/dialogic/Example Assets/Fonts/Roboto-Italic.ttf.import +++ b/addons/dialogic/Example Assets/Fonts/Roboto-Italic.ttf.import @@ -18,6 +18,7 @@ generate_mipmaps=false multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 +allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 diff --git a/addons/dialogic/Example Assets/Fonts/Roboto-Regular.ttf.import b/addons/dialogic/Example Assets/Fonts/Roboto-Regular.ttf.import index 303fdaaa0..16d8db10f 100644 --- a/addons/dialogic/Example Assets/Fonts/Roboto-Regular.ttf.import +++ b/addons/dialogic/Example Assets/Fonts/Roboto-Regular.ttf.import @@ -18,6 +18,7 @@ generate_mipmaps=false multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 +allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 diff --git a/addons/dialogic/Example Assets/backgrounds/BubbleEnd.png.import b/addons/dialogic/Example Assets/backgrounds/BubbleEnd.png.import index 4a0389c9d..0e575987e 100644 --- a/addons/dialogic/Example Assets/backgrounds/BubbleEnd.png.import +++ b/addons/dialogic/Example Assets/backgrounds/BubbleEnd.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/BubbleEnd.png-a2bd812e4aeb33a7c97291d41dcc179 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/backgrounds/rpg_box.webp.import b/addons/dialogic/Example Assets/backgrounds/rpg_box.webp.import index 7808352aa..3f5f23942 100644 --- a/addons/dialogic/Example Assets/backgrounds/rpg_box.webp.import +++ b/addons/dialogic/Example Assets/backgrounds/rpg_box.webp.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/rpg_box.webp-6ea0804b52e01599dbc94ffacc31d433 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-1.png.import b/addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-1.png.import index e7bc8fb51..90ac6460a 100644 --- a/addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-1.png.import +++ b/addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/next-indicator-dialogic-1.png-694f122eff55e96 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/next-indicator/next-indicator.png.import b/addons/dialogic/Example Assets/next-indicator/next-indicator.png.import index 49989a68c..fa458c581 100644 --- a/addons/dialogic/Example Assets/next-indicator/next-indicator.png.import +++ b/addons/dialogic/Example Assets/next-indicator/next-indicator.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/next-indicator.png-e3b7b80d9da791a1d0a061a728 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 blink.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 blink.png.import index 3ec320337..4056cb273 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 blink.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 blink.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 blink.png-dd40283850366d49ae61df7b137ffd7 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 doubt.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 doubt.png.import index 20c09aed9..bfd6ca918 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 doubt.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 doubt.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 doubt.png-c657bfaf88fd5c06956ec703146704c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 hate.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 hate.png.import index 6b8608ddd..4ac4f9ef2 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 hate.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 hate.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 hate.png-004951da12b71d275d61f3fe7af6c760 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 plot.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 plot.png.import index 491857638..cb22c0073 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 plot.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 plot.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 plot.png-7c5bbb51327eb4b7b1b78f4597ed6c60 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 sad.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 sad.png.import index 0f1f27555..8770dc688 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 sad.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 sad.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 sad.png-778e9490c4f77059d6c87f720b2bbff7. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 scoff.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 scoff.png.import index 7efc9bce4..730a905ad 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 scoff.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 scoff.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 scoff.png-f0b3e5d0a8895f55d2377978a0992a3 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 shy.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 shy.png.import index cdfffcfd3..dd695934e 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 shy.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 shy.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 shy.png-db66f14e608e1c150163af82c8a9f341. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5 surprise.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5 surprise.png.import index 0cd7747c2..273fa0061 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5 surprise.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5 surprise.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5 surprise.png-9f07d67f3c68589bb2cfec738d68 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Antonio/pl5.png.import b/addons/dialogic/Example Assets/portraits/Antonio/pl5.png.import index 2cb806bf2..3dc08d176 100644 --- a/addons/dialogic/Example Assets/portraits/Antonio/pl5.png.import +++ b/addons/dialogic/Example Assets/portraits/Antonio/pl5.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl5.png-0e78d740b51df476d423c20a3850d39a.ctex [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 avoid.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 avoid.png.import index 816ddc5bb..5278433dd 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 avoid.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 avoid.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 avoid.png-f8f5fd2a91f270ef9417e3b4bda0f35 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 blink.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 blink.png.import index 5ba7cae72..b70a67aac 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 blink.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 blink.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 blink.png-bc002e72d459c371c5ebb5d3d237500 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 concept.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 concept.png.import index 65f6628c5..9236dd7c9 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 concept.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 concept.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 concept.png-baa2419b24f73cd7e47554567e865 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 confusion.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 confusion.png.import index 7cff5410d..98bbb6ef8 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 confusion.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 confusion.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 confusion.png-447505e4db69107e418a56eb992 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 doubt.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 doubt.png.import index f44bb2707..fa7850c1e 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 doubt.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 doubt.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 doubt.png-ad639761c380e37b578d46414772df7 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 happy.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 happy.png.import index b9a934c52..6959b1050 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 happy.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 happy.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 happy.png-7a49313244ae7097b2150a258b29afb [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 plot.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 plot.png.import index 5ce15efc9..f847ad40f 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 plot.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 plot.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 plot.png-92e4eb96f6aac50f2afc301dcb1954fb [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 sad.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 sad.png.import index 4f01bfcee..e383481ea 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 sad.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 sad.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 sad.png-4ce7b7a2f701590bc444115bab6e0c4e. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 shy.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 shy.png.import index 682e8afab..cf74c11f0 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 shy.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 shy.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 shy.png-7dc343f1ee98343c9fe2c9cf93a8d574. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Jane/pl3 surprise.png.import b/addons/dialogic/Example Assets/portraits/Jane/pl3 surprise.png.import index 0cc4f0617..5c2d3719e 100644 --- a/addons/dialogic/Example Assets/portraits/Jane/pl3 surprise.png.import +++ b/addons/dialogic/Example Assets/portraits/Jane/pl3 surprise.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pl3 surprise.png-92cfd8f7846a35eec2d62e62d532 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Portrait1.png.import b/addons/dialogic/Example Assets/portraits/Portrait1.png.import index e4ddd2fc5..25984338b 100644 --- a/addons/dialogic/Example Assets/portraits/Portrait1.png.import +++ b/addons/dialogic/Example Assets/portraits/Portrait1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/Portrait1.png-c609e542fb60d6627e07ca0a12ddd86 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Portrait2.png.import b/addons/dialogic/Example Assets/portraits/Portrait2.png.import index 610c8fadd..205d8f0c2 100644 --- a/addons/dialogic/Example Assets/portraits/Portrait2.png.import +++ b/addons/dialogic/Example Assets/portraits/Portrait2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/Portrait2.png-c9d044982430f12029c2193cba14c11 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/anger.png.import b/addons/dialogic/Example Assets/portraits/Princess/anger.png.import index 939ff3be0..17c4eafc1 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/anger.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/anger.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/anger.png-dbcae35ced97cd8763301ede55f7634a.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/frown.png.import b/addons/dialogic/Example Assets/portraits/Princess/frown.png.import index 05a803330..d7534522c 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/frown.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/frown.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/frown.png-2ea012492bc6286b36736d621adfd96a.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/joy.png.import b/addons/dialogic/Example Assets/portraits/Princess/joy.png.import index e3b050d1d..2f45c81c5 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/joy.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/joy.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/joy.png-a06db3f0763984942582106f69acd2ac.ctex [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/neutral.png.import b/addons/dialogic/Example Assets/portraits/Princess/neutral.png.import index ac9b7a9fc..0c16fb446 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/neutral.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/neutral.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/neutral.png-b67f36561d5798f6bdf0e487c71053f7. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/princess_blank.png.import b/addons/dialogic/Example Assets/portraits/Princess/princess_blank.png.import index 0fb4e6115..e2be550cc 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/princess_blank.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/princess_blank.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/princess_blank.png-fb2f5b52f38dc68c3bb1b4bf7b [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/shock.png.import b/addons/dialogic/Example Assets/portraits/Princess/shock.png.import index 2184a8d8f..5a561b8ba 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/shock.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/shock.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/shock.png-8c83d26226ef9a4e882afabd3875355f.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/Princess/smile.png.import b/addons/dialogic/Example Assets/portraits/Princess/smile.png.import index 553f811c5..b99f2ddd4 100644 --- a/addons/dialogic/Example Assets/portraits/Princess/smile.png.import +++ b/addons/dialogic/Example Assets/portraits/Princess/smile.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/smile.png-763f387a68c52e40326ccdf00129e290.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/rpg_portraits/base1.png.import b/addons/dialogic/Example Assets/portraits/rpg_portraits/base1.png.import index 81a25205e..6570c35bb 100644 --- a/addons/dialogic/Example Assets/portraits/rpg_portraits/base1.png.import +++ b/addons/dialogic/Example Assets/portraits/rpg_portraits/base1.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/base1.png-d5d7d1c85b1cab665dc0b54194bbd33b.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/rpg_portraits/base2.png.import b/addons/dialogic/Example Assets/portraits/rpg_portraits/base2.png.import index 53ee3c2ef..0d2af4239 100644 --- a/addons/dialogic/Example Assets/portraits/rpg_portraits/base2.png.import +++ b/addons/dialogic/Example Assets/portraits/rpg_portraits/base2.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/base2.png-4cf3c53a4d499097fe6532e4b778d0b3.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/rpg_portraits/base3.png.import b/addons/dialogic/Example Assets/portraits/rpg_portraits/base3.png.import index 274684873..e867c5073 100644 --- a/addons/dialogic/Example Assets/portraits/rpg_portraits/base3.png.import +++ b/addons/dialogic/Example Assets/portraits/rpg_portraits/base3.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/base3.png-65e60d03716a9b546a46a38772fc2ace.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Example Assets/portraits/rpg_portraits/base4.png.import b/addons/dialogic/Example Assets/portraits/rpg_portraits/base4.png.import index ea01b4a23..a62c6620d 100644 --- a/addons/dialogic/Example Assets/portraits/rpg_portraits/base4.png.import +++ b/addons/dialogic/Example Assets/portraits/rpg_portraits/base4.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/base4.png-ea3084656f4403d3ff87bdd890f73843.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/dialogic/Modules/Background/subsystem_backgrounds.gd b/addons/dialogic/Modules/Background/subsystem_backgrounds.gd index a88e09bdf..0177f00b8 100644 --- a/addons/dialogic/Modules/Background/subsystem_backgrounds.gd +++ b/addons/dialogic/Modules/Background/subsystem_backgrounds.gd @@ -38,7 +38,7 @@ func load_game_state(load_flag:=LoadFlags.FULL_LOAD): func update_background(scene:String = '', argument:String = '', fade_time:float = 0.0, transition_path:=default_transition, force:bool = false) -> void: var background_holder: DialogicNode_BackgroundHolder if dialogic.has_subsystem('Styles'): - background_holder = Dialogic.Styles.get_first_node_in_layout('dialogic_background_holders') + background_holder = dialogic.Styles.get_first_node_in_layout('dialogic_background_holders') else: background_holder = get_tree().get_first_node_in_group('dialogic_background_holders') if background_holder == null: @@ -142,6 +142,6 @@ func add_background_node(scene:PackedScene, parent:DialogicNode_BackgroundHolder func has_background() -> bool: - return !dialogic.current_state_info['background_scene'].is_empty() or !dialogic.current_state_info['background_argument'].is_empty() + return !dialogic.current_state_info.get('background_scene', '').is_empty() or !dialogic.current_state_info.get('background_argument','').is_empty() diff --git a/addons/dialogic/Modules/Character/subsystem_portraits.gd b/addons/dialogic/Modules/Character/subsystem_portraits.gd index 7369f2102..01a800663 100644 --- a/addons/dialogic/Modules/Character/subsystem_portraits.gd +++ b/addons/dialogic/Modules/Character/subsystem_portraits.gd @@ -480,7 +480,7 @@ func remove_character(character:DialogicCharacter) -> void: ## Returns true if the given character is currently joined. func is_character_joined(character:DialogicCharacter) -> bool: - if !character.resource_path in dialogic.current_state_info['portraits']: + if not character or !character.resource_path in dialogic.current_state_info['portraits']: return false if dialogic.current_state_info['portraits'][character.resource_path].get('node', null) != null and \ is_instance_valid(dialogic.current_state_info['portraits'][character.resource_path].node): diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.gd b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.gd index 60fd45c36..9f9095efd 100644 --- a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.gd +++ b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.gd @@ -11,4 +11,5 @@ func _apply_export_overrides(): # apply portrait size for child in %Portraits.get_children(): child.size_mode = portrait_size_mode + child.update_portrait_transforms() diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.gd b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.gd index 588d789e0..987802055 100644 --- a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.gd +++ b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.gd @@ -132,9 +132,15 @@ func _apply_export_overrides(): else: %DialogTextPanel.self_modulate = box_color_custom - %DialogTextPanel.custom_minimum_size = box_size - %Minimizer.size = Vector2.ZERO - %Minimizer.position.y = -box_margin_bottom + #%DialogTextPanel.hide() + #%Minimizer.size = Vector2.ZERO + #%Minimizer.position = Vector2(0, -box_margin_bottom) + #%Minimizer.grow_vertical = Container.GROW_DIRECTION_BEGIN + #%DialogTextPanel.custom_minimum_size = box_size + #%DialogTextPanel.show() + %Sizer.size = box_size + %Sizer.position = box_size * Vector2(-0.5, -1)+Vector2(0, -box_margin_bottom) + ## BOX ANIMATIONS %Animations.animation_in = box_animation_in @@ -178,9 +184,9 @@ func _apply_export_overrides(): %NameLabelPanel.grow_horizontal = [1, 2, 0][name_label_alignment] ## NEXT INDICATOR SETTINGS - if !next_indicator_enabled: - %NextIndicator.queue_free() - else: + %NextIndicator.enabled = next_indicator_enabled + + if next_indicator_enabled: %NextIndicator.animation = next_indicator_animation if FileAccess.file_exists(next_indicator_texture): %NextIndicator.texture = load(next_indicator_texture) diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.tscn b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.tscn index 57bc23dfd..263440079 100644 --- a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.tscn +++ b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.tscn @@ -64,7 +64,7 @@ tracks/3/keys = { tracks/4/type = "bezier" tracks/4/imported = false tracks/4/enabled = true -tracks/4/path = NodePath("DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel:rotation") +tracks/4/path = NodePath("DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel:rotation") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { @@ -79,7 +79,7 @@ length = 0.4 tracks/0/type = "bezier" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel:rotation") +tracks/0/path = NodePath("DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel:rotation") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -245,7 +245,7 @@ grow_horizontal = 2 grow_vertical = 0 mouse_filter = 2 -[node name="Minimizer" type="CenterContainer" parent="DialogicTextAnchor/DialogTextAnimationParent"] +[node name="Sizer" type="Control" parent="DialogicTextAnchor/DialogTextAnimationParent"] unique_name_in_owner = true layout_mode = 1 anchors_preset = 7 @@ -253,23 +253,27 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = -17.0 +offset_left = -150.0 offset_top = -50.0 -offset_right = 17.0 -offset_bottom = -10.0 +offset_right = 150.0 grow_horizontal = 2 grow_vertical = 0 -[node name="DialogTextPanel" type="PanelContainer" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer"] +[node name="DialogTextPanel" type="PanelContainer" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer"] unique_name_in_owner = true self_modulate = Color(0.00784314, 0.00784314, 0.00784314, 0.843137) -custom_minimum_size = Vector2(400, 100) -layout_mode = 2 +custom_minimum_size = Vector2(300, 50) +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 theme_override_styles/panel = ExtResource("3_ssa84") metadata/_edit_layout_mode = 1 -[node name="DialogicNode_DialogText" type="RichTextLabel" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel" node_paths=PackedStringArray("textbox_root")] +[node name="DialogicNode_DialogText" type="RichTextLabel" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel" node_paths=PackedStringArray("textbox_root")] unique_name_in_owner = true layout_mode = 2 mouse_filter = 1 @@ -284,12 +288,12 @@ visible_characters_behavior = 1 script = ExtResource("3_4634k") textbox_root = NodePath("..") -[node name="DialogicNode_TypeSounds" type="AudioStreamPlayer" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel/DialogicNode_DialogText"] +[node name="DialogicNode_TypeSounds" type="AudioStreamPlayer" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel/DialogicNode_DialogText"] unique_name_in_owner = true script = ExtResource("4_ma5mw") play_every_character = 0 -[node name="NextIndicator" type="Control" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel"] +[node name="NextIndicator" type="Control" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 8 @@ -299,7 +303,7 @@ show_on_questions = true texture = ExtResource("6_uch03") metadata/_edit_layout_mode = 1 -[node name="AutoAdvanceProgressbar" type="ProgressBar" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel"] +[node name="AutoAdvanceProgressbar" type="ProgressBar" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel"] unique_name_in_owner = true modulate = Color(1, 1, 1, 0.188235) custom_minimum_size = Vector2(0, 10) @@ -311,11 +315,11 @@ value = 0.5 show_percentage = false script = ExtResource("6_07xym") -[node name="NameLabelHolder" type="Control" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel"] +[node name="NameLabelHolder" type="Control" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel"] layout_mode = 2 mouse_filter = 2 -[node name="NameLabelPanel" type="PanelContainer" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel/NameLabelHolder"] +[node name="NameLabelPanel" type="PanelContainer" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel/NameLabelHolder"] unique_name_in_owner = true self_modulate = Color(0.00784314, 0.00784314, 0.00784314, 0.843137) layout_mode = 1 @@ -327,7 +331,7 @@ metadata/_edit_layout_mode = 1 metadata/_edit_use_custom_anchors = true metadata/_edit_group_ = true -[node name="DialogicNode_NameLabel" type="Label" parent="DialogicTextAnchor/DialogTextAnimationParent/Minimizer/DialogTextPanel/NameLabelHolder/NameLabelPanel" node_paths=PackedStringArray("name_label_root")] +[node name="DialogicNode_NameLabel" type="Label" parent="DialogicTextAnchor/DialogTextAnimationParent/Sizer/DialogTextPanel/NameLabelHolder/NameLabelPanel" node_paths=PackedStringArray("name_label_root")] unique_name_in_owner = true layout_mode = 2 theme_override_colors/font_color = Color(1, 1, 1, 1) diff --git a/addons/dialogic/Modules/Glossary/add-glossary.svg.import b/addons/dialogic/Modules/Glossary/add-glossary.svg.import index 10b6d4194..901b93208 100644 --- a/addons/dialogic/Modules/Glossary/add-glossary.svg.import +++ b/addons/dialogic/Modules/Glossary/add-glossary.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://cenut3sc5cul0" path="res://.godot/imported/add-glossary.svg-1cde77c043d3874d9bc84cc14d0ec9dc.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Modules/Glossary/icon.svg.import b/addons/dialogic/Modules/Glossary/icon.svg.import index 3ca66b7f9..288e61f52 100644 --- a/addons/dialogic/Modules/Glossary/icon.svg.import +++ b/addons/dialogic/Modules/Glossary/icon.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://b5xwnxdb7064n" path="res://.godot/imported/icon.svg-4fc0c12c53379638e37d654e7bbaea1a.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Modules/Glossary/subsystem_glossary.gd b/addons/dialogic/Modules/Glossary/subsystem_glossary.gd index d205f27d2..7a8d29567 100644 --- a/addons/dialogic/Modules/Glossary/subsystem_glossary.gd +++ b/addons/dialogic/Modules/Glossary/subsystem_glossary.gd @@ -36,7 +36,8 @@ func parse_glossary(text:String) -> String: for entry in glossary.entries.keys(): if !glossary.entries[entry].get('enabled', true): continue - var pattern :String = '(?<=\\W|^)(?<word>'+glossary.entries[entry].get('regopts', entry)+')(?!])(?=\\W|$)' + + var pattern :String = '(?<=\\W|^)(?<!\\\\)(?<word>'+glossary.entries[entry].get('regopts', entry)+')(?!])(?=\\W|$)' if glossary.entries[entry].get('case_sensitive', def_case_sensitive): regex.compile(pattern) else: @@ -51,6 +52,15 @@ func parse_glossary(text:String) -> String: '[color=' + color + ']${word}[/color]' + '[/url]', true ) + + # Then do a pass removing any \ from escaped entries + pattern = '\\\\(?<=\\W|^)(?<word>'+glossary.entries[entry].get('regopts', entry)+')(?!])(?=\\W|$)' + if glossary.entries[entry].get('case_sensitive', def_case_sensitive): + regex.compile(pattern) + else: + regex.compile('(?i)'+pattern) + + text = regex.sub(text, "${word}", true) return text diff --git a/addons/dialogic/Modules/Jump/event_jump.gd b/addons/dialogic/Modules/Jump/event_jump.gd index ccc17a757..6b725a325 100644 --- a/addons/dialogic/Modules/Jump/event_jump.gd +++ b/addons/dialogic/Modules/Jump/event_jump.gd @@ -117,7 +117,6 @@ func get_timeline_suggestions(filter:String= "") -> Dictionary: var suggestions := {} suggestions['(this timeline)'] = {'value':'', 'editor_icon':['GuiRadioUnchecked', 'EditorIcons']} - for resource in DialogicResourceUtil.get_timeline_directory().keys(): suggestions[resource] = {'value': resource, 'tooltip':DialogicResourceUtil.get_timeline_directory()[resource], 'editor_icon': ["TripleBar", "EditorIcons"]} return suggestions @@ -126,9 +125,8 @@ func get_timeline_suggestions(filter:String= "") -> Dictionary: func get_label_suggestions(filter:String="") -> Dictionary: var suggestions := {} suggestions['at the beginning'] = {'value':'', 'editor_icon':['GuiRadioUnchecked', 'EditorIcons']} - - if _timeline_file in Engine.get_main_loop().get_meta('dialogic_label_directory').keys(): - for label in Engine.get_main_loop().get_meta('dialogic_label_directory')[_timeline_file]: + if _timeline_file in DialogicResourceUtil.get_label_cache().keys(): + for label in DialogicResourceUtil.get_label_cache()[_timeline_file]: suggestions[label] = {'value': label, 'tooltip':label, 'editor_icon': ["ArrowRight", "EditorIcons"]} return suggestions diff --git a/addons/dialogic/Modules/Style/subsystem_styles.gd b/addons/dialogic/Modules/Style/subsystem_styles.gd index 75afa0622..c94c69fb9 100644 --- a/addons/dialogic/Modules/Style/subsystem_styles.gd +++ b/addons/dialogic/Modules/Style/subsystem_styles.gd @@ -26,37 +26,43 @@ func load_style(style_name:="", is_base_style:=true) -> Node: var style := DialogicUtil.get_style_by_name(style_name) var signal_info := {'style':style_name} + dialogic.current_state_info['style'] = style_name # is_base_style should only be wrong on temporary changes like character styles if is_base_style: dialogic.current_state_info['base_style'] = style_name - # if this style is the same style as before var previous_layout := get_layout_node() - if (is_instance_valid(previous_layout) - and previous_layout.has_meta('style')): - if previous_layout.get_meta('style').name == style_name: + + if is_instance_valid(previous_layout) and previous_layout.has_meta('style'): + signal_info['previous'] = previous_layout.get_meta('style').name + + # If this is the same style and scene, do nothing + if previous_layout.get_meta('style') == style: return previous_layout # If this has the same scene setup, just apply the new overrides - if previous_layout.get_meta('style') == style.get_inheritance_root(): - DialogicUtil.apply_scene_export_overrides(previous_layout, style.get_layer_inherited_info(-1)) + elif previous_layout.get_meta('style') == style.get_inheritance_root(): + DialogicUtil.apply_scene_export_overrides(previous_layout, style.get_layer_inherited_info(-1).overrides) var index := 0 - for i in previous_layout.get_layers(): - DialogicUtil.apply_scene_export_overrides(previous_layout, style.get_layer_inherited_info(index)) + for layer in previous_layout.get_layers(): + DialogicUtil.apply_scene_export_overrides(layer, style.get_layer_inherited_info(index).overrides) index += 1 - # if this is another style: - var new_layout := create_layout(style) + previous_layout.set_meta('style', style) + style_changed.emit(signal_info) + return - if new_layout != previous_layout and previous_layout != null: - if previous_layout.has_meta('style'): signal_info['previous'] = previous_layout.get_meta('style').name - previous_layout.queue_free() - new_layout.ready.connect(reload_current_info_into_new_style) + else: + previous_layout.get_parent().remove_child(previous_layout) + previous_layout.queue_free() - dialogic.current_state_info['style'] = style_name + # if this is another style: + var new_layout := create_layout(style) + new_layout.ready.connect(reload_current_info_into_new_style) style_changed.emit(signal_info) + return new_layout diff --git a/addons/dialogic/Modules/Text/node_next_indicator.gd b/addons/dialogic/Modules/Text/node_next_indicator.gd index c6b010ee6..9f7a7fcc4 100644 --- a/addons/dialogic/Modules/Text/node_next_indicator.gd +++ b/addons/dialogic/Modules/Text/node_next_indicator.gd @@ -5,6 +5,9 @@ extends Control ## Node that is shown when the text is fully revealed. ## The default implementation allows to set an icon and animation. + +@export var enabled := true + ## If true the next indicator will also be shown if the text is a question. @export var show_on_questions := false ## If true the next indicator will be shown even if dialogic will autocontinue. diff --git a/addons/dialogic/Modules/Text/subsystem_text.gd b/addons/dialogic/Modules/Text/subsystem_text.gd index 4071cbf2e..841ee9c69 100644 --- a/addons/dialogic/Modules/Text/subsystem_text.gd +++ b/addons/dialogic/Modules/Text/subsystem_text.gd @@ -113,7 +113,7 @@ func update_dialog_text(text:String, instant:bool= false, additional:= false) -> dialogic.current_state_info['text_parsed'] = (text_node as RichTextLabel).get_parsed_text() # also resets temporary autoadvance and noskip settings: - speed_multiplier = 1 + update_text_speed(-1, false, 1, -1) dialogic.Input.auto_advance.enabled_until_next_event = false dialogic.Input.auto_advance.override_delay_for_current_event = -1 @@ -197,9 +197,12 @@ func show_text_boxes(instant:=false) -> void: func show_next_indicators(question:=false, autoadvance:=false) -> void: for next_indicator in get_tree().get_nodes_in_group('dialogic_next_indicator'): - if (question and 'show_on_questions' in next_indicator and next_indicator.show_on_questions) or \ + if next_indicator.enabled: + if (question and 'show_on_questions' in next_indicator and next_indicator.show_on_questions) or \ (autoadvance and 'show_on_autoadvance' in next_indicator and next_indicator.show_on_autoadvance) or (!question and !autoadvance): - next_indicator.show() + next_indicator.show() + else: + next_indicator.hide() func hide_next_indicators(_fake_arg = null) -> void: for next_indicator in get_tree().get_nodes_in_group('dialogic_next_indicator'): @@ -450,9 +453,9 @@ func effect_signal(text_node:Control, skipped:bool, argument:String) -> void: func effect_mood(text_node:Control, skipped:bool, argument:String) -> void: if argument.is_empty(): return - if dialogic.current_state_info.get('character', null): + if dialogic.current_state_info.get('speaker', null): update_typing_sound_mood( - load(dialogic.current_state_info.character).custom_info.get('sound_moods', {}).get(argument, {})) + load(dialogic.current_state_info.speaker).custom_info.get('sound_moods', {}).get(argument, {})) var modifier_words_select_regex := RegEx.create_from_string("(?<!\\\\)\\<[^\\[\\>]+(\\/[^\\>]*)\\>") diff --git a/addons/dialogic/Modules/TextInput/event_text_input.gd b/addons/dialogic/Modules/TextInput/event_text_input.gd index 21b3b9bbe..de4acade9 100644 --- a/addons/dialogic/Modules/TextInput/event_text_input.gd +++ b/addons/dialogic/Modules/TextInput/event_text_input.gd @@ -64,7 +64,7 @@ func get_shortcode_parameters() -> Dictionary: return { #param_name : property_info "text" : {"property": "text", "default": "Please enter some text:"}, - "var" : {"property": "variable", "default": ""}, + "var" : {"property": "variable", "default": "", "suggestions":get_var_suggestions}, "placeholder" : {"property": "placeholder", "default": ""}, "default" : {"property": "default", "default": ""}, "allow_empty" : {"property": "allow_empty", "default": false}, @@ -86,7 +86,7 @@ func build_event_editor() -> void: add_body_edit('allow_empty', ValueType.BOOL, {'left_text':'Allow empty:'}) -func get_var_suggestions(filter:String) -> Dictionary: +func get_var_suggestions(filter:String="") -> Dictionary: var suggestions := {} if filter: suggestions[filter] = { diff --git a/addons/dialogic/Modules/Variable/add-variable.svg.import b/addons/dialogic/Modules/Variable/add-variable.svg.import index ff1aa21f5..e12513c7b 100644 --- a/addons/dialogic/Modules/Variable/add-variable.svg.import +++ b/addons/dialogic/Modules/Variable/add-variable.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://qhuk0fuwxbtq" path="res://.godot/imported/add-variable.svg-26eb3bd7fac746c574d054e8416d3aac.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Modules/Variable/variable.svg.import b/addons/dialogic/Modules/Variable/variable.svg.import index c3b1f90c5..f42c4cda0 100644 --- a/addons/dialogic/Modules/Variable/variable.svg.import +++ b/addons/dialogic/Modules/Variable/variable.svg.import @@ -5,8 +5,6 @@ type="CompressedTexture2D" uid="uid://ckilxvwc34s84" path="res://.godot/imported/variable.svg-52aeb47fe1705a3f04d919f8dcd5d319.ctex" metadata={ -"editor_dark_theme": true, -"editor_scale": 1.0, "has_editor_variant": true, "vram_texture": false } diff --git a/addons/dialogic/Other/DialogicGameHandler.gd b/addons/dialogic/Other/DialogicGameHandler.gd index bf2b236ee..c4558bc5c 100644 --- a/addons/dialogic/Other/DialogicGameHandler.gd +++ b/addons/dialogic/Other/DialogicGameHandler.gd @@ -310,8 +310,6 @@ func _set(property, value): #endregion - - #region HELPERS ################################################################################ diff --git a/addons/dialogic/plugin.cfg b/addons/dialogic/plugin.cfg index c968ae7e5..8d549e1f3 100644 --- a/addons/dialogic/plugin.cfg +++ b/addons/dialogic/plugin.cfg @@ -4,5 +4,5 @@ name="Dialogic" description="Create dialogs, characters and scenes to display conversations in your Godot games. https://github.com/coppolaemilio/dialogic" author="Emi, Jowan Spooner, Exelia, and more!" -version="2.0-Alpha-11 (Godot 4.1+)" +version="2.0-Alpha-12 (Godot 4.1+)" script="plugin.gd"