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.

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

Extend Auto-Advance #1755

Merged
merged 57 commits into from
Oct 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
6abb964
Calculate typewriter's time taken.
CakeVR Sep 22, 2023
cc144e8
Clear `text_time_taken`'s state info.
CakeVR Sep 22, 2023
4c3adff
Add Auto-Advance UI and connect to signals.
CakeVR Sep 23, 2023
b9e242d
Add AutoAdvance UI to `_refresh`.
CakeVR Sep 23, 2023
b63156a
Fix `effect_pause` incorrectly accessing `text_speed`.
CakeVR Sep 23, 2023
6ce0e76
Remove `set_autoadvance`'s speed responsibility.
CakeVR Sep 23, 2023
7f9d65c
Add `get` and `set` methods for Delay state info.
CakeVR Sep 23, 2023
6d94b40
Clear Delay state info in `clear_game_state`.
CakeVR Sep 23, 2023
c76c18a
Add BBCode Strip utility.
CakeVR Sep 23, 2023
9403f0d
Enhance `start_autoadvance` with new Delays.
CakeVR Sep 23, 2023
c847041
Remove unused range input.
CakeVR Sep 23, 2023
4527948
Swap `%DelayModifier` and `%PerWordDelay` value assignment.
CakeVR Sep 23, 2023
c2154fc
Add support of temporary Auto-Advance.
CakeVR Sep 23, 2023
6d06a32
Simplify `get_autoadvance_time`'s complexity.
CakeVR Sep 23, 2023
f3010a5
Add documentation to `get_autoadvance_progress`.
CakeVR Sep 23, 2023
c39abbb
Add `temp_wait_time` to `start_autoadvance`.
CakeVR Sep 23, 2023
191d1db
Change `autoadvance_delay_modifier` to `Dialogic.Settings`.
CakeVR Sep 23, 2023
bab65cb
Set Delay per Word Default Value to `0`.
CakeVR Sep 23, 2023
e3bdbab
Store Auto-Advance Settings in `autoadvance` state info.
CakeVR Sep 24, 2023
4b5d839
Rename `dialogic/text/autoadvance` to `dialogic/text/autoadvance_enab…
CakeVR Sep 24, 2023
20951b7
Fix calculation of `AudioPlayer` remaining time.
CakeVR Sep 24, 2023
ebd1584
Change input handler to utilise `get_autoadvance_info`.
CakeVR Sep 24, 2023
350d106
Smaller code corrections
Jowan-Spooner Sep 25, 2023
33b1911
Fix incorrect Ignored Characters to `String` conversion.
CakeVR Sep 25, 2023
98e08ab
Fix incorrect default values in Text `_refresh`.
CakeVR Sep 25, 2023
8603556
Fix incorrect Auto-Advance default values upon reset.
CakeVR Sep 25, 2023
2214259
Fix `PerCharacterDelay`'s signal.
CakeVR Sep 25, 2023
ae82020
Use `Dictionary` type for `autoadvance_ignored_characters` project se…
CakeVR Oct 1, 2023
ec066ce
Fix documentation phrasing.
CakeVR Oct 3, 2023
2509e4e
Update Auto-Advance tooltips.
CakeVR Oct 3, 2023
a111c86
Add `AutoAdvanceButton` to default layout.
CakeVR Oct 5, 2023
e3b0488
Handle `AutoAdvanceButton` related signals.
CakeVR Oct 5, 2023
71c4658
Disable auto-advance on recognised user input.
CakeVR Oct 5, 2023
1c686d1
Use `Settings.autoadvance_enabled` instead `current_state_info`.
CakeVR Oct 5, 2023
07538bd
Add information about `Dialogic.Settings.autoadvance_enabled`.
CakeVR Oct 5, 2023
7710d46
Check for `cancel_on_user_input` before cancelling auto-advance.
CakeVR Oct 5, 2023
b430a6e
Add `cancel_on_user_input` to `autoadvance`'s state info.
CakeVR Oct 5, 2023
18986d7
Check auto-advance capability using `should_autoadvance` instead.
CakeVR Oct 5, 2023
e6994fa
Reset `text_time_taken` when revealing new text.
CakeVR Oct 8, 2023
47e9493
Disable Auto-Advance on resetting.
CakeVR Oct 8, 2023
800ce51
Add Auto-Advance setting to wait and ignore Voice Audio.
CakeVR Oct 8, 2023
5be3cb7
Remove `Settings.connect_to_change` to `autoadvance_enabled`.
CakeVR Oct 8, 2023
46ff438
Add flags to cancel Auto-Advance.
CakeVR Oct 8, 2023
efd885e
Add function to check if the user can cancel Auto-Advance.
CakeVR Oct 8, 2023
5e068ad
Rework functions to set Auto-Advance.
CakeVR Oct 8, 2023
ec02e45
Remove note about `Dialogic.Settings.autoadvance_enabled`.
CakeVR Oct 11, 2023
bf03f5c
Use renamed `waiting_for_next_event`.
CakeVR Oct 11, 2023
3fbec00
Stop Auto-Advance timer on completion.
CakeVR Oct 11, 2023
36f6b15
Redesign Auto-Advance in Text subsystem.
CakeVR Oct 11, 2023
f17c300
Stop input handler on Dialogic Input Action signal.
CakeVR Oct 11, 2023
6440459
Simplify and update code & UI
Jowan-Spooner Oct 12, 2023
3036c61
Merge remote-tracking branch 'origin/main' into extend-auto-advance
Jowan-Spooner Oct 12, 2023
05386b6
Fixing merge conflicts
Jowan-Spooner Oct 13, 2023
acd7100
Simplify/Reorder some more methods
Jowan-Spooner Oct 13, 2023
c5b9f5a
Code reorder
Jowan-Spooner Oct 13, 2023
92bd9c3
Allow autoadvance time override of 0
Jowan-Spooner Oct 13, 2023
7925c57
Reset default layout
Jowan-Spooner Oct 13, 2023
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
Prev Previous commit
Next Next commit
Fix PerCharacterDelay's signal.
  • Loading branch information
CakeVR committed Sep 25, 2023
commit 22142595eb0df3dc2acb1834f3695645e69098b4
2 changes: 1 addition & 1 deletion addons/dialogic/Modules/Text/settings_text.tscn
Original file line number Diff line number Diff line change
@@ -456,7 +456,7 @@ fit_content = true
[connection signal="toggled" from="VBoxContainer/HBoxContainer AutoAdvance/AutoAdvance" to="." method="_on_Autoadvance_toggled"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer AutoAdvance/ResetDelaysButton" to="." method="_on_ResetDelays_button_up"]
[connection signal="value_changed" from="VBoxContainer/Gridcontainer Autoadvance/HBoxContainer FixedDelay/Box FixedDelay/FixedDelay" to="." method="_on_FixedDelay_value_changed"]
[connection signal="value_changed" from="VBoxContainer/Gridcontainer Autoadvance/HBoxContainer PerCharacterDelay/Box PerWordCharacter/PerCharacterDelay" to="." method="_on_PerWordDelay_value_changed"]
[connection signal="value_changed" from="VBoxContainer/Gridcontainer Autoadvance/HBoxContainer PerCharacterDelay/Box PerWordCharacter/PerCharacterDelay" to="." method="_on_PerCharacterDelay_value_changed"]
[connection signal="value_changed" from="VBoxContainer/Gridcontainer Autoadvance/HBoxContainer PerWordDelay/Box PerWordDelay/PerWordDelay" to="." method="_on_PerWordDelay_value_changed"]
[connection signal="toggled" from="VBoxContainer/Gridcontainer Autoadvance/HBoxContainer IgnoredCharacters/IgnoredCharactersEnabled" to="." method="_on_IgnoredCharactersEnabled_toggled"]
[connection signal="text_changed" from="VBoxContainer/Gridcontainer Autoadvance/HBoxContainer IgnoredCharacters/Box IgnoredCharacters/IgnoredCharacters" to="." method="_on_IgnoredCharacters_text_changed"]