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

Begin upgrading to Godot 4.3 and latest Blockflow #2

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Begin upgrading to Godot 4.3 and latest Blockflow #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/blockflow
Open in desktop
Submodule blockflow updated 67 files
+1 −0 .gitattributes
+10 −3 .gitignore
+43 −0 CHANGELOG.md
+133 −0 CODE_OF_CONDUCT.md
+78 −0 CONTRIBUTING.md
+3 −1 README.md
+28 −34 blockflow.gd
+14 −4 collection.gd
+0 −91 command_list.gd
+0 −253 command_manager.gd
+6 −363 command_processor.gd
+120 −0 commands/README.md
+269 −38 commands/command.gd
+3 −22 commands/command_goto.gd
+7 −1 commands/command_print.gd
+59 −25 commands/command_set.gd
+1 −1 commands/command_wait.gd
+4 −0 core/README.md
+204 −0 core/command_record.gd
+32 −0 core/constants.gd
+64 −46 core/plugin_script.gd
+30 −1 core/utils.gd
+4 −0 debugger/README.md
+6 −6 debugger/blockflow_debugger.gd
+0 −0 debugger/constants.gd
+5 −6 debugger/debugger_messages.gd
+0 −78 debugger/timeline_debugger.gd
+0 −95 debugger/timeline_debugger.tscn
+11 −0 documentation/Collection.md
+112 −0 documentation/OVERVIEW.md
+3 −0 documentation/README.md
+4 −0 editor/README.md
+2 −1 editor/command_block/block.gd
+514 −0 editor/command_block/fancy_block/block.gd
+26 −0 editor/command_block/fancy_block/block_cell.gd
+7 −7 editor/command_block/root.gd
+9 −0 editor/command_list.gd
+37 −1 editor/constants.gd
+4 −6 editor/displayer.gd
+113 −0 editor/displayer/fancy_displayer.gd
+123 −0 editor/displayer/simple_displayer.gd
+82 −38 editor/editor.gd
+1 −1 editor/editor_command.gd
+31 −0 editor/inspector/collection_inspector.gd
+0 −21 editor/playground/all_commands.gd
+0 −20 editor/playground/all_commands.tscn
+0 −4 editor/playground/editor_playground.gd
+0 −77 editor/playground/timeline_with_all_commands.tres
+10 −0 editor/shortcuts/copy.tres
+8 −0 editor/shortcuts/delete.tres
+10 −0 editor/shortcuts/duplicate.tres
+8 −0 editor/shortcuts/move_down.tres
+9 −0 editor/shortcuts/move_up.tres
+8 −0 editor/shortcuts/open_menu.tres
+10 −0 editor/shortcuts/paste.tres
+171 −0 editor/template_generator.gd
+20 −0 editor/theme.tres
+594 −0 editor/views/editor_view.gd
+6 −0 examples/printing_to_console/example.tscn
+18 −0 examples/printing_to_console/example_collection.tres
+0 −0 icons/plugin_icon.svg
+5 −3 icons/plugin_icon.svg.import
+0 −0 icons/plugin_icon_flat.svg
+5 −3 icons/plugin_icon_flat.svg.import
+364 −0 processors/command_processor.gd
+0 −136 timeline.gd
+0 −12 timeline_converter.gd
2 changes: 1 addition & 1 deletion addons/textalog
Open in desktop
Submodule textalog updated 1 files
+25 −14 scripts/dialog_view.gd
30 changes: 15 additions & 15 deletions project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_version=5

config/name="NovelTest"
run/main_scene="res://scenes/main.tscn"
config/features=PackedStringArray("4.2", "GL Compatibility")
config/features=PackedStringArray("4.3", "GL Compatibility")
config/icon="res://icon.png"

[autoload]
Expand All @@ -35,47 +35,47 @@ movie_writer/movie_file="D:/Development/Godot/Projects 4.0/NovelTest/dev_footage

[editor_plugins]

enabled=PackedStringArray("res://addons/blockflow/plugin.cfg", "res://addons/textalog/plugin.cfg")
enabled=PackedStringArray("res://addons/blockflow/plugin.cfg")

[input]

next={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null)
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
]
}
previous={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"location":0,"echo":false,"script":null)
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
]
}
press={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null)
]
}
present={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
]
}
skip={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
auto={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194328,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194328,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
]
}

Expand Down
2 changes: 2 additions & 0 deletions timelines/choicetest/choices/0.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ script = ExtResource("2_eixfw")
showname = ""
dialog = "You will now enter \"Basic Dialogue\" timeline."
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
2 changes: 2 additions & 0 deletions timelines/choicetest/choices/1.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ script = ExtResource("2_wfcod")
showname = ""
dialog = "You will now enter \"Testimony Test\""
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
2 changes: 2 additions & 0 deletions timelines/choicetest/choices/2.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ script = ExtResource("2_1qiec")
showname = ""
dialog = "You will now enter \"Investigation Test\""
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
2 changes: 2 additions & 0 deletions timelines/choicetest/choicetest.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ script = ExtResource("6_ow41s")
showname = ""
dialog = "MAKE YOUR CHOICE"
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = true
background_color = 0
Expand Down
2 changes: 2 additions & 0 deletions timelines/investigation.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ script = ExtResource("2_yh0lv")
showname = ""
dialog = "among us funny moments"
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
24 changes: 24 additions & 0 deletions timelines/test.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ script = ExtResource("5_6pb2j")
showname = ""
dialog = ""
additive = false
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = false
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = true
background_color = 0
Expand Down Expand Up @@ -122,11 +125,14 @@ script = ExtResource("5_6pb2j")
showname = "Godette"
dialog = "Hello there! This is a test."
additive = false
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand All @@ -150,11 +156,14 @@ script = ExtResource("5_6pb2j")
showname = "Godette"
dialog = "Oh, this is not your first time here! "
additive = false
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = true
background_color = 0
Expand Down Expand Up @@ -189,11 +198,14 @@ script = ExtResource("5_6pb2j")
showname = "Godette"
dialog = "Guess I'll be brief."
additive = true
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down Expand Up @@ -238,11 +250,14 @@ script = ExtResource("5_6pb2j")
showname = "Godette"
dialog = "I am speaking to you... "
additive = false
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = true
background_color = 0
Expand Down Expand Up @@ -277,11 +292,14 @@ script = ExtResource("5_6pb2j")
showname = "Godette"
dialog = "Right now."
additive = true
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down Expand Up @@ -370,11 +388,14 @@ script = ExtResource("5_6pb2j")
showname = "Dale"
dialog = "Dale Jumpscare"
additive = false
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = true
background_color = 0
Expand Down Expand Up @@ -420,11 +441,14 @@ script = ExtResource("5_6pb2j")
showname = "Godette"
dialog = "Anyway, bye!"
additive = false
text_speed = 6
letter_delay = 0.02
blip_sound = "male"
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
4 changes: 4 additions & 0 deletions timelines/testimony1/present1.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ script = ExtResource("1_dnfd8")
showname = "Godette"
dialog = "What is this? Huh?"
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down Expand Up @@ -72,11 +74,13 @@ script = ExtResource("1_dnfd8")
showname = "Godette"
dialog = "oh shit you presented the right evidence, great job"
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
2 changes: 2 additions & 0 deletions timelines/testimony1/press1.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ script = ExtResource("1_ffunr")
showname = "Godette"
dialog = "what"
additive = false
text_speed = 6
letter_delay = 0.02
wait_until_finished = true
speaking_character = ""
bump_speaker = false
highlight_speaker = false
hide_dialog = false
bookmark = &""
continue_at_end = false
background_color = 0
Expand Down
Loading