Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to autoskip and wait event pausing #2214

Merged
merged 3 commits into from
May 9, 2024
Merged

Fix to autoskip and wait event pausing #2214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3a2632
Fix autoskip enable_on_visited and disable_on_unread_text
Jowan-Spooner May 4, 2024
8f487fa
Make sure wait event timer stops when scene tree is paused
Jowan-Spooner May 4, 2024
a66ff62
Small cleanup
Jowan-Spooner May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/dialogic/Modules/Core/subsystem_input.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func resume() -> void:
func post_install() -> void:
dialogic.Settings.connect_to_change('autoadvance_delay_modifier', auto_advance._update_autoadvance_delay_modifier)
auto_skip.toggled.connect(_on_autoskip_toggled)
auto_skip._init()
add_child(input_block_timer)
input_block_timer.one_shot = true

Expand Down
4 changes: 2 additions & 2 deletions addons/dialogic/Modules/History/subsystem_history.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ func _update_saved_connection(to_connect: bool) -> void:
####################################################################################################

func _ready() -> void:
var _result := dialogic.event_handled.connect(store_full_event)
_result = dialogic.event_handled.connect(_check_seen)
dialogic.event_handled.connect(store_full_event)
dialogic.event_handled.connect(_check_seen)

simple_history_enabled = ProjectSettings.get_setting('dialogic/history/simple_history_enabled', simple_history_enabled )
full_event_history_enabled = ProjectSettings.get_setting('dialogic/history/full_history_enabled', full_event_history_enabled)
Expand Down
2 changes: 1 addition & 1 deletion addons/dialogic/Modules/Wait/event_wait.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func _execute() -> void:
dialogic.Text.update_dialog_text('')
dialogic.Text.hide_textbox()
dialogic.current_state = dialogic.States.WAITING
await dialogic.get_tree().create_timer(time, true, DialogicUtil.is_physics_timer()).timeout
await dialogic.get_tree().create_timer(time, false, DialogicUtil.is_physics_timer()).timeout
dialogic.current_state = dialogic.States.IDLE

finish()
Expand Down
Loading