Fix merge conflicts

Author: Jowan-Spooner

README.md

@@ -10,7 +10,7 @@
 
 <p align="center">
   <a href="https://discord.gg/DjcDgDaTMe" target="_blank" style="text-decoration:none"><img alt="Discord" src="https://img.shields.io/discord/628713677239091231?logo=discord&labelColor=CFC9C8&color=646FA9"></a>
-  <a href="https://godotengine.org/download/" target="_blank" style="text-decoration:none"><img alt="Godot v4.2+" src="https://img.shields.io/badge/Godot-v4.2+-%23478cbf?labelColor=CFC9C8&color=49A9B4" /></a>
+  <a href="https://godotengine.org/download/" target="_blank" style="text-decoration:none"><img alt="Godot v4.3+" src="https://img.shields.io/badge/Godot-v4.3+-%23478cbf?labelColor=CFC9C8&color=49A9B4" /></a>
   <a href="https://docs.dialogic.pro/introduction.html" target="_blank" style="text-decoration:none"><img alt="Dialogic 2 Documentation" src="https://img.shields.io/badge/documention-online-green?labelColor=CFC9C8&color=6BCD69"></a>
   <a href="https://github.com/dialogic-godot/dialogic/actions/workflows/unit_test.yml" target="_blank style="text-decoration:none"><img alt="GitHub Actions Workflow Status" src="https://img.shields.io/github/actions/workflow/status/dialogic-godot/dialogic/unit_test.yml?labelColor=CFC9C8&color=DBDCB8"></a>
   <a href="https://github.com/dialogic-godot/dialogic/releases"  target="_blank" style="text-decoration:none"><img alt="Latest Dialogic Release" src="https://img.shields.io/github/v/release/dialogic-godot/dialogic?include_prereleases&labelColor=CFC9C8&color=CBA18C"></a>
@@ -26,7 +26,7 @@
 
 ## Version
 
