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

Port to Godot 4 #71

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
fff225f
Rename InkStory.continue to continue_story
Jummit Mar 20, 2023
1618361
Rename InkPath.self to new_self
Jummit Mar 20, 2023
0f14f0a
Update .gitignore for Godot 4
Jummit Mar 20, 2023
42bb230
Remove tests
Jummit Mar 20, 2023
b595950
Convert using built-in tool
Jummit Mar 20, 2023
154cd7f
Open once
Jummit Mar 20, 2023
b518d97
Save main scene
Jummit Mar 20, 2023
59073dc
Use super constructor
Jummit Mar 20, 2023
19d7ef3
Remove unnecessary imports
Jummit Mar 20, 2023
370b1c8
Reorder OS.execute arguments
Jummit Mar 20, 2023
a75fa24
Replace Array.remove with remove_at
Jummit Mar 20, 2023
2c2f202
Fix falsly replaced to_json
Jummit Mar 20, 2023
2d89c67
Fix import plugin signatures
Jummit Mar 20, 2023
436b991
Reorder ResourceSaver.save arguments
Jummit Mar 20, 2023
1b15eb4
Fix File usage
Jummit Mar 20, 2023
b64e26a
Fix DirAccess usage and script templates
Jummit Mar 20, 2023
c972b3c
Remove self-references
Jummit Mar 20, 2023
54ef83b
Replace function calls with types
Jummit Mar 20, 2023
34a03a4
Fix doubly typed member
Jummit Mar 20, 2023
db5e785
Correctly override set and get
Jummit Mar 20, 2023
a2d820b
Rename null to new_null
Jummit Mar 20, 2023
716107f
Rename conflicting member
Jummit Mar 20, 2023
f6e46bf
Fix type
Jummit Mar 20, 2023
c68ccb5
Fix dialog setups
Jummit Mar 20, 2023
537bd17
Rename get_icon to get_theme_icon
Jummit Mar 20, 2023
9aca00a
Fix align names
Jummit Mar 20, 2023
afbce4f
Fix multiline connections
Jummit Mar 20, 2023
0c83343
Save project
Jummit Mar 20, 2023
064688a
Fix getters and setters
Jummit Mar 20, 2023
cf21f17
Fix joining
Jummit Mar 20, 2023
e8f81da
Remove whitespace
Jummit Mar 20, 2023
9be3a17
Remove uses of callable
Jummit Mar 20, 2023
14d629c
Remove parenthesis
Jummit Mar 20, 2023
ec0af12
Avoid lookup using keyword
Jummit Mar 20, 2023
e1b42ab
Re-import
Jummit Mar 20, 2023
2865a3d
Fix throw_exception calls
Jummit Mar 20, 2023
0c536ed
Fix StringValue creation
Jummit Mar 20, 2023
a9b8e37
Fix JSON parsing
Jummit Mar 20, 2023
44d9bf3
Add message to assert
Jummit Mar 20, 2023
9ecca3a
Fix types
Jummit Mar 20, 2023
36aea9c
Rename invert to reverse
Jummit Mar 21, 2023
3a423b0
Remove unecessary uses of self
Jummit Mar 21, 2023
2a591df
Fix autowrap
Jummit Mar 21, 2023
6f35371
Fix bottom panel overflow
Jummit Mar 21, 2023
fa96b86
Add GUT addon
Jummit Mar 21, 2023
bf0cedb
Add tests back
Jummit Mar 21, 2023
edd1fd6
Use deep copy in tests
Jummit Mar 21, 2023
554e822
Fix arithmetic tests
Jummit Mar 21, 2023
e047e6f
Save project
Jummit Mar 21, 2023
92dfb14
Change scene to runner
Jummit Mar 21, 2023
00ddb9d
Ignore shadowed variables
Jummit Mar 21, 2023
d9e2cde
Replace as_or_null with casting
Jummit Mar 21, 2023
a29e884
Replace is_ink_class with is operator
Jummit Mar 21, 2023
99dde30
Remove casting
Jummit Mar 21, 2023
6668546
Remove is_class and get_class
Jummit Mar 21, 2023
8128e73
Remove warning-ignores
Jummit Mar 21, 2023
8a89598
Fix warnings
Jummit Mar 21, 2023
4364773
Remove unecessary Callable constructors
Jummit Mar 21, 2023
698fce0
Connect using signal references
Jummit Mar 21, 2023
0a3e79e
Use signal references in disconnect calls
Jummit Mar 21, 2023
3efb5d7
Use signal references in is_connect calls
Jummit Mar 21, 2023
d90ad25
Fix misspelling
Jummit Mar 21, 2023
ff96ec6
Fix node path
Jummit Mar 21, 2023
f3c1032
Remove class used to sort
Jummit Mar 22, 2023
bd74b67
Add type hints
Jummit Mar 22, 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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Godot-specific ignores
.import/
.godot/
export.cfg
export_presets.cfg
*.pck
Expand Down
17 changes: 13 additions & 4 deletions .gut_editor_config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"background_color": "ff262626",
"compact_mode": false,
"config_file": "res://.gutconfig.json",
"dirs": [
"res://test/unit",
Expand All @@ -11,6 +12,7 @@
"font_color": "ffcccccc",
"font_name": "AnonymousPro",
"font_size": 30,
"gut_on_top": true,
"hide_orphans": false,
"ignore_pause": false,
"include_subdirs": false,
Expand All @@ -19,17 +21,24 @@
"junit_xml_timestamp": false,
"log_level": 1,
"opacity": 100,
"paint_after": 0.1,
"panel_options": {
"font_name": "CourierPrime",
"font_size": 30,
"hide_output_text": false,
"hide_result_tree": false,
"hide_settings": false,
"use_colors": false
},
"post_run_script": "",
"pre_run_script": "",
"prefix": "test_",
"selected": null,
"should_exit": true,
"should_exit": false,
"should_exit_on_success": true,
"should_maximize": false,
"show_help": false,
"suffix": ".gd",
"tests": [

],
"tests": [],
"unit_test_name": null
}
17 changes: 17 additions & 0 deletions .gut_editor_shortcuts.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[main]

run_all=Object(Shortcut,"resource_local_to_scene":false,"resource_name":"","events":[Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
],"script":null)

run_current_script=Object(Shortcut,"resource_local_to_scene":false,"resource_name":"","events":[Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
],"script":null)

run_current_inner=Object(Shortcut,"resource_local_to_scene":false,"resource_name":"","events":[Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
],"script":null)

run_current_test=Object(Shortcut,"resource_local_to_scene":false,"resource_name":"","events":[Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
],"script":null)

panel_button=Object(Shortcut,"resource_local_to_scene":false,"resource_name":"","events":[Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
],"script":null)

4 changes: 2 additions & 2 deletions .inkgd_ink.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[inkgd]

stories=[ {
stories=[{
"source_file_path": "res://examples/ink/the_intercept/the_intercept.ink",
"target_file_path": "res://examples/ink/the_intercept/the_intercept.ink.json",
"watched_folder_path": "res://examples/ink/the_intercept/"
Expand All @@ -16,7 +16,7 @@ stories=[ {
"source_file_path": "res://examples/ink/not_a_halloween_game/not_a_halloween_game.ink",
"target_file_path": "res://examples/ink/not_a_halloween_game/not_a_halloween_game.ink.json",
"watched_folder_path": "res://examples/ink/not_a_halloween_game"
} ]
}]

[format]

Expand Down
Loading