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 typo in Subsystem reference #2044

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Fix typo in Subsystem reference #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
555612a
Fix history event
Jowan-Spooner Jan 24, 2024
3b5e29a
Fix typo
Jowan-Spooner Jan 24, 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
2 changes: 1 addition & 1 deletion addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/animations.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func _on_textbox_hide() -> void:
if animation_out == AnimationsOut.NONE:
return
play('RESET')
var animation_system : Node = DialogicUtil.autoload().get(&'Animation')
var animation_system : Node = DialogicUtil.autoload().get(&'Animations')
animation_system.call(&'start_animating')
match animation_out:
AnimationsOut.POP_OUT:
Expand Down
8 changes: 4 additions & 4 deletions addons/dialogic/Modules/History/event_history.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ var action := Actions.PAUSE
func _execute() -> void:
match action:
Actions.CLEAR:
dialogic.History.full_history = []
dialogic.History.simple_history_content = []
Actions.PAUSE:
dialogic.History.full_history_enabled = false
dialogic.History.simple_history_enabled = false
Actions.RESUME:
dialogic.History.full_history_enabled = true
dialogic.History.simple_history_enabled = true

finish()

Expand All @@ -50,7 +50,7 @@ func get_shortcode_parameters() -> Dictionary:
return {
#param_name : property_info
"action" : {"property": "action", "default": Actions.PAUSE,
"suggestions": func(): return {"Clear":{'value':0}, "Pause":{'value':1}, "Resume":{'value':2}}},
"suggestions": func(): return {"Clear":{'value':0, 'text_alt':['clear']}, "Pause":{'value':1, 'text_alt':['pause']}, "Resume":{'value':2, 'text_alt':['resume', 'start']}}},
}

################################################################################
Expand Down
7 changes: 3 additions & 4 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 @@ -2,9 +2,6 @@ extends DialogicSubsystem

## Subsystem that manages history storing.

signal already_read_event_reached
signal not_read_event_reached

signal open_requested
signal close_requested

Expand All @@ -25,6 +22,8 @@ signal full_event_history_changed
var already_read_history_enabled := false
var already_read_history_content := {}
var _was_last_event_already_read := false
signal already_read_event_reached
signal not_read_event_reached


#region INITIALIZE
Expand Down Expand Up @@ -69,7 +68,7 @@ func get_simple_history() -> Array:
#region FULL EVENT HISTORY
####################################################################################################

# called on each event
## Called on each event
func store_full_event(event:DialogicEvent) -> void:
if !full_event_history_enabled: return
full_event_history_content.append(event)
Expand Down
Loading