-Dialogic 2 **requires at least Godot 4.2.2**.
+Dialogic 2 **requires at least Godot 4.3**.
 
 [If you are looking for the Godot 3.x version (Dialogic 1.x) you can find it here.](https://github.com/dialogic-godot/dialogic-1)
 
@@ -72,7 +72,7 @@ Contributors: [CakeVR](https://github.com/CakeVR), [Exelia](https://github.com/e
 
 Special thanks: [Arnaud](https://github.com/arnaudvergnet), [AnidemDex](https://github.com/AnidemDex), [ellogwen](https://github.com/ellogwen), [Tim Krief](https://github.com/timkrief), [Toen](https://twitter.com/ToenAndreMC), Òscar, [Francisco Presencia](https://francisco.io/), [M7mdKady14](https://github.com/M7mdKady14).
 
-### Thank you to all my [Patreons](https://www.patreon.com/coppolaemilio) and Github sponsors for making this possible!
+### Thank you to all my [Patreons](https://www.patreon.com/jowanspooner) and Github sponsors for making this possible!
 
 ## License
 This project is licensed under the terms of the [MIT license](https://github.com/dialogic-godot/dialogic/blob/main/LICENSE).

addons/dialogic/Core/DialogicGameHandler.gd

@@ -194,8 +194,10 @@ func start(timeline:Variant, label_or_idx:Variant="") -> Node:
 		scene.show()
 
 	if not scene.is_node_ready():
-		scene.ready.connect(clear.bind(ClearFlags.KEEP_VARIABLES))
-		scene.ready.connect(start_timeline.bind(timeline, label_or_idx))
+		if not scene.ready.is_connected(clear.bind(ClearFlags.KEEP_VARIABLES)):
+			scene.ready.connect(clear.bind(ClearFlags.KEEP_VARIABLES))
+		if not scene.ready.is_connected(start_timeline.bind(timeline, label_or_idx)):
+			scene.ready.connect(start_timeline.bind(timeline, label_or_idx))
 	else:
 		start_timeline(timeline, label_or_idx)
 
@@ -207,7 +209,7 @@ func start(timeline:Variant, label_or_idx:Variant="") -> Node:
 ## @label_or_idx can be a label (string) or index (int) to skip to immediatly.
 func start_timeline(timeline:Variant, label_or_idx:Variant = "") -> void:
 	# load the resource if only the path is given
-	if typeof(timeline) == TYPE_STRING:
+	if typeof(timeline) in [TYPE_STRING, TYPE_STRING_NAME]:
 		#check the lookup table if it's not a full file name
 		if "://" in timeline:
 			timeline = load(timeline)
@@ -226,7 +228,7 @@ func start_timeline(timeline:Variant, label_or_idx:Variant = "") -> void:
 		event.dialogic = self
 	current_event_idx = -1
 
-	if typeof(label_or_idx) == TYPE_STRING:
+	if typeof(label_or_idx) in [TYPE_STRING, TYPE_STRING_NAME]:
 		if label_or_idx:
 			if has_subsystem('Jump'):
 				Jump.jump_to_label((label_or_idx as String))
@@ -244,7 +246,7 @@ func start_timeline(timeline:Variant, label_or_idx:Variant = "") -> void:
 ## [param timeline_resource] can be either a path (string) or a loaded timeline (resource)
 func preload_timeline(timeline_resource:Variant) -> Variant:
 	# I think ideally this should be on a new thread, will test
-	if typeof(timeline_resource) == TYPE_STRING:
+	if typeof(timeline_resource) in [TYPE_STRING, TYPE_STRING_NAME]:
 		if "://" in timeline_resource:
 			timeline_resource = load(timeline_resource)
 		else:
@@ -279,6 +281,18 @@ func end_timeline(skip_ending := false) -> void:
 	timeline_ended.emit()
 
 
+## Method to check if timeline exists.
+## @timeline can be either a loaded timeline resource or a path to a timeline file.
+func timeline_exists(timeline:Variant) -> bool:
+	if typeof(timeline) in [TYPE_STRING, TYPE_STRING_NAME]:
+		if "://" in timeline and ResourceLoader.exists(timeline):
+			return load(timeline) is DialogicTimeline
+		else:
+			return DialogicResourceUtil.timeline_resource_exists(timeline)
+
+	return timeline is DialogicTimeline
+
+
 ## Handles the next event.
 func handle_next_event(_ignore_argument: Variant = "") -> void:
 	handle_event(current_event_idx+1)

addons/dialogic/Core/DialogicResourceUtil.gd

@@ -13,7 +13,7 @@ static func update() -> void:
 	update_directory('.dtl')
 	update_label_cache()
 	update_audio_channel_cache()
-	DialogicStylesUtil.update_style_directory()
+	DialogicStylesUtil.build_style_directory()
 
 
 #region RESOURCE DIRECTORIES
@@ -82,6 +82,13 @@ static func get_unique_identifier_by_path(file_path:String) -> String:
 	return ""
 
 
+static func get_resource_path_from_identifier(identifier:String, extension:String) -> String:
+	var value: Variant = get_directory(extension).get(identifier, '')
+	if value is String:
+		return value
+	return ""
+
+
 ## Returns the resource associated with the given unique identifier.
 ## The expected extension is needed to use the right directory.
 static func get_resource_from_identifier(identifier:String, extension:String) -> Resource:
@@ -93,6 +100,15 @@ static func get_resource_from_identifier(identifier:String, extension:String) ->
 	return null
 
 
+## Returns a boolean that expresses whether the resource exists.
+## The expected extension is needed to use the right directory.
+static func resource_exists_from_identifier(identifier:String, extension:String) -> bool:
+	var value: Variant = get_directory(extension).get(identifier, '')
+	if typeof(value) == TYPE_STRING:
+		return ResourceLoader.exists(value)
+	return value is Resource
+
+
 ## Editor Only
 static func change_unique_identifier(file_path:String, new_identifier:String) -> void:
 	var directory := get_directory(file_path.get_extension())
@@ -331,6 +347,10 @@ static func get_timeline_directory() -> Dictionary:
 	return get_directory('dtl')
 
 
+static func timeline_resource_exists(timeline_identifier:String) -> bool:
+	return resource_exists_from_identifier(timeline_identifier, 'dtl')
+
+
 static func get_timeline_resource(timeline_identifier:String) -> DialogicTimeline:
 	return get_resource_from_identifier(timeline_identifier, 'dtl')
 

addons/dialogic/Core/DialogicUtil.gd

@@ -445,39 +445,53 @@ static func setup_script_property_edit_node(property_info: Dictionary, value:Var
 					input.select(value)
 				input.item_selected.connect(DialogicUtil._on_export_int_enum_submitted.bind(property_info.name, property_changed))
 			else:
-				input = SpinBox.new()
-				input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_info.name, property_changed))
-				if property_info.hint_string == 'int':
-					input.step = 1
-					input.allow_greater = true
-					input.allow_lesser = true
-				elif ',' in property_info.hint_string:
+				input = load("res://addons/dialogic/Editor/Events/Fields/field_number.tscn").instantiate()
+				input.property_name = property_info['name']
+				input.use_int_mode()
+
+				if ',' in property_info.hint_string:
 					input.min_value = int(property_info.hint_string.get_slice(',', 0))
 					input.max_value = int(property_info.hint_string.get_slice(',', 1))
 					if property_info.hint_string.count(',') > 1:
 						input.step = int(property_info.hint_string.get_slice(',', 2))
+				else:
+					input.step = 1
+					input.max_value = INF
+					input.min_value = -INF
+
 				if value != null:
-					input.value = value
+					input.set_value(value)
+				input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_changed))
 		TYPE_FLOAT:
-			input = SpinBox.new()
+			input = load("res://addons/dialogic/Editor/Events/Fields/field_number.tscn").instantiate()
+			input.property_name = property_info['name']
+			input.use_float_mode()
 			input.step = 0.01
 			if ',' in property_info.hint_string:
 				input.min_value = float(property_info.hint_string.get_slice(',', 0))
 				input.max_value = float(property_info.hint_string.get_slice(',', 1))
 				if property_info.hint_string.count(',') > 1:
 					input.step = float(property_info.hint_string.get_slice(',', 2))
-			input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_info.name, property_changed))
 			if value != null:
-				input.value = value
+				input.set_value(value)
+			input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_changed))
 		TYPE_VECTOR2, TYPE_VECTOR3, TYPE_VECTOR4:
 			var vectorSize: String = type_string(typeof(value))[-1]
 			input = load("res://addons/dialogic/Editor/Events/Fields/field_vector" + vectorSize + ".tscn").instantiate()
 			input.property_name = property_info['name']
 			input.set_value(value)
 			input.value_changed.connect(DialogicUtil._on_export_vector_submitted.bind(property_changed))
+		TYPE_VECTOR2I, TYPE_VECTOR3I, TYPE_VECTOR4I:
+			var vectorSize: String = type_string(typeof(value))[-2]
+			input = load("res://addons/dialogic/Editor/Events/Fields/field_vector" + vectorSize + ".tscn").instantiate()
+			input.step = 1
+			input.property_name = property_info['name']
+			input.set_value(value)
+			input.value_changed.connect(DialogicUtil._on_export_vectori_submitted.bind(property_changed))
 		TYPE_STRING:
 			if property_info['hint'] & PROPERTY_HINT_FILE or property_info['hint'] & PROPERTY_HINT_DIR:
 				input = load("res://addons/dialogic/Editor/Events/Fields/field_file.tscn").instantiate()
+				input.show_editing_button = true
 				input.file_filter = property_info['hint_string']
 				input.file_mode = FileDialog.FILE_MODE_OPEN_FILE
 				if property_info['hint'] == PROPERTY_HINT_DIR:
@@ -531,7 +545,7 @@ static func _on_export_color_submitted(color:Color, property_name:String, callab
 static func _on_export_int_enum_submitted(item:int, property_name:String, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(item))
 
-static func _on_export_number_submitted(value:float, property_name:String, callable: Callable) -> void:
+static func _on_export_number_submitted(property_name:String, value:float, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(value))
 
 static func _on_export_file_submitted(property_name:String, value:String, callable: Callable) -> void:
@@ -543,6 +557,13 @@ static func _on_export_string_enum_submitted(value:int, property_name:String, li
 static func _on_export_vector_submitted(property_name:String, value:Variant, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(value))
 
+static func _on_export_vectori_submitted(property_name:String, value:Variant, callable: Callable) -> void:
+	match typeof(value):
+		TYPE_VECTOR2: value = Vector2i(value)
+		TYPE_VECTOR3: value = Vector3i(value)
+		TYPE_VECTOR4: value = Vector4i(value)
+	callable.call(property_name, var_to_str(value))
+
 static func _on_export_dict_submitted(property_name:String, value:Variant, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(value))
 

addons/dialogic/Editor/Common/broken_reference_manager.gd

@@ -205,7 +205,7 @@ func display_search_results(finds:Array[Dictionary]) -> void:
 ## Inspired by how godot highlights stuff in its search results
 func _custom_draw(item:TreeItem, rect:Rect2) -> void:
 	var text := item.get_text(2)
-	var find := item.get_metadata(0)
+	var find: Dictionary = item.get_metadata(0)
 
 	var font: Font = %ReferenceTree.get_theme_font("font")
 	var font_size: int = %ReferenceTree.get_theme_font_size("font_size")

addons/dialogic/Editor/Common/reference_manager_window.gd

@@ -164,7 +164,6 @@ func open() -> void:
 	DialogicResourceUtil.update_directory('dch')
 	DialogicResourceUtil.update_directory('dtl')
 	popup_centered_ratio(0.5)
-	move_to_foreground()
 	grab_focus()
 
 
@@ -173,6 +172,10 @@ func _on_close_requested() -> void:
 	broken_manager.close()
 
 
+func get_change_count() -> int:
+	return len(broken_manager.reference_changes)
+
+
 func update_indicator() -> void:
 	icon_button.get_child(0).visible = !broken_manager.reference_changes.is_empty()
 

addons/dialogic/Editor/Common/sidebar.gd

@@ -168,7 +168,7 @@ func update_resource_list(resources_list: PackedStringArray = []) -> void:
 	resource_tree.clear()
 
 	var character_items: Array = get_directory_items.call(character_directory, filter, load("res://addons/dialogic/Editor/Images/Resources/character.svg"), resources_list)
-	var timeline_items: Array = get_directory_items.call(timeline_directory, filter, get_theme_icon("TripleBar", "EditorIcons"), resources_list)
+	var timeline_items: Array = get_directory_items.call(timeline_directory, filter, load("res://addons/dialogic/Editor/Images/Resources/timeline.svg"), resources_list)
 	var all_items := character_items + timeline_items
 
 	# BUILD TREE
@@ -391,7 +391,7 @@ func _on_resources_tree_item_clicked(_pos: Vector2, mouse_button_index: int) ->
 
 
 func _on_resources_tree_item_collapsed(item:TreeItem) -> void:
-	var collapsed_info := DialogicUtil.get_editor_setting("resource_list_collapsed_info", [])
+	var collapsed_info: Array = DialogicUtil.get_editor_setting("resource_list_collapsed_info", [])
 	if item.get_text(0) in collapsed_info:
 		if not item.collapsed:
 			collapsed_info.erase(item.get_text(0))

addons/dialogic/Editor/Common/update_install_window.gd

@@ -20,7 +20,6 @@ func _ready() -> void:
 func open() -> void:
 	get_parent().popup_centered_ratio(0.5)
 	get_parent().mode = Window.MODE_WINDOWED
-	get_parent().move_to_foreground()
 	get_parent().grab_focus()
 
 
@@ -109,7 +108,7 @@ func _on_update_manager_downdload_completed(result:int):
 func _on_resources_reimported(resources:Array) -> void:
 	if is_inside_tree():
 		await get_tree().process_frame
-		get_parent().move_to_foreground()
+		get_parent().grab_focus()
 
 
 func markdown_to_bbcode(text:String) -> String:

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

@@ -450,6 +450,6 @@ func _on_EventNode_gui_input(event:InputEvent) -> void:
 			popup.current_event = self
 			popup.popup_on_parent(Rect2(get_global_mouse_position(), Vector2()))
 			if resource.help_page_path == "":
-				popup.set_item_disabled(2, true)
+				popup.set_item_disabled(4, true)
 			else:
-				popup.set_item_disabled(2, false)
+				popup.set_item_disabled(4, false)

addons/dialogic/Editor/Events/Fields/field_file.gd

@@ -23,6 +23,7 @@ var resource_icon: Texture:
 var max_width := 200
 var current_value: String
 var hide_reset := false
+var show_editing_button := false
 
 #endregion
 
@@ -36,6 +37,9 @@ func _ready() -> void:
 	%OpenButton.icon = get_theme_icon("Folder", "EditorIcons")
 	%OpenButton.button_down.connect(_on_OpenButton_pressed)
 
+	%EditButton.icon = get_theme_icon("Edit", "EditorIcons")
+	%EditButton.button_down.connect(_on_EditButton_pressed)
+
 	%ClearButton.icon = get_theme_icon("Reload", "EditorIcons")
 	%ClearButton.button_up.connect(clear_path)
 	%ClearButton.visible = !hide_reset
@@ -72,6 +76,8 @@ func _set_value(value: Variant) -> void:
 		%Field.custom_minimum_size.x = 0
 		%Field.expand_to_text_length = true
 
+	%EditButton.visible = show_editing_button and value
+
 	if not %Field.text == text:
 		value_changed.emit(property_name, current_value)
 		%Field.text = text
@@ -94,6 +100,11 @@ func _on_file_dialog_selected(path:String) -> void:
 	value_changed.emit(property_name, path)
 
 
+func _on_EditButton_pressed() -> void:
+	if ResourceLoader.exists(current_value):
+		EditorInterface.inspect_object(load(current_value), "", true)
+
+
 func clear_path() -> void:
 	_set_value("")
 	value_changed.emit(property_name, "")