Skip to content

Commit 92216c7

Browse files
committed
Prerelease Commit
Changes version and does two pretty safe little bug-fixes.
1 parent ca3ae1f commit 92216c7

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

addons/dialogic/Editor/CharacterEditor/character_editor.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ func add_portrait(portrait_name:String='New portrait', portrait_data:Dictionary=
371371

372372
func add_portrait_group() -> void:
373373
var parent_item: TreeItem = %PortraitTree.get_root()
374-
if %PortraitTree.get_selected() and %PortraitTree.get_selected().get_metadata(0).has('group'):
374+
if %PortraitTree.get_selected() and %PortraitTree.get_selected().get_metadata(0) and %PortraitTree.get_selected().get_metadata(0).has('group'):
375375
parent_item = %PortraitTree.get_selected()
376376
var item: TreeItem = %PortraitTree.add_portrait_group("Group", parent_item)
377377
item.set_meta('new', true)

addons/dialogic/Modules/Character/subsystem_portraits.gd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,11 @@ func change_speaker(speaker: DialogicCharacter = null, portrait := "") -> void:
683683
character_node.hide()
684684
if not container.is_visible_in_tree():
685685
await get_tree().process_frame
686+
687+
# There is chance that the style changed (due to a speaker style) and thus the character node is gone now.
688+
# In that case, just give up.
689+
if not is_instance_valid(character_node):
690+
return
686691
character_node.show()
687692
var join_animation: String = ProjectSettings.get_setting('dialogic/animations/join_default', "Fade In Up")
688693
join_animation = DialogicPortraitAnimationUtil.guess_animation(join_animation, DialogicPortraitAnimationUtil.AnimationType.IN)

addons/dialogic/plugin.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ name="Dialogic"
44
description="Create dialogs, characters and scenes to display conversations in your Godot games.
55
https://github.com/dialogic-godot/dialogic"
66
author="Jowan Spooner, Emi, Cake and more!"
7-
version="2.0-Alpha-17 WIP (Godot 4.2+)"
7+
version="2.0-Alpha-17 (Godot 4.3+)"
88
script="plugin.gd"

0 commit comments

Comments
 (0)