Merge branch 'main' of https://github.com/coppolaemilio/dialogic

Author: coppolaemilio

addons/dialogic/Editor/CharacterEditor/character_editor_tab_general.gd

@@ -43,7 +43,7 @@ func _load_character(resource:DialogicCharacter) -> void:
 func _save_changes(resource:DialogicCharacter) -> DialogicCharacter:
 	resource.display_name = %DisplayNameLineEdit.text
 	resource.color = %ColorPickerButton.color
-	var nicknames = []
+	var nicknames := []
 	for n_name in %NicknameLineEdit.text.split(','):
 		nicknames.append(n_name.strip_edges())
 	resource.nicknames = nicknames

addons/dialogic/Editor/Common/sidebar.gd

@@ -67,9 +67,15 @@ func update_resource_list() -> void:
 	var current_file := ""
 	if editors_manager.current_editor and editors_manager.current_editor.current_resource:
 		current_file = editors_manager.current_editor.current_resource.resource_path
+	
 	var character_directory: Dictionary = editors_manager.resource_helper.character_directory
 	var timeline_directory: Dictionary = editors_manager.resource_helper.timeline_directory
 	var latest_resources: Array = DialogicUtil.get_project_setting('dialogic/editor/last_resources', [])
+	for res in latest_resources:
+		if !FileAccess.file_exists(res):
+			latest_resources.erase(res)
+	ProjectSettings.set_setting('dialogic/editor/last_resources', latest_resources)
+	
 	%ResourcesList.clear()
 	var idx := 0
 	for character in character_directory.values():

addons/dialogic/Editor/TimelineEditor/TextEditor/syntax_highlighter.gd

@@ -34,28 +34,29 @@ var shortcode_param_color : Color
 var shortcode_value_color : Color
 
 func _init():
-	# Load colors from editor settings 
-	var editor_settings = DialogicUtil.get_dialogic_plugin().editor_interface.get_editor_settings()
-	normal_color = editor_settings.get('text_editor/theme/highlighting/text_color')
-	comment_color = editor_settings.get('text_editor/theme/highlighting/comment_color')
-	text_effect_color = normal_color.darkened(0.5)
-	choice_color = editor_settings.get('text_editor/theme/highlighting/function_color')
-	
-	code_flow_color = editor_settings.get("text_editor/theme/highlighting/control_flow_keyword_color")
-	boolean_operator_color = code_flow_color.lightened(0.5)
-	variable_color = editor_settings.get('text_editor/theme/highlighting/engine_type_color')
-	string_color = editor_settings.get('text_editor/theme/highlighting/string_color')
-	
-	
-	shortcode_color =  editor_settings.get('text_editor/theme/highlighting/gdscript/annotation_color')
-	shortcode_param_color = editor_settings.get('text_editor/theme/highlighting/gdscript/node_path_color')
-	shortcode_value_color = editor_settings.get('text_editor/theme/highlighting/gdscript/node_reference_color')
-	
-	keyword_VAR_color = editor_settings.get('text_editor/theme/highlighting/keyword_color')
-	
-	character_event_color = editor_settings.get('text_editor/theme/highlighting/symbol_color')
-	character_name_color = editor_settings.get('text_editor/theme/highlighting/executing_line_color')
-	character_portrait_color = character_name_color.lightened(0.6)
+	# Load colors from editor settings
+	if DialogicUtil.get_dialogic_plugin():
+		var editor_settings = DialogicUtil.get_dialogic_plugin().editor_interface.get_editor_settings()
+		normal_color = editor_settings.get('text_editor/theme/highlighting/text_color')
+		comment_color = editor_settings.get('text_editor/theme/highlighting/comment_color')
+		text_effect_color = normal_color.darkened(0.5)
+		choice_color = editor_settings.get('text_editor/theme/highlighting/function_color')
+
+		code_flow_color = editor_settings.get("text_editor/theme/highlighting/control_flow_keyword_color")
+		boolean_operator_color = code_flow_color.lightened(0.5)
+		variable_color = editor_settings.get('text_editor/theme/highlighting/engine_type_color')
+		string_color = editor_settings.get('text_editor/theme/highlighting/string_color')
+
+
+		shortcode_color =  editor_settings.get('text_editor/theme/highlighting/gdscript/annotation_color')
+		shortcode_param_color = editor_settings.get('text_editor/theme/highlighting/gdscript/node_path_color')
+		shortcode_value_color = editor_settings.get('text_editor/theme/highlighting/gdscript/node_reference_color')
+
+		keyword_VAR_color = editor_settings.get('text_editor/theme/highlighting/keyword_color')
+
+		character_event_color = editor_settings.get('text_editor/theme/highlighting/symbol_color')
+		character_name_color = editor_settings.get('text_editor/theme/highlighting/executing_line_color')
+		character_portrait_color = character_name_color.lightened(0.6)
 
 	shortcode_regex.compile("\\W*\\[(?<id>\\w*)(?<args>[^\\]]*)?")
 	shortcode_param_regex.compile('((?<parameter>[^\\s=]*)\\s*=\\s*"(?<value>([^=]|\\\\=)*)(?<!\\\\)")')

addons/dialogic/Editor/editors_manager.gd

@@ -78,11 +78,17 @@ func _on_editors_tab_changed(tab:int) -> void:
 
 
 func edit_resource(resource:Resource, save_previous:bool = true) -> void:
+	if current_editor and save_previous:
+		current_editor._save_resource()
+	
 	## Update the latest resource lis
 	var used_resources:Array = DialogicUtil.get_project_setting('dialogic/editor/last_resources', [])
+	
 	if resource.resource_path in used_resources:
 		used_resources.erase(resource.resource_path)
+	
 	used_resources.push_front(resource.resource_path)
+	
 	ProjectSettings.set_setting('dialogic/editor/last_resources', used_resources)
 	ProjectSettings.save()
 
@@ -91,7 +97,7 @@ func edit_resource(resource:Resource, save_previous:bool = true) -> void:
 	for editor in editors.values():
 		if editor.get('extension', '') == extension:
 			editor['node']._open_resource(resource)
-			open_editor(editor['node'], save_previous)
+			open_editor(editor['node'], false)
 
 	resource_opened.emit(resource)
 
@@ -107,7 +113,6 @@ func toggle_editor(editor) -> void:
 ## Shows the given editor
 func open_editor(editor:DialogicEditor, save_previous: bool = true, extra_info:Variant = null) -> void:
 
-	
 	if current_editor and save_previous:
 		current_editor._save_resource()
 

addons/dialogic/Events/Audio/subsystem_audio.gd

@@ -83,7 +83,7 @@ func play_sound(path:String, volume:float = 0.0, audio_bus:String = "Master", lo
 		new_sound_node.bus = audio_bus
 		add_child(new_sound_node)
 		new_sound_node.play()
-		new_sound_node.finished.connect(queue_free)
+		new_sound_node.finished.connect(new_sound_node.queue_free)
 
 func stop_all_sounds() -> void:
 	var sound_nodes: Array = get_tree().get_nodes_in_group('dialogic_sound_player')

addons/dialogic/Events/Text/subsystem_text.gd

@@ -140,4 +140,4 @@ func update_character_names() -> void:
 			if nickname.strip_edges():
 				character_colors[nickname.strip_edges()] = dch.color
 
-	color_regex.compile('(?<=\\W)(?<name>'+str(character_colors.keys()).trim_prefix('["').trim_suffix('"]').replace('", "', '|')+')(?=\\W|$)')
+	color_regex.compile('(?<=\\W|^)(?<name>'+str(character_colors.keys()).trim_prefix('["').trim_suffix('"]').replace('", "', '|')+')(?=\\W|$)')

addons/dialogic/Other/DialogicUtil.gd

@@ -31,7 +31,9 @@ static func listdir(path: String, files_only: bool = true, throw_error:bool = tr
 
 static func get_dialogic_plugin() -> Node:
 	var tree: SceneTree = Engine.get_main_loop()
-	return tree.get_root().get_child(0).get_node('DialogicPlugin')
+	if tree.get_root().get_child(0).has_node('DialogicPlugin'):
+		return tree.get_root().get_child(0).get_node('DialogicPlugin')
+	return null
 
 
 static func list_resources_of_type(extension:String) -> Array: