From ba4e8ec26c9e9e98ee36be80ae70bb00242a1f6d Mon Sep 17 00:00:00 2001 From: bleeptrack Date: Wed, 6 Sep 2023 16:04:23 +0200 Subject: [PATCH] Upgrade to Godot 4.1 --- .gitignore | 2 + cards/add.svg.import | 33 +-- cards/bisect-bad.svg.import | 33 +-- cards/bisect-good.svg.import | 33 +-- cards/bisect-start.svg.import | 33 +-- cards/branch-delete.svg.import | 33 +-- cards/branch.svg.import | 33 +-- cards/checkout-file.svg.import | 33 +-- cards/checkout-from.svg.import | 33 +-- cards/checkout.svg.import | 33 +-- cards/cherry-pick.svg.import | 33 +-- cards/clone.svg.import | 33 +-- cards/commit-a.svg.import | 33 +-- cards/commit-auto.svg.import | 33 +-- cards/commit.svg.import | 33 +-- cards/fetch.svg.import | 33 +-- cards/file-copy.svg.import | 33 +-- cards/file-delete.svg.import | 33 +-- cards/file-new.svg.import | 33 +-- cards/file-rename.svg.import | 33 +-- cards/init.svg.import | 33 +-- cards/merge-abort.svg.import | 33 +-- cards/merge.svg.import | 33 +-- cards/pull.svg.import | 33 +-- cards/push.svg.import | 33 +-- cards/rebase-continue.svg.import | 33 +-- cards/rebase-interactive.svg.import | 33 +-- cards/rebase.svg.import | 33 +-- cards/reflog.svg.import | 33 +-- cards/reset-file.svg.import | 33 +-- cards/reset-hard.svg.import | 33 +-- cards/reset.svg.import | 33 +-- cards/revert.svg.import | 33 +-- cards/rm.svg.import | 33 +-- cards/show.svg.import | 33 +-- fonts/big.tres | 4 +- fonts/cabin-bold.ttf.import | 33 +++ fonts/cabin-regular.ttf.import | 33 +++ fonts/default.tres | 4 +- fonts/iosevka-regular.ttf.import | 33 +++ fonts/monospace.tres | 4 +- fonts/small.tres | 4 +- images/cli-badge.svg.import | 33 +-- images/commit.svg.import | 33 +-- images/conflict.svg.import | 33 +-- images/file.svg.import | 33 +-- images/head.svg.import | 33 +-- images/modified.svg.import | 33 +-- images/new.svg.import | 33 +-- images/oh-my-git.png.import | 32 +-- images/ref.svg.import | 33 +-- images/remote.svg.import | 33 +-- images/removed.svg.import | 33 +-- images/string.svg.import | 33 +-- images/untracked.svg.import | 33 +-- music/gigantic-greasy-giraffe.ogg.import | 12 +- nodes/blob.svg.import | 33 +-- nodes/commit.svg.import | 33 +-- nodes/document.svg.import | 33 +-- nodes/head.svg.import | 33 +-- nodes/head1.svg.import | 33 +-- nodes/head2.svg.import | 33 +-- nodes/head3.svg.import | 33 +-- nodes/pop.wav.import | 11 +- nodes/ref.svg.import | 33 +-- nodes/tree.svg.import | 33 +-- project.godot | 129 ++++------ scenes/arrow.gd | 4 +- scenes/arrow.tscn | 30 +-- scenes/better_shell.gd | 2 +- scenes/card.gd | 30 +-- scenes/card.tscn | 84 +++---- scenes/card_particles.tscn | 12 +- scenes/cards.gd | 20 +- scenes/cards.tscn | 26 +- scenes/chapter.gd | 5 +- scenes/cli_badge.gd | 10 +- scenes/cli_badge.tscn | 10 +- scenes/drop_area.gd | 20 +- scenes/drop_area.tscn | 4 +- scenes/file_browser.gd | 81 ++++--- scenes/file_browser.tscn | 84 +++---- scenes/file_browser_item.gd | 14 +- scenes/file_browser_item.tscn | 120 ++++----- scenes/game.gd | 32 +-- scenes/helpers.gd | 27 ++- scenes/input_dialog.tscn | 12 +- scenes/level.gd | 4 +- scenes/level_select.gd | 23 +- scenes/level_select.tscn | 54 ++--- scenes/levels.gd | 5 +- scenes/main.gd | 54 ++--- scenes/main.tscn | 235 +++++++----------- scenes/music_button.tscn | 10 +- scenes/no_git.tscn | 74 +++--- scenes/node.gd | 30 +-- scenes/node.tscn | 40 +-- scenes/notification.gd | 2 +- scenes/notification.tscn | 34 +-- scenes/player.tscn | 19 +- scenes/repository.gd | 49 ++-- scenes/repository.tscn | 60 ++--- scenes/sandbox.gd | 9 +- scenes/sandbox.tscn | 57 ++--- scenes/shell.gd | 6 +- scenes/survey.gd | 2 +- scenes/survey.tscn | 70 +++--- scenes/tcp_server.gd | 4 +- scenes/tcp_server_shell.gd | 4 +- scenes/terminal.gd | 45 ++-- scenes/terminal.tscn | 118 ++++----- scenes/text_editor.gd | 5 +- scenes/text_editor.tscn | 51 ++-- scenes/title.gd | 9 +- scenes/title.tscn | 87 +++---- scripts/input_dialog.gd | 8 +- sounds/buzzer.wav.import | 11 +- sounds/poof.wav.import | 11 +- sounds/success.wav.import | 11 +- sounds/swish.wav.import | 11 +- sounds/swoosh.wav.import | 11 +- sounds/typewriter_ding.wav.import | 11 +- styles/theme.tres | 294 +++++++++++------------ 123 files changed, 2184 insertions(+), 2087 deletions(-) create mode 100644 fonts/cabin-bold.ttf.import create mode 100644 fonts/cabin-regular.ttf.import create mode 100644 fonts/iosevka-regular.ttf.import diff --git a/.gitignore b/.gitignore index f02a819..71463a2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /cache/ /dependencies/ /build/ + +.godot diff --git a/cards/add.svg.import b/cards/add.svg.import index cca9696..2767900 100644 --- a/cards/add.svg.import +++ b/cards/add.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/add.svg-6661eafc7f78160aaf9088910aa4975e.stex" +type="CompressedTexture2D" +uid="uid://bf243r0hcafth" +path="res://.godot/imported/add.svg-6661eafc7f78160aaf9088910aa4975e.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/add.svg" -dest_files=[ "res://.import/add.svg-6661eafc7f78160aaf9088910aa4975e.stex" ] +dest_files=["res://.godot/imported/add.svg-6661eafc7f78160aaf9088910aa4975e.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/bisect-bad.svg.import b/cards/bisect-bad.svg.import index c2afba5..f244794 100644 --- a/cards/bisect-bad.svg.import +++ b/cards/bisect-bad.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/bisect-bad.svg-62f0f685f6f91720307692ecdfa16854.stex" +type="CompressedTexture2D" +uid="uid://ukwwe1pc4efr" +path="res://.godot/imported/bisect-bad.svg-62f0f685f6f91720307692ecdfa16854.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/bisect-bad.svg" -dest_files=[ "res://.import/bisect-bad.svg-62f0f685f6f91720307692ecdfa16854.stex" ] +dest_files=["res://.godot/imported/bisect-bad.svg-62f0f685f6f91720307692ecdfa16854.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/bisect-good.svg.import b/cards/bisect-good.svg.import index 50f3eef..e923a93 100644 --- a/cards/bisect-good.svg.import +++ b/cards/bisect-good.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/bisect-good.svg-824dbd02cadbc866adc1cd549a996df6.stex" +type="CompressedTexture2D" +uid="uid://dnenn5r4beip6" +path="res://.godot/imported/bisect-good.svg-824dbd02cadbc866adc1cd549a996df6.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/bisect-good.svg" -dest_files=[ "res://.import/bisect-good.svg-824dbd02cadbc866adc1cd549a996df6.stex" ] +dest_files=["res://.godot/imported/bisect-good.svg-824dbd02cadbc866adc1cd549a996df6.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/bisect-start.svg.import b/cards/bisect-start.svg.import index cd672e1..0a809da 100644 --- a/cards/bisect-start.svg.import +++ b/cards/bisect-start.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/bisect-start.svg-1e5a904f73da711887aa389242772e6d.stex" +type="CompressedTexture2D" +uid="uid://c6fqby43hiai4" +path="res://.godot/imported/bisect-start.svg-1e5a904f73da711887aa389242772e6d.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/bisect-start.svg" -dest_files=[ "res://.import/bisect-start.svg-1e5a904f73da711887aa389242772e6d.stex" ] +dest_files=["res://.godot/imported/bisect-start.svg-1e5a904f73da711887aa389242772e6d.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/branch-delete.svg.import b/cards/branch-delete.svg.import index 6277fe4..2ffea13 100644 --- a/cards/branch-delete.svg.import +++ b/cards/branch-delete.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/branch-delete.svg-fd5a2026e417be4d8604f1634f4cb647.stex" +type="CompressedTexture2D" +uid="uid://gp41005vjxcn" +path="res://.godot/imported/branch-delete.svg-fd5a2026e417be4d8604f1634f4cb647.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/branch-delete.svg" -dest_files=[ "res://.import/branch-delete.svg-fd5a2026e417be4d8604f1634f4cb647.stex" ] +dest_files=["res://.godot/imported/branch-delete.svg-fd5a2026e417be4d8604f1634f4cb647.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/branch.svg.import b/cards/branch.svg.import index ff2d5b8..791d836 100644 --- a/cards/branch.svg.import +++ b/cards/branch.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/branch.svg-eb8cc6ed28116b245fe8b2b88935589c.stex" +type="CompressedTexture2D" +uid="uid://clib2gxj7t7g" +path="res://.godot/imported/branch.svg-eb8cc6ed28116b245fe8b2b88935589c.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/branch.svg" -dest_files=[ "res://.import/branch.svg-eb8cc6ed28116b245fe8b2b88935589c.stex" ] +dest_files=["res://.godot/imported/branch.svg-eb8cc6ed28116b245fe8b2b88935589c.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/checkout-file.svg.import b/cards/checkout-file.svg.import index a960142..9f1de0d 100644 --- a/cards/checkout-file.svg.import +++ b/cards/checkout-file.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/checkout-file.svg-33b29020ffdca452c2ad5907a0f12ad0.stex" +type="CompressedTexture2D" +uid="uid://cqya3wstrro3q" +path="res://.godot/imported/checkout-file.svg-33b29020ffdca452c2ad5907a0f12ad0.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/checkout-file.svg" -dest_files=[ "res://.import/checkout-file.svg-33b29020ffdca452c2ad5907a0f12ad0.stex" ] +dest_files=["res://.godot/imported/checkout-file.svg-33b29020ffdca452c2ad5907a0f12ad0.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/checkout-from.svg.import b/cards/checkout-from.svg.import index 2892f47..758e503 100644 --- a/cards/checkout-from.svg.import +++ b/cards/checkout-from.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/checkout-from.svg-1440fff912552ca12f17cc68295ba9a9.stex" +type="CompressedTexture2D" +uid="uid://byofpsp4mxl80" +path="res://.godot/imported/checkout-from.svg-1440fff912552ca12f17cc68295ba9a9.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/checkout-from.svg" -dest_files=[ "res://.import/checkout-from.svg-1440fff912552ca12f17cc68295ba9a9.stex" ] +dest_files=["res://.godot/imported/checkout-from.svg-1440fff912552ca12f17cc68295ba9a9.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/checkout.svg.import b/cards/checkout.svg.import index 895efd6..77e07be 100644 --- a/cards/checkout.svg.import +++ b/cards/checkout.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/checkout.svg-3143aa02cfd5a2acddb95b1a75f60fe5.stex" +type="CompressedTexture2D" +uid="uid://cmfvgux1577b4" +path="res://.godot/imported/checkout.svg-3143aa02cfd5a2acddb95b1a75f60fe5.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/checkout.svg" -dest_files=[ "res://.import/checkout.svg-3143aa02cfd5a2acddb95b1a75f60fe5.stex" ] +dest_files=["res://.godot/imported/checkout.svg-3143aa02cfd5a2acddb95b1a75f60fe5.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/cherry-pick.svg.import b/cards/cherry-pick.svg.import index 3549183..40c0328 100644 --- a/cards/cherry-pick.svg.import +++ b/cards/cherry-pick.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/cherry-pick.svg-b916c94f654b5af97f4a3dff68693e53.stex" +type="CompressedTexture2D" +uid="uid://ivd4mdt6ssln" +path="res://.godot/imported/cherry-pick.svg-b916c94f654b5af97f4a3dff68693e53.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/cherry-pick.svg" -dest_files=[ "res://.import/cherry-pick.svg-b916c94f654b5af97f4a3dff68693e53.stex" ] +dest_files=["res://.godot/imported/cherry-pick.svg-b916c94f654b5af97f4a3dff68693e53.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/clone.svg.import b/cards/clone.svg.import index 1f894b7..8ea3c42 100644 --- a/cards/clone.svg.import +++ b/cards/clone.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/clone.svg-1209893141d884916317a29bbda3c7ce.stex" +type="CompressedTexture2D" +uid="uid://dhp4dmtm11sv2" +path="res://.godot/imported/clone.svg-1209893141d884916317a29bbda3c7ce.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/clone.svg" -dest_files=[ "res://.import/clone.svg-1209893141d884916317a29bbda3c7ce.stex" ] +dest_files=["res://.godot/imported/clone.svg-1209893141d884916317a29bbda3c7ce.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/commit-a.svg.import b/cards/commit-a.svg.import index d514e29..f0d3513 100644 --- a/cards/commit-a.svg.import +++ b/cards/commit-a.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/commit-a.svg-74d4ed1a5b085effaa193222437dac11.stex" +type="CompressedTexture2D" +uid="uid://cjpkaxt2y7oes" +path="res://.godot/imported/commit-a.svg-74d4ed1a5b085effaa193222437dac11.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/commit-a.svg" -dest_files=[ "res://.import/commit-a.svg-74d4ed1a5b085effaa193222437dac11.stex" ] +dest_files=["res://.godot/imported/commit-a.svg-74d4ed1a5b085effaa193222437dac11.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/commit-auto.svg.import b/cards/commit-auto.svg.import index 51e7cfd..45dc70d 100644 --- a/cards/commit-auto.svg.import +++ b/cards/commit-auto.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/commit-auto.svg-3602bf004267ccb8cb830fe4f194c90f.stex" +type="CompressedTexture2D" +uid="uid://bcwh4wlx4kani" +path="res://.godot/imported/commit-auto.svg-3602bf004267ccb8cb830fe4f194c90f.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/commit-auto.svg" -dest_files=[ "res://.import/commit-auto.svg-3602bf004267ccb8cb830fe4f194c90f.stex" ] +dest_files=["res://.godot/imported/commit-auto.svg-3602bf004267ccb8cb830fe4f194c90f.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/commit.svg.import b/cards/commit.svg.import index 613bc09..0b5c9a2 100644 --- a/cards/commit.svg.import +++ b/cards/commit.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/commit.svg-81b72e6d51b3c0f35ba9ffe75a779e27.stex" +type="CompressedTexture2D" +uid="uid://f62rfq2hie8p" +path="res://.godot/imported/commit.svg-81b72e6d51b3c0f35ba9ffe75a779e27.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/commit.svg" -dest_files=[ "res://.import/commit.svg-81b72e6d51b3c0f35ba9ffe75a779e27.stex" ] +dest_files=["res://.godot/imported/commit.svg-81b72e6d51b3c0f35ba9ffe75a779e27.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/fetch.svg.import b/cards/fetch.svg.import index 3c65896..2993224 100644 --- a/cards/fetch.svg.import +++ b/cards/fetch.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/fetch.svg-271468d8652718244abe885572c5dd75.stex" +type="CompressedTexture2D" +uid="uid://v8nxdavnlnl7" +path="res://.godot/imported/fetch.svg-271468d8652718244abe885572c5dd75.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/fetch.svg" -dest_files=[ "res://.import/fetch.svg-271468d8652718244abe885572c5dd75.stex" ] +dest_files=["res://.godot/imported/fetch.svg-271468d8652718244abe885572c5dd75.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/file-copy.svg.import b/cards/file-copy.svg.import index ebd39cb..63fbdd6 100644 --- a/cards/file-copy.svg.import +++ b/cards/file-copy.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/file-copy.svg-b09df70c6492dae6c3a6ed1edf7b616e.stex" +type="CompressedTexture2D" +uid="uid://cxhww8gph8em6" +path="res://.godot/imported/file-copy.svg-b09df70c6492dae6c3a6ed1edf7b616e.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/file-copy.svg" -dest_files=[ "res://.import/file-copy.svg-b09df70c6492dae6c3a6ed1edf7b616e.stex" ] +dest_files=["res://.godot/imported/file-copy.svg-b09df70c6492dae6c3a6ed1edf7b616e.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/file-delete.svg.import b/cards/file-delete.svg.import index 9c9d9da..c6620c6 100644 --- a/cards/file-delete.svg.import +++ b/cards/file-delete.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/file-delete.svg-1f07b0a0ab33737c2bd1187d541f2bf2.stex" +type="CompressedTexture2D" +uid="uid://ii5iv4766jn4" +path="res://.godot/imported/file-delete.svg-1f07b0a0ab33737c2bd1187d541f2bf2.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/file-delete.svg" -dest_files=[ "res://.import/file-delete.svg-1f07b0a0ab33737c2bd1187d541f2bf2.stex" ] +dest_files=["res://.godot/imported/file-delete.svg-1f07b0a0ab33737c2bd1187d541f2bf2.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/file-new.svg.import b/cards/file-new.svg.import index 968c800..80b4c2b 100644 --- a/cards/file-new.svg.import +++ b/cards/file-new.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/file-new.svg-241a480ced43a4be648eaa4a084bf605.stex" +type="CompressedTexture2D" +uid="uid://d3ktnjl60hhlm" +path="res://.godot/imported/file-new.svg-241a480ced43a4be648eaa4a084bf605.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/file-new.svg" -dest_files=[ "res://.import/file-new.svg-241a480ced43a4be648eaa4a084bf605.stex" ] +dest_files=["res://.godot/imported/file-new.svg-241a480ced43a4be648eaa4a084bf605.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/file-rename.svg.import b/cards/file-rename.svg.import index 79f1261..bedcc42 100644 --- a/cards/file-rename.svg.import +++ b/cards/file-rename.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/file-rename.svg-907de059f220a9b0b45bd9779f1d25f1.stex" +type="CompressedTexture2D" +uid="uid://b6rjdfwr3wh7h" +path="res://.godot/imported/file-rename.svg-907de059f220a9b0b45bd9779f1d25f1.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/file-rename.svg" -dest_files=[ "res://.import/file-rename.svg-907de059f220a9b0b45bd9779f1d25f1.stex" ] +dest_files=["res://.godot/imported/file-rename.svg-907de059f220a9b0b45bd9779f1d25f1.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/init.svg.import b/cards/init.svg.import index aacb273..18cc186 100644 --- a/cards/init.svg.import +++ b/cards/init.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/init.svg-eff485ab83d8f4f1066179f2c1d47d00.stex" +type="CompressedTexture2D" +uid="uid://b5p8hq6hre7s0" +path="res://.godot/imported/init.svg-eff485ab83d8f4f1066179f2c1d47d00.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/init.svg" -dest_files=[ "res://.import/init.svg-eff485ab83d8f4f1066179f2c1d47d00.stex" ] +dest_files=["res://.godot/imported/init.svg-eff485ab83d8f4f1066179f2c1d47d00.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/merge-abort.svg.import b/cards/merge-abort.svg.import index cbdf0a8..e8304dd 100644 --- a/cards/merge-abort.svg.import +++ b/cards/merge-abort.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/merge-abort.svg-5ac15dd7f08f3cc4730cac5d99fe69b0.stex" +type="CompressedTexture2D" +uid="uid://iopy7e4ioalf" +path="res://.godot/imported/merge-abort.svg-5ac15dd7f08f3cc4730cac5d99fe69b0.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/merge-abort.svg" -dest_files=[ "res://.import/merge-abort.svg-5ac15dd7f08f3cc4730cac5d99fe69b0.stex" ] +dest_files=["res://.godot/imported/merge-abort.svg-5ac15dd7f08f3cc4730cac5d99fe69b0.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/merge.svg.import b/cards/merge.svg.import index b96f40d..60a4464 100644 --- a/cards/merge.svg.import +++ b/cards/merge.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/merge.svg-5ff4b4b93d3f613b5ff54414397df67c.stex" +type="CompressedTexture2D" +uid="uid://bo6n7ex0aeu7v" +path="res://.godot/imported/merge.svg-5ff4b4b93d3f613b5ff54414397df67c.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/merge.svg" -dest_files=[ "res://.import/merge.svg-5ff4b4b93d3f613b5ff54414397df67c.stex" ] +dest_files=["res://.godot/imported/merge.svg-5ff4b4b93d3f613b5ff54414397df67c.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/pull.svg.import b/cards/pull.svg.import index 15ab40d..4c9788d 100644 --- a/cards/pull.svg.import +++ b/cards/pull.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/pull.svg-95e22c3c54690b0bb9cd734d753f8b7d.stex" +type="CompressedTexture2D" +uid="uid://ch6ruxog3aoi3" +path="res://.godot/imported/pull.svg-95e22c3c54690b0bb9cd734d753f8b7d.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/pull.svg" -dest_files=[ "res://.import/pull.svg-95e22c3c54690b0bb9cd734d753f8b7d.stex" ] +dest_files=["res://.godot/imported/pull.svg-95e22c3c54690b0bb9cd734d753f8b7d.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/push.svg.import b/cards/push.svg.import index aa6a9ff..763dd78 100644 --- a/cards/push.svg.import +++ b/cards/push.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/push.svg-840b26c5fe96f5b0ec0b58d17f5f6ebf.stex" +type="CompressedTexture2D" +uid="uid://cxns5rbtunu84" +path="res://.godot/imported/push.svg-840b26c5fe96f5b0ec0b58d17f5f6ebf.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/push.svg" -dest_files=[ "res://.import/push.svg-840b26c5fe96f5b0ec0b58d17f5f6ebf.stex" ] +dest_files=["res://.godot/imported/push.svg-840b26c5fe96f5b0ec0b58d17f5f6ebf.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/rebase-continue.svg.import b/cards/rebase-continue.svg.import index 4276f0a..d5b140e 100644 --- a/cards/rebase-continue.svg.import +++ b/cards/rebase-continue.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/rebase-continue.svg-ee156ef9d7f2f1525bf2f752ce95229e.stex" +type="CompressedTexture2D" +uid="uid://baqy3gd4wrbjo" +path="res://.godot/imported/rebase-continue.svg-ee156ef9d7f2f1525bf2f752ce95229e.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/rebase-continue.svg" -dest_files=[ "res://.import/rebase-continue.svg-ee156ef9d7f2f1525bf2f752ce95229e.stex" ] +dest_files=["res://.godot/imported/rebase-continue.svg-ee156ef9d7f2f1525bf2f752ce95229e.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/rebase-interactive.svg.import b/cards/rebase-interactive.svg.import index a65c315..bc04ff4 100644 --- a/cards/rebase-interactive.svg.import +++ b/cards/rebase-interactive.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/rebase-interactive.svg-9bd40b291a9d619bf58504a61e1cbcf7.stex" +type="CompressedTexture2D" +uid="uid://csw8h0u223iv0" +path="res://.godot/imported/rebase-interactive.svg-9bd40b291a9d619bf58504a61e1cbcf7.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/rebase-interactive.svg" -dest_files=[ "res://.import/rebase-interactive.svg-9bd40b291a9d619bf58504a61e1cbcf7.stex" ] +dest_files=["res://.godot/imported/rebase-interactive.svg-9bd40b291a9d619bf58504a61e1cbcf7.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/rebase.svg.import b/cards/rebase.svg.import index 97241e1..dd242ca 100644 --- a/cards/rebase.svg.import +++ b/cards/rebase.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/rebase.svg-52003a9e4e854e9c851cf2a6352e6205.stex" +type="CompressedTexture2D" +uid="uid://bwhp2ealx0nhl" +path="res://.godot/imported/rebase.svg-52003a9e4e854e9c851cf2a6352e6205.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/rebase.svg" -dest_files=[ "res://.import/rebase.svg-52003a9e4e854e9c851cf2a6352e6205.stex" ] +dest_files=["res://.godot/imported/rebase.svg-52003a9e4e854e9c851cf2a6352e6205.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/reflog.svg.import b/cards/reflog.svg.import index 17b81f7..b036131 100644 --- a/cards/reflog.svg.import +++ b/cards/reflog.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/reflog.svg-58811602af0895f986979b78b804f3d0.stex" +type="CompressedTexture2D" +uid="uid://cpilapinyri82" +path="res://.godot/imported/reflog.svg-58811602af0895f986979b78b804f3d0.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/reflog.svg" -dest_files=[ "res://.import/reflog.svg-58811602af0895f986979b78b804f3d0.stex" ] +dest_files=["res://.godot/imported/reflog.svg-58811602af0895f986979b78b804f3d0.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/reset-file.svg.import b/cards/reset-file.svg.import index 883becf..873c6a6 100644 --- a/cards/reset-file.svg.import +++ b/cards/reset-file.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/reset-file.svg-15bbadedca7014f817d5e2a521d1d66b.stex" +type="CompressedTexture2D" +uid="uid://cu8pnvov3j2sv" +path="res://.godot/imported/reset-file.svg-15bbadedca7014f817d5e2a521d1d66b.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/reset-file.svg" -dest_files=[ "res://.import/reset-file.svg-15bbadedca7014f817d5e2a521d1d66b.stex" ] +dest_files=["res://.godot/imported/reset-file.svg-15bbadedca7014f817d5e2a521d1d66b.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/reset-hard.svg.import b/cards/reset-hard.svg.import index 199bee3..fc6725b 100644 --- a/cards/reset-hard.svg.import +++ b/cards/reset-hard.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/reset-hard.svg-babcffb163a4c5606782673185f034cd.stex" +type="CompressedTexture2D" +uid="uid://diyujymvvcsuu" +path="res://.godot/imported/reset-hard.svg-babcffb163a4c5606782673185f034cd.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/reset-hard.svg" -dest_files=[ "res://.import/reset-hard.svg-babcffb163a4c5606782673185f034cd.stex" ] +dest_files=["res://.godot/imported/reset-hard.svg-babcffb163a4c5606782673185f034cd.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/reset.svg.import b/cards/reset.svg.import index 3409230..3b6af6a 100644 --- a/cards/reset.svg.import +++ b/cards/reset.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/reset.svg-cabb0177c79ff01692a21316e28c91f8.stex" +type="CompressedTexture2D" +uid="uid://c5tt04yk0x0ds" +path="res://.godot/imported/reset.svg-cabb0177c79ff01692a21316e28c91f8.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/reset.svg" -dest_files=[ "res://.import/reset.svg-cabb0177c79ff01692a21316e28c91f8.stex" ] +dest_files=["res://.godot/imported/reset.svg-cabb0177c79ff01692a21316e28c91f8.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/revert.svg.import b/cards/revert.svg.import index 6f0bbfc..71f31fe 100644 --- a/cards/revert.svg.import +++ b/cards/revert.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/revert.svg-4babc742ff6ab2ab39bda112ad1f8738.stex" +type="CompressedTexture2D" +uid="uid://umujejg0dqxt" +path="res://.godot/imported/revert.svg-4babc742ff6ab2ab39bda112ad1f8738.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/revert.svg" -dest_files=[ "res://.import/revert.svg-4babc742ff6ab2ab39bda112ad1f8738.stex" ] +dest_files=["res://.godot/imported/revert.svg-4babc742ff6ab2ab39bda112ad1f8738.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/rm.svg.import b/cards/rm.svg.import index 2830052..31975cd 100644 --- a/cards/rm.svg.import +++ b/cards/rm.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/rm.svg-5a801265a830b015b9f9fc338459295b.stex" +type="CompressedTexture2D" +uid="uid://chso2r6qsxqps" +path="res://.godot/imported/rm.svg-5a801265a830b015b9f9fc338459295b.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/rm.svg" -dest_files=[ "res://.import/rm.svg-5a801265a830b015b9f9fc338459295b.stex" ] +dest_files=["res://.godot/imported/rm.svg-5a801265a830b015b9f9fc338459295b.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/cards/show.svg.import b/cards/show.svg.import index 39cebac..15dc760 100644 --- a/cards/show.svg.import +++ b/cards/show.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/show.svg-61ddddfa47953effe89cdfe1d04ec7bb.stex" +type="CompressedTexture2D" +uid="uid://dmetr66h2uw03" +path="res://.godot/imported/show.svg-61ddddfa47953effe89cdfe1d04ec7bb.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://cards/show.svg" -dest_files=[ "res://.import/show.svg-61ddddfa47953effe89cdfe1d04ec7bb.stex" ] +dest_files=["res://.godot/imported/show.svg-61ddddfa47953effe89cdfe1d04ec7bb.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/fonts/big.tres b/fonts/big.tres index 10db4a6..6ee4c7d 100644 --- a/fonts/big.tres +++ b/fonts/big.tres @@ -1,6 +1,6 @@ -[gd_resource type="DynamicFont" load_steps=2 format=2] +[gd_resource type="FontFile" load_steps=2 format=2] -[ext_resource path="res://fonts/cabin-bold.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/cabin-bold.ttf" type="FontFile" id=1] [resource] size = 45 diff --git a/fonts/cabin-bold.ttf.import b/fonts/cabin-bold.ttf.import new file mode 100644 index 0000000..dda21d6 --- /dev/null +++ b/fonts/cabin-bold.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://0epnxhm7gokw" +path="res://.godot/imported/cabin-bold.ttf-51c7881743a8331745c10ce07b2a8463.fontdata" + +[deps] + +source_file="res://fonts/cabin-bold.ttf" +dest_files=["res://.godot/imported/cabin-bold.ttf-51c7881743a8331745c10ce07b2a8463.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/fonts/cabin-regular.ttf.import b/fonts/cabin-regular.ttf.import new file mode 100644 index 0000000..6e36642 --- /dev/null +++ b/fonts/cabin-regular.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://brutp1pgue8gk" +path="res://.godot/imported/cabin-regular.ttf-d6353f9b78611cc7715cbe3857752517.fontdata" + +[deps] + +source_file="res://fonts/cabin-regular.ttf" +dest_files=["res://.godot/imported/cabin-regular.ttf-d6353f9b78611cc7715cbe3857752517.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/fonts/default.tres b/fonts/default.tres index 1438e9a..fac2c8a 100644 --- a/fonts/default.tres +++ b/fonts/default.tres @@ -1,6 +1,6 @@ -[gd_resource type="DynamicFont" load_steps=2 format=2] +[gd_resource type="FontFile" load_steps=2 format=2] -[ext_resource path="res://fonts/cabin-regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/cabin-regular.ttf" type="FontFile" id=1] [resource] size = 23 diff --git a/fonts/iosevka-regular.ttf.import b/fonts/iosevka-regular.ttf.import new file mode 100644 index 0000000..fa2b991 --- /dev/null +++ b/fonts/iosevka-regular.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bvhw0ofal358q" +path="res://.godot/imported/iosevka-regular.ttf-c741151521edd78cf1a7b19b93563e83.fontdata" + +[deps] + +source_file="res://fonts/iosevka-regular.ttf" +dest_files=["res://.godot/imported/iosevka-regular.ttf-c741151521edd78cf1a7b19b93563e83.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/fonts/monospace.tres b/fonts/monospace.tres index 0b38f43..6004afc 100644 --- a/fonts/monospace.tres +++ b/fonts/monospace.tres @@ -1,6 +1,6 @@ -[gd_resource type="DynamicFont" load_steps=2 format=2] +[gd_resource type="FontFile" load_steps=2 format=2] -[ext_resource path="res://fonts/iosevka-regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/iosevka-regular.ttf" type="FontFile" id=1] [resource] size = 21 diff --git a/fonts/small.tres b/fonts/small.tres index 224942a..011d23d 100644 --- a/fonts/small.tres +++ b/fonts/small.tres @@ -1,6 +1,6 @@ -[gd_resource type="DynamicFont" load_steps=2 format=2] +[gd_resource type="FontFile" load_steps=2 format=2] -[ext_resource path="res://fonts/cabin-regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/cabin-regular.ttf" type="FontFile" id=1] [resource] size = 15 diff --git a/images/cli-badge.svg.import b/images/cli-badge.svg.import index 53031f8..28fee9c 100644 --- a/images/cli-badge.svg.import +++ b/images/cli-badge.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/cli-badge.svg-d681319a61408aabc3551843085f21db.stex" +type="CompressedTexture2D" +uid="uid://0rxu7bk3yimr" +path="res://.godot/imported/cli-badge.svg-d681319a61408aabc3551843085f21db.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/cli-badge.svg" -dest_files=[ "res://.import/cli-badge.svg-d681319a61408aabc3551843085f21db.stex" ] +dest_files=["res://.godot/imported/cli-badge.svg-d681319a61408aabc3551843085f21db.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/commit.svg.import b/images/commit.svg.import index 54316cf..985762a 100644 --- a/images/commit.svg.import +++ b/images/commit.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/commit.svg-6ec3c9ce6fe011df527371878fcfe9b8.stex" +type="CompressedTexture2D" +uid="uid://bwrtlbdxblmxh" +path="res://.godot/imported/commit.svg-6ec3c9ce6fe011df527371878fcfe9b8.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/commit.svg" -dest_files=[ "res://.import/commit.svg-6ec3c9ce6fe011df527371878fcfe9b8.stex" ] +dest_files=["res://.godot/imported/commit.svg-6ec3c9ce6fe011df527371878fcfe9b8.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/conflict.svg.import b/images/conflict.svg.import index 5053a2b..efdfb2e 100644 --- a/images/conflict.svg.import +++ b/images/conflict.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/conflict.svg-058e8cc11300c63d34f3f66889543fa0.stex" +type="CompressedTexture2D" +uid="uid://dhqxl2vw3i5p7" +path="res://.godot/imported/conflict.svg-058e8cc11300c63d34f3f66889543fa0.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/conflict.svg" -dest_files=[ "res://.import/conflict.svg-058e8cc11300c63d34f3f66889543fa0.stex" ] +dest_files=["res://.godot/imported/conflict.svg-058e8cc11300c63d34f3f66889543fa0.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/file.svg.import b/images/file.svg.import index 12aa5dd..fbd8061 100644 --- a/images/file.svg.import +++ b/images/file.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/file.svg-7ab17abba6f9f631c0704e62c7804548.stex" +type="CompressedTexture2D" +uid="uid://88m2oi86bynn" +path="res://.godot/imported/file.svg-7ab17abba6f9f631c0704e62c7804548.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/file.svg" -dest_files=[ "res://.import/file.svg-7ab17abba6f9f631c0704e62c7804548.stex" ] +dest_files=["res://.godot/imported/file.svg-7ab17abba6f9f631c0704e62c7804548.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/head.svg.import b/images/head.svg.import index 2a5c3cf..da6f484 100644 --- a/images/head.svg.import +++ b/images/head.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/head.svg-ae0e309e573aee7fb692167423462810.stex" +type="CompressedTexture2D" +uid="uid://dt0lasl43cbn" +path="res://.godot/imported/head.svg-ae0e309e573aee7fb692167423462810.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/head.svg" -dest_files=[ "res://.import/head.svg-ae0e309e573aee7fb692167423462810.stex" ] +dest_files=["res://.godot/imported/head.svg-ae0e309e573aee7fb692167423462810.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/modified.svg.import b/images/modified.svg.import index a7356bb..30e3679 100644 --- a/images/modified.svg.import +++ b/images/modified.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/modified.svg-bb49413a813e3dafb126da7aeec82740.stex" +type="CompressedTexture2D" +uid="uid://c212nxotjwwbx" +path="res://.godot/imported/modified.svg-bb49413a813e3dafb126da7aeec82740.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/modified.svg" -dest_files=[ "res://.import/modified.svg-bb49413a813e3dafb126da7aeec82740.stex" ] +dest_files=["res://.godot/imported/modified.svg-bb49413a813e3dafb126da7aeec82740.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/new.svg.import b/images/new.svg.import index 4b01767..188b14f 100644 --- a/images/new.svg.import +++ b/images/new.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/new.svg-c0a58ae9dc5d259b4f3ccd8d20fb9b77.stex" +type="CompressedTexture2D" +uid="uid://d1su34omivd67" +path="res://.godot/imported/new.svg-c0a58ae9dc5d259b4f3ccd8d20fb9b77.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/new.svg" -dest_files=[ "res://.import/new.svg-c0a58ae9dc5d259b4f3ccd8d20fb9b77.stex" ] +dest_files=["res://.godot/imported/new.svg-c0a58ae9dc5d259b4f3ccd8d20fb9b77.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/oh-my-git.png.import b/images/oh-my-git.png.import index 708ee15..b846e0a 100644 --- a/images/oh-my-git.png.import +++ b/images/oh-my-git.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/oh-my-git.png-03c5c1a10d0db12a4f28d5f579674ccb.stex" +type="CompressedTexture2D" +uid="uid://w1afg4vatjcq" +path="res://.godot/imported/oh-my-git.png-03c5c1a10d0db12a4f28d5f579674ccb.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://images/oh-my-git.png" -dest_files=[ "res://.import/oh-my-git.png-03c5c1a10d0db12a4f28d5f579674ccb.stex" ] +dest_files=["res://.godot/imported/oh-my-git.png-03c5c1a10d0db12a4f28d5f579674ccb.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/images/ref.svg.import b/images/ref.svg.import index 480c664..7fb855d 100644 --- a/images/ref.svg.import +++ b/images/ref.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/ref.svg-aa67d6a878f7082d8758514d5b9eac2a.stex" +type="CompressedTexture2D" +uid="uid://d4lqgtg06ax2u" +path="res://.godot/imported/ref.svg-aa67d6a878f7082d8758514d5b9eac2a.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/ref.svg" -dest_files=[ "res://.import/ref.svg-aa67d6a878f7082d8758514d5b9eac2a.stex" ] +dest_files=["res://.godot/imported/ref.svg-aa67d6a878f7082d8758514d5b9eac2a.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/remote.svg.import b/images/remote.svg.import index 762dceb..69201c8 100644 --- a/images/remote.svg.import +++ b/images/remote.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/remote.svg-7efe0b92e90a2ce57bc047939daa71f2.stex" +type="CompressedTexture2D" +uid="uid://cjhmcei23bcwf" +path="res://.godot/imported/remote.svg-7efe0b92e90a2ce57bc047939daa71f2.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/remote.svg" -dest_files=[ "res://.import/remote.svg-7efe0b92e90a2ce57bc047939daa71f2.stex" ] +dest_files=["res://.godot/imported/remote.svg-7efe0b92e90a2ce57bc047939daa71f2.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/removed.svg.import b/images/removed.svg.import index 1e0dd8a..dbb3e95 100644 --- a/images/removed.svg.import +++ b/images/removed.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/removed.svg-4418ffd24001968a3d41f1a4e493e553.stex" +type="CompressedTexture2D" +uid="uid://b0sreqk850kf3" +path="res://.godot/imported/removed.svg-4418ffd24001968a3d41f1a4e493e553.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/removed.svg" -dest_files=[ "res://.import/removed.svg-4418ffd24001968a3d41f1a4e493e553.stex" ] +dest_files=["res://.godot/imported/removed.svg-4418ffd24001968a3d41f1a4e493e553.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/string.svg.import b/images/string.svg.import index 97a8d20..8e540b8 100644 --- a/images/string.svg.import +++ b/images/string.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/string.svg-c6f6a214f649f47a30ca1483c0b48d14.stex" +type="CompressedTexture2D" +uid="uid://dxuv1ks07nqgf" +path="res://.godot/imported/string.svg-c6f6a214f649f47a30ca1483c0b48d14.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/string.svg" -dest_files=[ "res://.import/string.svg-c6f6a214f649f47a30ca1483c0b48d14.stex" ] +dest_files=["res://.godot/imported/string.svg-c6f6a214f649f47a30ca1483c0b48d14.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/images/untracked.svg.import b/images/untracked.svg.import index 95cb700..6b52919 100644 --- a/images/untracked.svg.import +++ b/images/untracked.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/untracked.svg-57d41d42d25d92c5e2dec38f8769d5ed.stex" +type="CompressedTexture2D" +uid="uid://dt18su4s3bvt5" +path="res://.godot/imported/untracked.svg-57d41d42d25d92c5e2dec38f8769d5ed.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://images/untracked.svg" -dest_files=[ "res://.import/untracked.svg-57d41d42d25d92c5e2dec38f8769d5ed.stex" ] +dest_files=["res://.godot/imported/untracked.svg-57d41d42d25d92c5e2dec38f8769d5ed.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/music/gigantic-greasy-giraffe.ogg.import b/music/gigantic-greasy-giraffe.ogg.import index c74051a..7a3517d 100644 --- a/music/gigantic-greasy-giraffe.ogg.import +++ b/music/gigantic-greasy-giraffe.ogg.import @@ -1,15 +1,19 @@ [remap] -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/gigantic-greasy-giraffe.ogg-f6c5f1ef0e57d5d768517fa39e6be36c.oggstr" +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://3vg0hudrk1wl" +path="res://.godot/imported/gigantic-greasy-giraffe.ogg-f6c5f1ef0e57d5d768517fa39e6be36c.oggvorbisstr" [deps] source_file="res://music/gigantic-greasy-giraffe.ogg" -dest_files=[ "res://.import/gigantic-greasy-giraffe.ogg-f6c5f1ef0e57d5d768517fa39e6be36c.oggstr" ] +dest_files=["res://.godot/imported/gigantic-greasy-giraffe.ogg-f6c5f1ef0e57d5d768517fa39e6be36c.oggvorbisstr"] [params] loop=true loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/nodes/blob.svg.import b/nodes/blob.svg.import index 725b562..b071b9c 100644 --- a/nodes/blob.svg.import +++ b/nodes/blob.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/blob.svg-32176d6d674206dbc69554456f0ea720.stex" +type="CompressedTexture2D" +uid="uid://dnumbvbaxufg6" +path="res://.godot/imported/blob.svg-32176d6d674206dbc69554456f0ea720.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/blob.svg" -dest_files=[ "res://.import/blob.svg-32176d6d674206dbc69554456f0ea720.stex" ] +dest_files=["res://.godot/imported/blob.svg-32176d6d674206dbc69554456f0ea720.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/commit.svg.import b/nodes/commit.svg.import index d47ebc6..38d218f 100644 --- a/nodes/commit.svg.import +++ b/nodes/commit.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/commit.svg-e84b6d5f0dcf8ee449788a8c35e799e5.stex" +type="CompressedTexture2D" +uid="uid://duqj75e0h434n" +path="res://.godot/imported/commit.svg-e84b6d5f0dcf8ee449788a8c35e799e5.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/commit.svg" -dest_files=[ "res://.import/commit.svg-e84b6d5f0dcf8ee449788a8c35e799e5.stex" ] +dest_files=["res://.godot/imported/commit.svg-e84b6d5f0dcf8ee449788a8c35e799e5.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/document.svg.import b/nodes/document.svg.import index 4c5b739..e7ff723 100644 --- a/nodes/document.svg.import +++ b/nodes/document.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/document.svg-b9fdc82a659cb4c40c5c95e09b615070.stex" +type="CompressedTexture2D" +uid="uid://3gckq7gkf67d" +path="res://.godot/imported/document.svg-b9fdc82a659cb4c40c5c95e09b615070.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/document.svg" -dest_files=[ "res://.import/document.svg-b9fdc82a659cb4c40c5c95e09b615070.stex" ] +dest_files=["res://.godot/imported/document.svg-b9fdc82a659cb4c40c5c95e09b615070.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/head.svg.import b/nodes/head.svg.import index f011619..43f75e9 100644 --- a/nodes/head.svg.import +++ b/nodes/head.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/head.svg-062450ee486d6e5774c7ccb0fbe8c145.stex" +type="CompressedTexture2D" +uid="uid://plhfo4r3ffpv" +path="res://.godot/imported/head.svg-062450ee486d6e5774c7ccb0fbe8c145.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/head.svg" -dest_files=[ "res://.import/head.svg-062450ee486d6e5774c7ccb0fbe8c145.stex" ] +dest_files=["res://.godot/imported/head.svg-062450ee486d6e5774c7ccb0fbe8c145.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/head1.svg.import b/nodes/head1.svg.import index 0888d00..62dfb31 100644 --- a/nodes/head1.svg.import +++ b/nodes/head1.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/head1.svg-cb13de7d91f834684f5d15e9625a65b4.stex" +type="CompressedTexture2D" +uid="uid://bmdiv3ft577mo" +path="res://.godot/imported/head1.svg-cb13de7d91f834684f5d15e9625a65b4.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/head1.svg" -dest_files=[ "res://.import/head1.svg-cb13de7d91f834684f5d15e9625a65b4.stex" ] +dest_files=["res://.godot/imported/head1.svg-cb13de7d91f834684f5d15e9625a65b4.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/head2.svg.import b/nodes/head2.svg.import index 92a04d2..b79565d 100644 --- a/nodes/head2.svg.import +++ b/nodes/head2.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/head2.svg-e772342989ef4f76b9420a365c0e5f01.stex" +type="CompressedTexture2D" +uid="uid://dv7dc4c2huo17" +path="res://.godot/imported/head2.svg-e772342989ef4f76b9420a365c0e5f01.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/head2.svg" -dest_files=[ "res://.import/head2.svg-e772342989ef4f76b9420a365c0e5f01.stex" ] +dest_files=["res://.godot/imported/head2.svg-e772342989ef4f76b9420a365c0e5f01.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/head3.svg.import b/nodes/head3.svg.import index 7ba33f4..fca27d6 100644 --- a/nodes/head3.svg.import +++ b/nodes/head3.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/head3.svg-caa888292307a12254c45d043d73a543.stex" +type="CompressedTexture2D" +uid="uid://cw13vfd6h7y4n" +path="res://.godot/imported/head3.svg-caa888292307a12254c45d043d73a543.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/head3.svg" -dest_files=[ "res://.import/head3.svg-caa888292307a12254c45d043d73a543.stex" ] +dest_files=["res://.godot/imported/head3.svg-caa888292307a12254c45d043d73a543.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/pop.wav.import b/nodes/pop.wav.import index f7152c5..a80014a 100644 --- a/nodes/pop.wav.import +++ b/nodes/pop.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/pop.wav-c45fbac324d41566fc00fa2a6560f011.sample" +type="AudioStreamWAV" +uid="uid://cvoqo118ts5aq" +path="res://.godot/imported/pop.wav-c45fbac324d41566fc00fa2a6560f011.sample" [deps] source_file="res://nodes/pop.wav" -dest_files=[ "res://.import/pop.wav-c45fbac324d41566fc00fa2a6560f011.sample" ] +dest_files=["res://.godot/imported/pop.wav-c45fbac324d41566fc00fa2a6560f011.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/nodes/ref.svg.import b/nodes/ref.svg.import index 1ad858d..79de36d 100644 --- a/nodes/ref.svg.import +++ b/nodes/ref.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/ref.svg-ba1531cc32a42d39c1bb1fbb28f745fb.stex" +type="CompressedTexture2D" +uid="uid://bku1jxowopynb" +path="res://.godot/imported/ref.svg-ba1531cc32a42d39c1bb1fbb28f745fb.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/ref.svg" -dest_files=[ "res://.import/ref.svg-ba1531cc32a42d39c1bb1fbb28f745fb.stex" ] +dest_files=["res://.godot/imported/ref.svg-ba1531cc32a42d39c1bb1fbb28f745fb.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/nodes/tree.svg.import b/nodes/tree.svg.import index 8192b20..fd5e16a 100644 --- a/nodes/tree.svg.import +++ b/nodes/tree.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/tree.svg-3883bff21a1825dc9656cd06abe52ea6.stex" +type="CompressedTexture2D" +uid="uid://cgieb54pjoxcl" +path="res://.godot/imported/tree.svg-3883bff21a1825dc9656cd06abe52ea6.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,27 @@ metadata={ [deps] source_file="res://nodes/tree.svg" -dest_files=[ "res://.import/tree.svg-3883bff21a1825dc9656cd06abe52ea6.stex" ] +dest_files=["res://.godot/imported/tree.svg-3883bff21a1825dc9656cd06abe52ea6.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/project.godot b/project.godot index 8af698d..2ae9df7 100644 --- a/project.godot +++ b/project.godot @@ -6,53 +6,7 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 - -_global_script_classes=[ { -"base": "Node", -"class": "BetterShell", -"language": "GDScript", -"path": "res://scenes/better_shell.gd" -}, { -"base": "Node", -"class": "Chapter", -"language": "GDScript", -"path": "res://scenes/chapter.gd" -}, { -"base": "Control", -"class": "FileBrowserItem", -"language": "GDScript", -"path": "res://scenes/file_browser_item.gd" -}, { -"base": "Node", -"class": "Level", -"language": "GDScript", -"path": "res://scenes/level.gd" -}, { -"base": "Node", -"class": "LevelRepo", -"language": "GDScript", -"path": "res://scenes/level_repo.gd" -}, { -"base": "Node", -"class": "Shell", -"language": "GDScript", -"path": "res://scenes/shell.gd" -}, { -"base": "Node", -"class": "ShellCommand", -"language": "GDScript", -"path": "res://scenes/shell_command.gd" -} ] -_global_script_class_icons={ -"BetterShell": "", -"Chapter": "", -"FileBrowserItem": "", -"Level": "", -"LevelRepo": "", -"Shell": "", -"ShellCommand": "" -} +config_version=5 [application] @@ -60,7 +14,8 @@ config/name="Oh My Git!" run/main_scene="res://scenes/title.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="Oh My Git" -boot_splash/bg_color=Color( 0, 0, 0, 1 ) +config/features=PackedStringArray("4.1") +boot_splash/bg_color=Color(0, 0, 0, 1) [autoload] @@ -70,92 +25,90 @@ levels="*res://scenes/levels.gd" [display] -window/size/width=1920 -window/size/height=1080 -window/size/fullscreen=true -window/dpi/allow_hidpi=true +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/stretch/mode="2d" -window/stretch/aspect="keep" +window/size/fullscreen=true [input] left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) - ] +"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":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":65,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) - ] +"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":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":68,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } up={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) - ] +"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":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":87,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) - ] +"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":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":83,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } click={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) - ] +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"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) +] } zoom_in={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"pressed":false,"doubleclick":false,"script":null) - ] +"events": [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":4,"canceled":false,"pressed":false,"double_click":false,"script":null) +] } zoom_out={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"pressed":false,"doubleclick":false,"script":null) - ] +"events": [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":5,"canceled":false,"pressed":false,"double_click":false,"script":null) +] } right_click={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null) - ] +"events": [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) +] } tab_complete={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null) - ] +"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":4194306,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } save={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) - ] +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } delete_word={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) - ] +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } clear={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":76,"unicode":0,"echo":false,"script":null) - ] +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":76,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } mute={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":77,"unicode":0,"echo":false,"script":null) - ] +"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":77,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +] } [network] -limits/debugger_stdout/max_chars_per_second=100000 -limits/debugger_stdout/max_messages_per_frame=1000 -limits/debugger_stdout/max_errors_per_second=1000 -limits/debugger_stdout/max_warnings_per_second=1000 +limits/debugger/max_chars_per_second=100000 +limits/debugger/max_queued_messages=1000 +limits/debugger/max_errors_per_second=1000 +limits/debugger/max_warnings_per_second=1000 [rendering] -environment/default_clear_color=Color( 0, 0, 0, 1 ) +environment/defaults/default_clear_color=Color(0, 0, 0, 1) diff --git a/scenes/arrow.gd b/scenes/arrow.gd index 6b407a0..78564e8 100644 --- a/scenes/arrow.gd +++ b/scenes/arrow.gd @@ -1,8 +1,8 @@ extends Node2D var source: String -var target: String setget set_target -var color = Color("333333") setget set_color +var target: String: set = set_target +var color = Color("333333"): set = set_color var repository: Control diff --git a/scenes/arrow.tscn b/scenes/arrow.tscn index 53c1d62..e0bdd67 100644 --- a/scenes/arrow.tscn +++ b/scenes/arrow.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=1] [ext_resource path="res://scenes/arrow.gd" type="Script" id=2] [node name="Arrow" type="Node2D"] @@ -8,7 +8,7 @@ show_behind_parent = true script = ExtResource( 2 ) [node name="Line" type="Line2D" parent="."] -points = PoolVector2Array( -0.480499, -0.11055, 158.301, 0.581757 ) +points = PackedVector2Array( -0.480499, -0.11055, 158.301, 0.581757 ) default_color = Color( 0.2, 0.2, 0.2, 1 ) [node name="Tip" type="Node2D" parent="."] @@ -19,19 +19,19 @@ z_index = 1 position = Vector2( -24.7164, -6.37881 ) z_index = -1 color = Color( 0.2, 0.2, 0.2, 1 ) -polygon = PoolVector2Array( -4.87012, 27.2617, 39.7077, 6.0953, -4.87012, -15.0711 ) +polygon = PackedVector2Array( -4.87012, 27.2617, 39.7077, 6.0953, -4.87012, -15.0711 ) [node name="Label" type="Node2D" parent="."] visible = false position = Vector2( 102, 46 ) [node name="ID" type="Label" parent="Label"] -margin_left = -19.374 -margin_top = -5.93085 -margin_right = 20.626 -margin_bottom = 8.06915 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 1, 1, 1 ) +offset_left = -19.374 +offset_top = -5.93085 +offset_right = 20.626 +offset_bottom = 8.06915 +theme_override_fonts/font = ExtResource( 1 ) +theme_override_colors/font_color = Color( 1, 1, 1, 1 ) text = "label" align = 1 __meta__ = { @@ -39,12 +39,12 @@ __meta__ = { } [node name="Target" type="Label" parent="."] -margin_left = -230.84 -margin_top = 42.1225 -margin_right = 231.16 -margin_bottom = 68.1225 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 0.356863, 0.356863, 0.356863, 1 ) +offset_left = -230.84 +offset_top = 42.1225 +offset_right = 231.16 +offset_bottom = 68.1225 +theme_override_fonts/font = ExtResource( 1 ) +theme_override_colors/font_color = Color( 0.356863, 0.356863, 0.356863, 1 ) text = "label" align = 1 __meta__ = { diff --git a/scenes/better_shell.gd b/scenes/better_shell.gd index 34b9ef8..68547a9 100644 --- a/scenes/better_shell.gd +++ b/scenes/better_shell.gd @@ -33,7 +33,7 @@ func run_async(command, crash_on_fail=true): var t = Thread.new() shell_command.thread = t - t.start(self, "run_async_thread", shell_command) + t.start(Callable(self, "run_async_thread").bind(shell_command)) return shell_command diff --git a/scenes/card.gd b/scenes/card.gd index 8c97c5a..d8bfc2f 100644 --- a/scenes/card.gd +++ b/scenes/card.gd @@ -4,16 +4,16 @@ var hovered = false var dragged = false var drag_offset -export var id = "" setget set_id -export var command = "" setget set_command -export var description = "" setget set_description -export var energy = 0 setget set_energy +@export var id = "": set = set_id +@export var command = "": set = set_meta_pressed +@export var description = "": set = set_description +@export var energy = 0: set = set_energy var _first_argument = null var _home_position = null var _home_rotation = null -onready var energy_label = $Sprite/Energy +@onready var energy_label = $Sprite2D/Energy func _ready(): set_process_unhandled_input(true) @@ -39,26 +39,26 @@ func _process(delta): func _unhandled_input(event): if event is InputEventMouseButton: - if event.button_index == BUTTON_LEFT and event.pressed and hovered: + if event.button_index == MOUSE_BUTTON_LEFT and event.pressed and hovered: dragged = true game.dragged_object = self _turn_on_highlights() $PickupSound.play() drag_offset = get_viewport().get_mouse_position() - global_position - get_tree().set_input_as_handled() + get_viewport().set_input_as_handled() modulate.a = 0.5 - elif event.button_index == BUTTON_LEFT and !event.pressed and dragged: + elif event.button_index == MOUSE_BUTTON_LEFT and !event.pressed and dragged: dragged = false game.dragged_object = null _turn_off_highlights() modulate.a = 1 if "[string]" in command: - var dialog = preload("res://scenes/input_dialog.tscn").instance() + var dialog = preload("res://scenes/input_dialog.tscn").instantiate() add_child(dialog) dialog.popup_centered() - dialog.connect("entered", self, "entered_string") - dialog.connect("popup_hide", self, "move_back") + dialog.connect("entered", Callable(self, "entered_string")) + dialog.connect("popup_hide", Callable(self, "move_back")) hide() elif "[" in command: move_back() @@ -87,7 +87,7 @@ func _mouse_exited(): hovered = false z_index = 0 -func set_command(new_command): +func set_meta_pressed(new_command): command = new_command var commands = new_command.split("[", true, 1) var args = '' @@ -100,7 +100,7 @@ func set_command(new_command): args = args.replace("head", " [img=20]images/head.svg[/img] ") args = args.replace("file", " [img=20]images/file.svg[/img] ") args = args.replace("remote", " [img=20]images/remote.svg[/img] ") - $Label.bbcode_text = commands[0] + args + $Label.text = commands[0] + args #$Label.text = command func set_description(new_description): @@ -115,7 +115,7 @@ func set_energy(new_energy): func set_id(new_id): id = new_id var art_path = "res://cards/%s.svg" % new_id - var file = File.new() + #var file = File.new() #if file.file_exists(art_path): var texture = load(art_path) if texture: @@ -151,7 +151,7 @@ func try_play(full_command): #yield(terminal, "command_done") game.used_cards = true $PlaySound.play() - var particles = preload("res://scenes/card_particles.tscn").instance() + var particles = preload("res://scenes/card_particles.tscn").instantiate() particles.position = position get_parent().add_child(particles) move_back() diff --git a/scenes/card.tscn b/scenes/card.tscn index 55c230f..bb63c29 100644 --- a/scenes/card.tscn +++ b/scenes/card.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=13 format=2] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] -[ext_resource path="res://nodes/blob.svg" type="Texture" id=2] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=1] +[ext_resource path="res://nodes/blob.svg" type="Texture2D" id=2] [ext_resource path="res://scenes/card.gd" type="Script" id=3] [ext_resource path="res://sounds/swish.wav" type="AudioStream" id=4] [ext_resource path="res://sounds/swoosh.wav" type="AudioStream" id=5] [ext_resource path="res://sounds/poof.wav" type="AudioStream" id=6] -[ext_resource path="res://fonts/small.tres" type="DynamicFont" id=7] +[ext_resource path="res://fonts/small.tres" type="FontFile" id=7] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.45098, 0.584314, 0.843137, 1 ) @@ -40,7 +40,7 @@ shader = SubResource( 2 ) shader_param/hovered = 0.0 [sub_resource type="RectangleShape2D" id=4] -extents = Vector2( 105.74, 143.46 ) +size = Vector2( 105.74, 143.46 ) [sub_resource type="StyleBoxFlat" id=5] bg_color = Color( 1, 1, 1, 0.243137 ) @@ -55,17 +55,17 @@ corner_radius_bottom_left = 10 script = ExtResource( 3 ) [node name="Panel" type="Panel" parent="."] -margin_left = -105.0 -margin_top = -291.0 -margin_right = 104.0 -margin_bottom = -2.0 +offset_left = -105.0 +offset_top = -291.0 +offset_right = 104.0 +offset_bottom = -2.0 mouse_filter = 2 -custom_styles/panel = SubResource( 1 ) +theme_override_styles/panel = SubResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="Glow" type="Sprite" parent="Panel"] +[node name="Glow" type="Sprite2D" parent="Panel"] modulate = Color( 1, 1, 1, 0.643137 ) show_behind_parent = true material = SubResource( 3 ) @@ -75,10 +75,10 @@ texture = ExtResource( 2 ) [node name="ColorRect" type="ColorRect" parent="."] visible = false -margin_left = -103.0 -margin_top = -290.336 -margin_right = 103.0 -margin_bottom = -1.33582 +offset_left = -103.0 +offset_top = -290.336 +offset_right = 103.0 +offset_bottom = -1.33582 mouse_filter = 2 color = Color( 0.105882, 0.67451, 0.847059, 1 ) __meta__ = { @@ -93,54 +93,54 @@ position = Vector2( -6.10352e-05, -0.641296 ) shape = SubResource( 4 ) [node name="Label" type="RichTextLabel" parent="."] -margin_left = -91.0 -margin_top = -279.0 -margin_right = 95.0 -margin_bottom = -189.0 +offset_left = -91.0 +offset_top = -279.0 +offset_right = 95.0 +offset_bottom = -189.0 mouse_filter = 2 -custom_colors/default_color = Color( 0, 0, 0, 1 ) +theme_override_colors/default_color = Color( 0, 0, 0, 1 ) bbcode_enabled = true __meta__ = { "_edit_use_anchors_": false } [node name="ColorRect2" type="Panel" parent="."] -margin_left = -97.0 -margin_top = -101.0 -margin_right = 94.0 -margin_bottom = -10.0 +offset_left = -97.0 +offset_top = -101.0 +offset_right = 94.0 +offset_bottom = -10.0 mouse_filter = 2 -custom_styles/panel = SubResource( 5 ) +theme_override_styles/panel = SubResource( 5 ) __meta__ = { "_edit_use_anchors_": false } [node name="Description" type="Label" parent="."] -margin_left = -92.0 -margin_top = -98.0 -margin_right = 90.0 -margin_bottom = -14.0 -custom_fonts/font = ExtResource( 7 ) -custom_colors/font_color = Color( 0, 0, 0, 1 ) +offset_left = -92.0 +offset_top = -98.0 +offset_right = 90.0 +offset_bottom = -14.0 +theme_override_fonts/font = ExtResource( 7 ) +theme_override_colors/font_color = Color( 0, 0, 0, 1 ) text = "Description" autowrap = true __meta__ = { "_edit_use_anchors_": false } -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="."] visible = false position = Vector2( -103.288, -287.778 ) scale = Vector2( 0.542341, 0.542341 ) texture = ExtResource( 2 ) -[node name="Energy" type="Label" parent="Sprite"] -margin_left = -51.1637 -margin_top = -47.4558 -margin_right = -17.1637 -margin_bottom = -16.4558 -rect_scale = Vector2( 3, 3 ) -custom_fonts/font = ExtResource( 1 ) +[node name="Energy" type="Label" parent="Sprite2D"] +offset_left = -51.1637 +offset_top = -47.4558 +offset_right = -17.1637 +offset_bottom = -16.4558 +scale = Vector2( 3, 3 ) +theme_override_fonts/font = ExtResource( 1 ) text = "0" align = 1 valign = 1 @@ -160,10 +160,10 @@ stream = ExtResource( 5 ) volume_db = -6.848 [node name="Image" type="TextureRect" parent="."] -margin_left = -88.0 -margin_top = -215.0 -margin_right = 85.0 -margin_bottom = -134.0 +offset_left = -88.0 +offset_top = -215.0 +offset_right = 85.0 +offset_bottom = -134.0 mouse_filter = 2 expand = true stretch_mode = 6 diff --git a/scenes/card_particles.tscn b/scenes/card_particles.tscn index 64fd9e2..054575c 100644 --- a/scenes/card_particles.tscn +++ b/scenes/card_particles.tscn @@ -6,7 +6,7 @@ _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), -2.75937, 0.0, 0, 0 [sub_resource type="CurveTexture" id=2] curve = SubResource( 1 ) -[sub_resource type="ParticlesMaterial" id=3] +[sub_resource type="ParticleProcessMaterial" id=3] emission_shape = 2 emission_box_extents = Vector3( 100, 150, 1 ) flag_disable_z = true @@ -30,8 +30,8 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 2 ), -"transitions": PoolRealArray( 1 ), +"times": PackedFloat32Array( 2 ), +"transitions": PackedFloat32Array( 1 ), "values": [ { "args": [ ], "method": "queue_free" @@ -44,15 +44,15 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), +"times": PackedFloat32Array( 0 ), +"transitions": PackedFloat32Array( 1 ), "update": 1, "values": [ true ] } [node name="CardParticles" type="Node2D"] -[node name="Particles" type="Particles2D" parent="."] +[node name="Particles" type="GPUParticles2D" parent="."] position = Vector2( -0.539337, -145.087 ) emitting = false amount = 32 diff --git a/scenes/cards.gd b/scenes/cards.gd index 4448d6c..e5800ab 100644 --- a/scenes/cards.gd +++ b/scenes/cards.gd @@ -16,7 +16,9 @@ func _process(_delta): func load_card_store(): card_store = {} - var cards_json = JSON.parse(helpers.read_file("res://resources/cards.json")).result + var test_json_conv = JSON.new() + test_json_conv.parse(helpers.read_file("res://resources/cards.json")) + var cards_json = test_json_conv.data for card in cards_json: card_store[card["id"]] = card @@ -35,13 +37,13 @@ func draw_rand_card(): draw_card(card) func draw_card(card): - var new_card = preload("res://scenes/card.tscn").instance() + var new_card = preload("res://scenes/card.tscn").instantiate() new_card.id = card["id"] new_card.command = card["command"] new_card.description = card["description"] new_card.energy = 0 #card.energy - new_card.position = Vector2(rect_size.x, rect_size.y*2) + new_card.position = Vector2(size.x, size.y*2) add_child(new_card) arrange_cards() @@ -62,7 +64,7 @@ func arrange_cards(): t.wait_time = 0.05 add_child(t) t.start() - yield(t, "timeout") + await t.timeout var amount_cards = get_tree().get_nodes_in_group("cards").size() var total_angle = min(35, 45.0/7*amount_cards) @@ -74,7 +76,7 @@ func arrange_cards(): var current_angle = -total_angle/2 for card in get_tree().get_nodes_in_group("cards"): - var target_position = Vector2(rect_size.x/2, rect_size.y + card_radius) + var target_position = Vector2(size.x/2, size.y + card_radius) var target_rotation = current_angle var translation_vec = Vector2(0,-card_radius).rotated(current_angle/180.0*PI) target_position += translation_vec @@ -82,11 +84,9 @@ func arrange_cards(): card._home_position = target_position card._home_rotation = target_rotation - var tween = Tween.new() - tween.interpolate_property(card, "position", card.position, target_position, 0.5, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) - tween.interpolate_property(card, "rotation_degrees", card.rotation_degrees, target_rotation, 0.5, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) - add_child(tween) - tween.start() + var tween = get_tree().create_tween() + tween.tween_property(card, "position", target_position, 0.5) + tween.tween_property(card, "rotation_degrees", target_rotation, 0.5) func redraw_all_cards(): game.energy = 5 diff --git a/scenes/cards.tscn b/scenes/cards.tscn index 1fc2fcc..375b7ef 100644 --- a/scenes/cards.tscn +++ b/scenes/cards.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] -[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=2] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=1] +[ext_resource path="res://fonts/big.tres" type="FontFile" id=2] [ext_resource path="res://scenes/cards.gd" type="Script" id=3] [node name="Cards" type="Control"] @@ -26,11 +26,11 @@ __meta__ = { visible = false anchor_left = 1.0 anchor_right = 1.0 -margin_left = -172.0 -margin_top = 16.0 -margin_right = -16.0 -margin_bottom = 47.0 -custom_fonts/font = ExtResource( 1 ) +offset_left = -172.0 +offset_top = 16.0 +offset_right = -16.0 +offset_bottom = 47.0 +theme_override_fonts/font = ExtResource( 1 ) text = "Draw new cards" __meta__ = { "_edit_use_anchors_": false @@ -39,12 +39,12 @@ __meta__ = { [node name="Energy" type="Label" parent="."] visible = false modulate = Color( 0.431373, 0.792157, 0.423529, 1 ) -margin_left = 28.2219 -margin_top = 16.6766 -margin_right = 68.2219 -margin_bottom = 65.6766 -rect_scale = Vector2( 2, 2 ) -custom_fonts/font = ExtResource( 2 ) +offset_left = 28.2219 +offset_top = 16.6766 +offset_right = 68.2219 +offset_bottom = 65.6766 +scale = Vector2( 2, 2 ) +theme_override_fonts/font = ExtResource( 2 ) text = "3" __meta__ = { "_edit_use_anchors_": false diff --git a/scenes/chapter.gd b/scenes/chapter.gd index 9f2abc2..ff2c5dd 100644 --- a/scenes/chapter.gd +++ b/scenes/chapter.gd @@ -12,9 +12,8 @@ func load(path): slug = parts[parts.size()-1] var level_names = [] - var dir = Directory.new() - dir.open("res://levels/%s" % slug) - dir.list_dir_begin() + var dir = DirAccess.open("res://levels/%s" % slug) + dir.list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547 while true: var file = dir.get_next() diff --git a/scenes/cli_badge.gd b/scenes/cli_badge.gd index 675d58f..cba9dc6 100644 --- a/scenes/cli_badge.gd +++ b/scenes/cli_badge.gd @@ -1,8 +1,8 @@ extends TextureRect -export var active = true setget _set_active -export var sparkling = true setget _set_sparkling -export var impossible = false setget _set_impossible +@export var active = true: set = _set_active +@export var sparkling = true: set = _set_sparkling +@export var impossible = false: set = _set_impossible func _ready(): @@ -18,8 +18,8 @@ func _set_active(new_active): func _set_sparkling(new_sparkling): sparkling = new_sparkling - if $Particles2D: - $Particles2D.emitting = sparkling + if $GPUParticles2D: + $GPUParticles2D.emitting = sparkling func _set_impossible(new_impossible): impossible = new_impossible diff --git a/scenes/cli_badge.tscn b/scenes/cli_badge.tscn index 740e2a3..bde562a 100644 --- a/scenes/cli_badge.tscn +++ b/scenes/cli_badge.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://images/cli-badge.svg" type="Texture" id=1] +[ext_resource path="res://images/cli-badge.svg" type="Texture2D" id=1] [ext_resource path="res://scenes/cli_badge.gd" type="Script" id=2] [sub_resource type="Curve" id=1] @@ -9,7 +9,7 @@ _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] [sub_resource type="CurveTexture" id=2] curve = SubResource( 1 ) -[sub_resource type="ParticlesMaterial" id=3] +[sub_resource type="ParticleProcessMaterial" id=3] emission_shape = 2 emission_box_extents = Vector3( 20, 20, 1 ) flag_disable_z = true @@ -26,7 +26,7 @@ color = Color( 0.913725, 0.913725, 0.447059, 1 ) [node name="CLIBadge" type="TextureRect"] anchor_right = 1.0 anchor_bottom = 1.0 -rect_min_size = Vector2( 45, 0 ) +custom_minimum_size = Vector2( 45, 0 ) size_flags_stretch_ratio = 0.0 texture = ExtResource( 1 ) expand = true @@ -36,7 +36,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Particles2D" type="Particles2D" parent="."] +[node name="GPUParticles2D" type="GPUParticles2D" parent="."] show_behind_parent = true position = Vector2( 21.7701, 14.5133 ) z_index = 1 @@ -48,6 +48,6 @@ process_material = SubResource( 3 ) visible = false position = Vector2( 22.4111, 18.7121 ) scale = Vector2( 1.32773, 1.32773 ) -points = PoolVector2Array( -16.448, 11.5553, 16.0161, -12.8519 ) +points = PackedVector2Array( -16.448, 11.5553, 16.0161, -12.8519 ) width = 5.0 default_color = Color( 0.0705882, 0.0705882, 0.0705882, 1 ) diff --git a/scenes/drop_area.gd b/scenes/drop_area.gd index cd8db0c..6cb934e 100644 --- a/scenes/drop_area.gd +++ b/scenes/drop_area.gd @@ -1,28 +1,28 @@ extends Node2D var hovered = false -var highlighted = false setget _set_highlighted +var highlighted = false: set = _set_highlighted func _ready(): _set_highlighted(false) func _mouse_entered(_area): hovered = true - var tween = Tween.new() - tween.interpolate_property($Highlight/Sprite.material, "shader_param/hovered", 0, 1, 0.1, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) - add_child(tween) - tween.start() + var tween = get_tree().create_tween() + tween.tween_property($Highlight/Sprite2D.material, "shader_param/hovered",1,0.1) + #tween.interpolate_property($Highlight/Sprite2D.material, "shader_param/hovered", 0, 1, 0.1, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) + #add_child(tween) + #tween.start() func _mouse_exited(_area): hovered = false - var tween = Tween.new() - tween.interpolate_property($Highlight/Sprite.material, "shader_param/hovered", 1, 0, 0.1, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) - add_child(tween) - tween.start() + var tween = get_tree().create_tween() + tween.tween_property($Highlight/Sprite2D.material, "shader_param/hovered", 0, 0.1) + func _input(event): if event is InputEventMouseButton: - if event.button_index == BUTTON_LEFT and !event.pressed and hovered: + if event.button_index == MOUSE_BUTTON_LEFT and !event.pressed and hovered: if highlighted and game.dragged_object: game.dragged_object.dropped_on(get_parent_with_type()) diff --git a/scenes/drop_area.tscn b/scenes/drop_area.tscn index ed564e6..fef40c0 100644 --- a/scenes/drop_area.tscn +++ b/scenes/drop_area.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://scenes/drop_area.gd" type="Script" id=1] -[ext_resource path="res://nodes/blob.svg" type="Texture" id=2] +[ext_resource path="res://nodes/blob.svg" type="Texture2D" id=2] [sub_resource type="CircleShape2D" id=1] radius = 63.1532 @@ -39,7 +39,7 @@ shape = SubResource( 1 ) [node name="Highlight" type="Node2D" parent="."] -[node name="Sprite" type="Sprite" parent="Highlight"] +[node name="Sprite2D" type="Sprite2D" parent="Highlight"] modulate = Color( 1, 1, 1, 0.643137 ) material = SubResource( 3 ) position = Vector2( -0.102825, -0.377726 ) diff --git a/scenes/file_browser.gd b/scenes/file_browser.gd index 1af3fa2..7fe935f 100644 --- a/scenes/file_browser.gd +++ b/scenes/file_browser.gd @@ -8,19 +8,19 @@ enum FileBrowserMode { signal saved -export(String) var title setget _set_title -export(FileBrowserMode) var mode = FileBrowserMode.WORKING_DIRECTORY setget _set_mode +@export var title: String: set = _set_title +@export var mode: FileBrowserMode = FileBrowserMode.WORKING_DIRECTORY: set = _set_mode var shell -var commit setget _set_commit +var commit : set = _set_commit var repository var open_file -onready var grid = $Panel/Margin/Rows/Scroll/Grid -onready var text_edit = $Panel/TextEdit -onready var save_button = $Panel/TextEdit/SaveButton -onready var title_label = $Panel/Margin/Rows/Title +@onready var grid = $Panel/Margin/Rows/Scroll/Grid +@onready var text_edit = $Panel/TextEdit +@onready var save_button = $Panel/TextEdit/SaveButton +@onready var title_label = $Panel/Margin/Rows/Title func _ready(): update() @@ -72,13 +72,13 @@ func update(): if not f in files: files.push_back(f) - files.sort_custom(self, "very_best_sort") + files.sort_custom(Callable(self, "very_best_sort")) for file_path in files: - var item = preload("res://scenes/file_browser_item.tscn").instance() + var item = preload("res://scenes/file_browser_item.tscn").instantiate() item.label = file_path item.repository = repository - item.connect("clicked", self, "item_clicked") + item.connect("clicked", Callable(self, "item_clicked")) grid.add_child(item) if files.size() > 0: @@ -90,7 +90,7 @@ func update(): if shell: var deleted_files = [] - if shell.run("test -d .git && echo yes || echo no") == "yes\n": + if shell.run("test -d super.git && echo yes || echo no") == "yes\n": deleted_files = Array(shell.run("git status -s | grep '^.D' | sed 's/^...//'").split("\n")) deleted_files.pop_back() @@ -99,11 +99,12 @@ func update(): if file_path.substr(0, 5) == ".git/": continue #is_visible = true - var item = preload("res://scenes/file_browser_item.tscn").instance() + var item = preload("res://scenes/file_browser_item.tscn").instantiate() item.label = file_path - item.connect("clicked", self, "item_clicked") - item.connect("deleted", self, "item_deleted") - item.status = get_file_status(file_path, shell, 1) + item.connect("clicked", Callable(self, "item_clicked")) + item.connect("deleted", Callable(self, "item_deleted")) + #ToDo what'shappening with the status? + #item.status = get_file_status(file_path, shell, 1) grid.add_child(item) #visible = is_visible @@ -113,9 +114,9 @@ func update(): # The last entry is an empty string, remove it. files.pop_back() for file_path in files: - var item = preload("res://scenes/file_browser_item.tscn").instance() + var item = preload("res://scenes/file_browser_item.tscn").instantiate() item.label = file_path - item.connect("clicked", self, "item_clicked") + item.connect("clicked", Callable(self, "item_clicked")) grid.add_child(item) FileBrowserMode.INDEX: #var is_visible = false @@ -125,33 +126,33 @@ func update(): # The last entries are empty strings, remove them. for file_path in files: - var item = preload("res://scenes/file_browser_item.tscn").instance() + var item = preload("res://scenes/file_browser_item.tscn").instantiate() item.label = file_path - item.connect("clicked", self, "item_clicked") - item.status = get_file_status(file_path, repository.shell, 0) + item.connect("clicked", Callable(self, "item_clicked")) + #item.status = get_file_status(file_path, repository.shell, 0) grid.add_child(item) #if item.status != item.IconStatus.NONE: # is_visible = true #visible = is_visible -func get_file_status(file_path, the_shell, idx): - var file_status = the_shell.run("git status -s '%s'" % file_path) - if file_status.length()>0: - match file_status[idx]: - "D": - return FileBrowserItem.IconStatus.REMOVED - "M": - return FileBrowserItem.IconStatus.EDIT - "U": - return FileBrowserItem.IconStatus.CONFLICT - " ": - return FileBrowserItem.IconStatus.NONE - "A": - return FileBrowserItem.IconStatus.NEW - "?": - return FileBrowserItem.IconStatus.UNTRACKED - else: - return FileBrowserItem.IconStatus.NONE +#func get_file_status(file_path, the_shell, idx): +# var file_status = the_shell.run("git status -s '%s'" % file_path) +# if file_status.length()>0: +# match file_status[idx]: +# "D": +# return FileBrowserItem.IconStatus.REMOVED +# "M": +# return FileBrowserItem.IconStatus.EDIT +# "U": +# return FileBrowserItem.IconStatus.CONFLICT +# " ": +# return FileBrowserItem.IconStatus.NONE +# "A": +# return FileBrowserItem.IconStatus.NEW +# "?": +# return FileBrowserItem.IconStatus.UNTRACKED +# else: +# return FileBrowserItem.IconStatus.NONE func item_clicked(item): if not item.get_node("VBoxContainer/Control/WD").visible: @@ -201,7 +202,7 @@ func _set_mode(new_mode): if save_button: save_button.visible = mode == FileBrowserMode.WORKING_DIRECTORY - text_edit.readonly = not mode == FileBrowserMode.WORKING_DIRECTORY + text_edit.editable = mode == FileBrowserMode.WORKING_DIRECTORY text_edit.selecting_enabled = mode == FileBrowserMode.WORKING_DIRECTORY if mode == FileBrowserMode.WORKING_DIRECTORY: text_edit.focus_mode = Control.FOCUS_CLICK @@ -214,7 +215,7 @@ func _set_title(new_title): title_label.text = new_title func _gui_input(event): - if event is InputEventMouseButton and event.is_pressed() and event.button_index == BUTTON_RIGHT: + if event is InputEventMouseButton and event.is_pressed() and event.button_index == MOUSE_BUTTON_RIGHT: $PopupMenu.set_position(get_global_mouse_position()) $PopupMenu.popup() diff --git a/scenes/file_browser.tscn b/scenes/file_browser.tscn index cbc6bec..2baec36 100644 --- a/scenes/file_browser.tscn +++ b/scenes/file_browser.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://scenes/file_browser.gd" type="Script" id=1] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=2] [ext_resource path="res://styles/theme.tres" type="Theme" id=3] [node name="FileBrowser" type="Control" groups=[ @@ -9,7 +9,7 @@ ]] anchor_right = 1.0 anchor_bottom = 1.0 -rect_min_size = Vector2( 0, 142 ) +custom_minimum_size = Vector2( 0, 142 ) theme = ExtResource( 3 ) script = ExtResource( 1 ) __meta__ = { @@ -26,62 +26,62 @@ __meta__ = { [node name="Margin" type="MarginContainer" parent="Panel"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_constants/margin_right = 8 -custom_constants/margin_top = 8 -custom_constants/margin_left = 8 -custom_constants/margin_bottom = 8 +theme_override_constants/margin_right = 8 +theme_override_constants/margin_top = 8 +theme_override_constants/margin_left = 8 +theme_override_constants/margin_bottom = 8 __meta__ = { "_edit_use_anchors_": false } [node name="Rows" type="VBoxContainer" parent="Panel/Margin"] -margin_left = 8.0 -margin_top = 8.0 -margin_right = 1912.0 -margin_bottom = 1072.0 -custom_constants/separation = 0 +offset_left = 8.0 +offset_top = 8.0 +offset_right = 1912.0 +offset_bottom = 1072.0 +theme_override_constants/separation = 0 __meta__ = { "_edit_use_anchors_": false } [node name="Title" type="Label" parent="Panel/Margin/Rows"] visible = false -margin_right = 1904.0 -margin_bottom = 29.0 +offset_right = 1904.0 +offset_bottom = 29.0 text = "title" align = 1 [node name="Breadcrumbs" type="HBoxContainer" parent="Panel/Margin/Rows"] visible = false -margin_right = 1856.0 -margin_bottom = 50.0 -rect_min_size = Vector2( 0, 50 ) -custom_constants/separation = 8 +offset_right = 1856.0 +offset_bottom = 50.0 +custom_minimum_size = Vector2( 0, 50 ) +theme_override_constants/separation = 8 [node name="Button" type="Button" parent="Panel/Margin/Rows/Breadcrumbs"] -margin_right = 55.0 -margin_bottom = 50.0 +offset_right = 55.0 +offset_bottom = 50.0 text = "root" [node name="Button2" type="Button" parent="Panel/Margin/Rows/Breadcrumbs"] -margin_left = 63.0 -margin_right = 104.0 -margin_bottom = 50.0 +offset_left = 63.0 +offset_right = 104.0 +offset_bottom = 50.0 text = "dir" [node name="Scroll" type="ScrollContainer" parent="Panel/Margin/Rows"] -margin_right = 1904.0 -margin_bottom = 1064.0 +offset_right = 1904.0 +offset_bottom = 1064.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Grid" type="GridContainer" parent="Panel/Margin/Rows/Scroll"] -margin_right = 1904.0 -margin_bottom = 1064.0 +offset_right = 1904.0 +offset_bottom = 1064.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/vseparation = 16 -custom_constants/hseparation = 16 +theme_override_constants/v_separation = 16 +theme_override_constants/h_separation = 16 columns = 4 __meta__ = { "_edit_use_anchors_": false @@ -101,13 +101,13 @@ anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -114.396 -margin_top = -59.399 -margin_right = -14.3955 -margin_bottom = -14.399 +offset_left = -114.396 +offset_top = -59.399 +offset_right = -14.3955 +offset_bottom = -14.399 +focus_mode = 0 +theme_override_fonts/font = ExtResource( 2 ) focus_mode = 0 -custom_fonts/font = ExtResource( 2 ) -enabled_focus_mode = 0 text = "Save" __meta__ = { "_edit_use_anchors_": false @@ -116,20 +116,20 @@ __meta__ = { [node name="CloseButton" type="Button" parent="Panel/TextEdit"] anchor_left = 1.0 anchor_right = 1.0 -margin_left = -54.3247 -margin_top = 12.0 -margin_right = -14.3247 -margin_bottom = 52.0 +offset_left = -54.3247 +offset_top = 12.0 +offset_right = -14.3247 +offset_bottom = 52.0 +focus_mode = 0 +theme_override_fonts/font = ExtResource( 2 ) focus_mode = 0 -custom_fonts/font = ExtResource( 2 ) -enabled_focus_mode = 0 text = "x" __meta__ = { "_edit_use_anchors_": false } [node name="PopupMenu" type="PopupMenu" parent="."] -margin_right = 20.0 -margin_bottom = 20.0 +offset_right = 20.0 +offset_bottom = 20.0 [connection signal="pressed" from="Panel/TextEdit/SaveButton" to="." method="save"] [connection signal="pressed" from="Panel/TextEdit/CloseButton" to="." method="close"] diff --git a/scenes/file_browser_item.gd b/scenes/file_browser_item.gd index 4db6078..b0bc1f6 100644 --- a/scenes/file_browser_item.gd +++ b/scenes/file_browser_item.gd @@ -4,11 +4,11 @@ extends Control signal clicked(what) signal deleted(what) -export var label: String setget _set_label +@export var label: String: set = _set_label var type = "file" var repository -onready var label_node = $VBoxContainer/Label +@onready var label_node = $VBoxContainer/Label func _ready(): _set_label(label) @@ -36,11 +36,11 @@ func _ready(): if exists_in_wd and exists_in_index and wd_hash != index_hash and offset_index == offset_wd: offset_wd += 1 - $VBoxContainer/Control/Index.rect_position.x += offset_index*offset - $VBoxContainer/Control/Index.rect_position.y -= offset_index*offset + $VBoxContainer/Control/Index.position.x += offset_index*offset + $VBoxContainer/Control/Index.position.y -= offset_index*offset - $VBoxContainer/Control/WD.rect_position.x += offset_wd*offset - $VBoxContainer/Control/WD.rect_position.y -= offset_wd*offset + $VBoxContainer/Control/WD.position.x += offset_wd*offset + $VBoxContainer/Control/WD.position.y -= offset_wd*offset if conflict: $VBoxContainer/Control/Index.self_modulate = Color(1, 0.2, 0.2, 0.5) @@ -55,7 +55,7 @@ func _set_label(new_label): label_node.text = helpers.abbreviate(new_label, 30) func _gui_input(event): - if event is InputEventMouseButton and event.is_pressed() and event.button_index == BUTTON_LEFT: + if event is InputEventMouseButton and event.is_pressed() and event.button_index == MOUSE_BUTTON_LEFT: emit_signal("clicked", self) # if event is InputEventMouseButton and event.is_pressed() and event.button_index == BUTTON_RIGHT and status != IconStatus.REMOVED: # $PopupMenu.set_position(get_global_mouse_position()) diff --git a/scenes/file_browser_item.tscn b/scenes/file_browser_item.tscn index d623e75..57629d1 100644 --- a/scenes/file_browser_item.tscn +++ b/scenes/file_browser_item.tscn @@ -1,125 +1,103 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://dwfuf4xbmljkn"] -[ext_resource path="res://scenes/file_browser_item.gd" type="Script" id=1] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2] -[ext_resource path="res://nodes/document.svg" type="Texture" id=3] -[ext_resource path="res://scenes/drop_area.tscn" type="PackedScene" id=4] +[ext_resource type="Script" path="res://scenes/file_browser_item.gd" id="1"] +[ext_resource type="FontFile" path="res://fonts/default.tres" id="2"] +[ext_resource type="Texture2D" uid="uid://3gckq7gkf67d" path="res://nodes/document.svg" id="3"] +[ext_resource type="PackedScene" path="res://scenes/drop_area.tscn" id="4"] [node name="Control" type="Control"] +custom_minimum_size = Vector2(140, 140) +layout_mode = 3 anchor_right = 0.104 anchor_bottom = 0.126 -margin_right = 0.319992 -margin_bottom = -0.0800018 -rect_min_size = Vector2( 140, 140 ) +offset_right = 0.319992 +offset_bottom = -0.0800018 mouse_filter = 1 -script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("1") [node name="Control" type="Control" parent="."] +anchors_preset = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -__meta__ = { -"_edit_use_anchors_": false -} -[node name="DropArea" parent="Control" instance=ExtResource( 4 )] -position = Vector2( 0, 0 ) +[node name="DropArea" parent="Control" instance=ExtResource("4")] +position = Vector2(0, 0) [node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Control2" type="Control" parent="VBoxContainer"] -margin_right = 200.0 -margin_bottom = 2.0 +layout_mode = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.13 [node name="Control" type="Control" parent="VBoxContainer"] -margin_top = 6.0 -margin_right = 200.0 -margin_bottom = 96.0 -rect_min_size = Vector2( 0, 90 ) -mouse_filter = 2 +custom_minimum_size = Vector2(0, 90) +layout_mode = 2 size_flags_vertical = 3 +mouse_filter = 2 [node name="ColorRect" type="ColorRect" parent="VBoxContainer/Control"] visible = false +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 -color = Color( 0.203922, 0.721569, 0.501961, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0.203922, 0.721569, 0.501961, 1) [node name="HEAD" type="TextureRect" parent="VBoxContainer/Control"] -self_modulate = Color( 0, 0, 0, 0.317647 ) +self_modulate = Color(0, 0, 0, 0.317647) +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -9.54361 -margin_top = 0.372345 -margin_right = -25.5436 -margin_bottom = -15.6277 -rect_scale = Vector2( 1.2, 1.2 ) -texture = ExtResource( 3 ) -expand = true +offset_left = -9.54361 +offset_top = 0.372345 +offset_right = -25.5436 +offset_bottom = -15.6277 +scale = Vector2(1.2, 1.2) +texture = ExtResource("3") +expand_mode = 1 stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Index" type="TextureRect" parent="VBoxContainer/Control"] -self_modulate = Color( 0.54902, 0.45098, 1, 0.654902 ) +self_modulate = Color(0.54902, 0.45098, 1, 0.654902) +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -1.15317 -margin_top = 4.18617 -margin_right = -17.1532 -margin_bottom = -11.8138 -rect_scale = Vector2( 1.1, 1.1 ) -texture = ExtResource( 3 ) -expand = true +offset_left = -1.15317 +offset_top = 4.18617 +offset_right = -17.1532 +offset_bottom = -11.8138 +scale = Vector2(1.1, 1.1) +texture = ExtResource("3") +expand_mode = 1 stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": false -} [node name="WD" type="TextureRect" parent="VBoxContainer/Control"] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 8.0 -margin_top = 8.0 -margin_right = -8.0 -margin_bottom = -8.0 -texture = ExtResource( 3 ) -expand = true +offset_left = 8.0 +offset_top = 8.0 +offset_right = -8.0 +offset_bottom = -8.0 +texture = ExtResource("3") +expand_mode = 1 stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Label" type="Label" parent="VBoxContainer"] -margin_top = 100.0 -margin_right = 200.0 -margin_bottom = 140.0 -rect_min_size = Vector2( 0, 40 ) +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 size_flags_vertical = 7 size_flags_stretch_ratio = 0.0 -custom_fonts/font = ExtResource( 2 ) +theme_override_fonts/font = ExtResource("2") text = "filename" -align = 1 -autowrap = true [node name="PopupMenu" type="PopupMenu" parent="."] -margin_right = 20.0 -margin_bottom = 20.0 + [connection signal="id_pressed" from="PopupMenu" to="." method="_popup_menu_pressed"] diff --git a/scenes/game.gd b/scenes/game.gd index 2f2a0b5..613e036 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -40,7 +40,7 @@ func _ready(): if global_shell.run("command -v git &>/dev/null && echo yes || echo no") == "no\n": game.skipped_title = true - get_tree().change_scene("res://scenes/no_git.tscn") + get_tree().change_scene_to_file("res://scenes/no_git.tscn") else: create_file_in_game_env(".gitconfig", helpers.read_file("res://scripts/gitconfig")) @@ -51,8 +51,8 @@ func start_remote_shell(): var user_dir = ProjectSettings.globalize_path("user://") var script_content = helpers.read_file("res://scripts/net-test") var target_filename = user_dir + "net-test" - var target_file = File.new() - target_file.open(target_filename, File.WRITE) + var target_file = FileAccess.open(target_filename,FileAccess.WRITE) + #target_file.open(target_filename, File.WRITE) target_file.store_string(script_content) target_file.close() helpers.exec_async(_perl_executable(), [target_filename, _bash_executable()]) @@ -73,9 +73,9 @@ func shell_received(text): print(text) func _notification(what): - if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST: + if what == NOTIFICATION_WM_CLOSE_REQUEST: #get_tree().quit() # default behavio - get_tree().change_scene("res://scenes/survey.tscn") + get_tree().change_scene_to_file("res://scenes/survey.tscn") func copy_script_to_game_env(name): @@ -86,21 +86,23 @@ func _initial_state(): return {"history": [], "solved_levels": [], "received_hints": [], "cli_badge": [], "played_cards": []} func save_state(): - var savegame = File.new() + var savegame = FileAccess.open(_file,FileAccess.WRITE) - savegame.open(_file, File.WRITE) - savegame.store_line(to_json(state)) + #savegame.open(_file, File.WRITE) + savegame.store_line(JSON.new().stringify(state)) savegame.close() func load_state(): - var savegame = File.new() + var savegame = FileAccess.open(_file,FileAccess.READ) if not savegame.file_exists(_file): save_state() - savegame.open(_file, File.READ) + #savegame.open(_file, File.READ) state = _initial_state() - var new_state = parse_json(savegame.get_line()) + var test_json_conv = JSON.new() + test_json_conv.parse(savegame.get_line()) + var new_state = test_json_conv.get_data() for key in new_state: state[key] = new_state[key] savegame.close() @@ -118,7 +120,7 @@ func notify(text, target=null, hint_slug=null): if hint_slug in state["received_hints"]: return - var notification = preload("res://scenes/notification.tscn").instance() + var notification = preload("res://scenes/notification.tscn").instantiate() notification.text = text if not target: target = get_tree().root @@ -132,7 +134,7 @@ func open_survey(): OS.shell_open("https://docs.google.com/forms/d/e/1FAIpQLSehHVcYfELT59h6plcn2ilbuqBcmDX3TH0qzB4jCgFIFOy_qg/viewform") func toggle_music(): - var music = game.find_node("Music") + var music = game.find_child("Music") if music.volume_db > -20: music.volume_db -= 100 else: @@ -142,13 +144,13 @@ func shell_test(command): mutex.lock() #print("go") #print(command) - var before = OS.get_ticks_msec() + var before = Time.get_ticks_msec() while not $ShellServer._connected: $ShellServer._process(0.1) var response = $ShellServer.send(command) - var after = OS.get_ticks_msec() + var after = Time.get_ticks_msec() #print("took " + str(after-before)+" ms") #print("stop") mutex.unlock() diff --git a/scenes/helpers.gd b/scenes/helpers.gd index 57dd61f..b4ac08f 100644 --- a/scenes/helpers.gd +++ b/scenes/helpers.gd @@ -22,30 +22,31 @@ func exec(command, args=[], crash_on_fail=true): var debug = false if debug: - print("exec: %s [%s]" % [command, PoolStringArray(args).join(", ")]) + print("exec: %s [%s]" % [command, ", ".join(PackedStringArray(args))]) var output = [] - var exit_code = OS.execute(command, args, true, output, true) + var exit_code = OS.execute(command, args, output, true) output = output[0] if exit_code != 0 and crash_on_fail: - helpers.crash("OS.execute failed: %s [%s] Output: %s \nExit Code %d" % [command, PoolStringArray(args).join(", "), output, exit_code]) + helpers.crash("OS.execute failed: %s [%s] Output: %s \nExit Code %d" % [command, ", ".join(PackedStringArray(args)), output, exit_code]) elif debug: print("Output: %s" %output) return {"output": output, "exit_code": exit_code} func exec_async(command, args=[]): - OS.execute(command, args, false) + #thread needed for async + OS.execute(command, args) # Return the contents of a file. If no fallback_string is provided, crash when # the file doesn't exist. func read_file(path, fallback_string=null): if debug_file_io: print("reading " + path) - var file = File.new() - var open_status = file.open(path, File.READ) - if open_status == OK: + var file = FileAccess.open(path,FileAccess.READ) + #var open_status = file.open(path, File.READ) + if file != null: var content = file.get_as_text() file.close() return content @@ -62,13 +63,13 @@ func write_file(path, content): # Create the base directory of the file, if it doesn't exist. var parts = Array(path.split("/")) parts.pop_back() - var dirname = PoolStringArray(parts).join("/") - var dir = Directory.new() - if not dir.dir_exists(path): - dir.make_dir_recursive(dirname) + var dirname = "/".join(PackedStringArray(parts)) + var dir = DirAccess.open(path) + if not dir: + DirAccess.make_dir_recursive_absolute(dirname) - var file = File.new() - file.open(path, File.WRITE) + var file = FileAccess.open(path,FileAccess.WRITE) + #file.open(path, File.WRITE) file.store_string(content) file.close() return true diff --git a/scenes/input_dialog.tscn b/scenes/input_dialog.tscn index 17876b9..cba4c54 100644 --- a/scenes/input_dialog.tscn +++ b/scenes/input_dialog.tscn @@ -2,13 +2,13 @@ [ext_resource path="res://scripts/input_dialog.gd" type="Script" id=1] -[node name="InputDialog" type="WindowDialog"] +[node name="InputDialog" type="Window"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 816.0 -margin_top = 446.0 -margin_right = -826.0 -margin_bottom = -591.0 +offset_left = 816.0 +offset_top = 446.0 +offset_right = -826.0 +offset_bottom = -591.0 window_title = "Please enter a value:" script = ExtResource( 1 ) __meta__ = { @@ -21,4 +21,4 @@ anchor_bottom = 1.0 __meta__ = { "_edit_use_anchors_": false } -[connection signal="text_entered" from="LineEdit" to="." method="_text_entered"] +[connection signal="text_submitted" from="LineEdit" to="." method="_text_entered"] diff --git a/scenes/level.gd b/scenes/level.gd index 97c1746..d2a18e2 100644 --- a/scenes/level.gd +++ b/scenes/level.gd @@ -15,8 +15,8 @@ func load(path): var parts = path.split("/") slug = parts[parts.size()-1] - var dir = Directory.new() - if dir.file_exists(path): + var file = FileAccess.open(path, FileAccess.READ) + if file: # This is a new-style level. var config = helpers.parse(path) diff --git a/scenes/level_select.gd b/scenes/level_select.gd index acd0866..82daec0 100644 --- a/scenes/level_select.gd +++ b/scenes/level_select.gd @@ -1,6 +1,6 @@ extends Control -onready var level_list = $ScrollContainer/MarginContainer/Levels +@onready var level_list = $ScrollContainer/MarginContainer/Levels func _ready(): reload() @@ -8,10 +8,10 @@ func _ready(): func load(chapter_id, level_id): game.current_chapter = chapter_id game.current_level = level_id - get_tree().change_scene("res://scenes/main.tscn") + get_tree().change_scene_to_file("res://scenes/main.tscn") func back(): - get_tree().change_scene("res://scenes/title.tscn") + get_tree().change_scene_to_file("res://scenes/title.tscn") func reload(): @@ -27,8 +27,9 @@ func reload(): var l = Label.new() l.text = chapter.slug - l.set("custom_fonts/font", preload("res://fonts/big.tres")) - l.align = HALIGN_CENTER + l.set("theme_override_fonts/font", preload("res://fonts/big.tres")) + #l.align = HORIZONTAL_ALIGNMENT_CENTER + l.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER level_list.add_child(l) for level in chapter.levels: @@ -36,19 +37,19 @@ func reload(): var b = Button.new() b.text = level.title - b.align = HALIGN_LEFT + #b.align = HORIZONTAL_ALIGNMENT_CENTER #ToDo align? b.size_flags_horizontal = SIZE_EXPAND_FILL - b.connect("pressed", self, "load", [chapter_id, level_id]) + b.connect("pressed", Callable(self, "load").bind(chapter_id, level_id)) var slug = chapter.slug + "/" + level.slug if slug in game.state["solved_levels"]: - b.set("custom_colors/font_color", Color(0.1, 0.8, 0.1, 1)) - b.set("custom_colors/font_color_hover", Color(0.1, 0.8, 0.1, 1)) - b.set("custom_colors/font_color_pressed", Color(0.1, 0.8, 0.1, 1)) + b.set("theme_override_colors/font_color", Color(0.1, 0.8, 0.1, 1)) + b.set("theme_override_colors/font_hover_color", Color(0.1, 0.8, 0.1, 1)) + b.set("theme_override_colors/font_pressed_color", Color(0.1, 0.8, 0.1, 1)) hb.add_child(b) # - var badge = preload("res://scenes/cli_badge.tscn").instance() + var badge = preload("res://scenes/cli_badge.tscn").instantiate() hb.add_child(badge) badge.active = slug in game.state["cli_badge"] badge.sparkling = false diff --git a/scenes/level_select.tscn b/scenes/level_select.tscn index 2f8e4f3..df147d3 100644 --- a/scenes/level_select.tscn +++ b/scenes/level_select.tscn @@ -29,36 +29,36 @@ __meta__ = { } [node name="MarginContainer" type="MarginContainer" parent="ScrollContainer"] -margin_right = 1920.0 -margin_bottom = 1080.0 +offset_right = 1920.0 +offset_bottom = 1080.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/margin_right = 600 -custom_constants/margin_left = 600 +theme_override_constants/margin_right = 600 +theme_override_constants/margin_left = 600 [node name="Levels" type="VBoxContainer" parent="ScrollContainer/MarginContainer"] -margin_left = 600.0 -margin_right = 1320.0 -margin_bottom = 1080.0 +offset_left = 600.0 +offset_right = 1320.0 +offset_bottom = 1080.0 size_flags_horizontal = 3 [node name="Button" type="Button" parent="."] -margin_left = 61.0902 -margin_top = 59.0538 -margin_right = 126.09 -margin_bottom = 98.0538 +offset_left = 61.0902 +offset_top = 59.0538 +offset_right = 126.09 +offset_bottom = 98.0538 text = "Back" __meta__ = { "_edit_use_anchors_": false } [node name="Button2" type="Button" parent="."] -margin_left = 138.588 -margin_top = 59.3009 -margin_right = 226.588 -margin_bottom = 98.3009 +offset_left = 138.588 +offset_top = 59.3009 +offset_right = 226.588 +offset_bottom = 98.3009 +focus_mode = 0 focus_mode = 0 -enabled_focus_mode = 0 text = "Reload" __meta__ = { "_edit_use_anchors_": false @@ -68,10 +68,10 @@ __meta__ = { [node name="HelpLabel" type="Label" parent="."] visible = false -margin_left = 63.0 -margin_top = 159.0 -margin_right = 378.0 -margin_bottom = 220.0 +offset_left = 63.0 +offset_top = 159.0 +offset_right = 378.0 +offset_bottom = 220.0 text = "Help us improving Oh My Git! by answering some questions:" __meta__ = { @@ -79,13 +79,13 @@ __meta__ = { } [node name="Button3" type="Button" parent="HelpLabel"] -margin_left = -2.0 -margin_top = 68.0 -margin_right = 313.0 -margin_bottom = 118.0 -custom_styles/hover = SubResource( 1 ) -custom_styles/focus = ExtResource( 3 ) -custom_styles/normal = ExtResource( 3 ) +offset_left = -2.0 +offset_top = 68.0 +offset_right = 313.0 +offset_bottom = 118.0 +theme_override_styles/hover = SubResource( 1 ) +theme_override_styles/focus = ExtResource( 3 ) +theme_override_styles/normal = ExtResource( 3 ) text = "To the survey /o/" __meta__ = { "_edit_use_anchors_": false diff --git a/scenes/levels.gd b/scenes/levels.gd index 593b728..a5446e7 100644 --- a/scenes/levels.gd +++ b/scenes/levels.gd @@ -8,9 +8,8 @@ func _ready(): func reload(): chapters = [] - var dir = Directory.new() - dir.open("res://levels") - dir.list_dir_begin() + var dir = DirAccess.open("res://levels") + dir.list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547 var chapter_names = [] diff --git a/scenes/main.gd b/scenes/main.gd index 0ad09c2..96c4203 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -2,30 +2,30 @@ extends Control var dragged = null -onready var terminal = $Rows/Controls/Terminal -onready var input = terminal.input -onready var output = terminal.output -onready var repositories_node = $Rows/Columns/Repositories +@onready var terminal = $Rows/Controls/Terminal +@onready var input = terminal.input +@onready var output = terminal.output +@onready var repositories_node = $Rows/Columns/Repositories var repositories = {} -onready var next_level_button = $Menu/NextLevelButton -onready var level_name = $Rows/Columns/RightSide/LevelInfo/LevelPanel/LevelName -onready var level_description = $Rows/Columns/RightSide/LevelInfo/LevelPanel/Text/LevelDescription -onready var level_congrats = $Rows/Columns/RightSide/LevelInfo/LevelPanel/Text/LevelCongrats -onready var cards = $Rows/Controls/Cards -onready var file_browser = $Rows/Columns/RightSide/FileBrowser -onready var goals = $Rows/Columns/RightSide/LevelInfo/LevelPanel/Goals +@onready var next_level_button = $Menu/NextLevelButton +@onready var level_name = $Rows/Columns/RightSide/LevelInfo/LevelPanel/LevelName +@onready var level_description = $Rows/Columns/RightSide/LevelInfo/LevelPanel/Text/LevelDescription +@onready var level_congrats = $Rows/Columns/RightSide/LevelInfo/LevelPanel/Text/LevelCongrats +@onready var cards = $Rows/Controls/Cards +@onready var file_browser = $Rows/Columns/RightSide/FileBrowser +@onready var goals = $Rows/Columns/RightSide/LevelInfo/LevelPanel/Goals var _hint_server var _hint_client_connection func _ready(): - _hint_server = TCP_Server.new() + _hint_server = TCPServer.new() _hint_server.listen(1235) var args = helpers.parse_args() if args.has("sandbox"): - var err = get_tree().change_scene("res://scenes/sandbox.tscn") + var err = get_tree().change_scene_to_file("res://scenes/sandbox.tscn") if err != OK: helpers.crash("Could not change to sandbox scene") return @@ -55,7 +55,7 @@ func _process(delta): # Magic height number to fix a weird rescaling bug that affected # the Rows height. - $Rows.rect_size.y = 1064 + $Rows.size.y = 1064 func load_chapter(id): game.current_chapter = id @@ -73,8 +73,8 @@ func load_level(level_id): levels.chapters[game.current_chapter].levels[game.current_level].construct() var level = levels.chapters[game.current_chapter].levels[game.current_level] - level_description.bbcode_text = level.description[0] - level_congrats.bbcode_text = level.congrats + level_description.text = level.description[0] + level_congrats.text = level.congrats level_name.text = level.title var slug = levels.chapters[game.current_chapter].slug + "/" + level.slug @@ -91,11 +91,11 @@ func load_level(level_id): repositories = {} var repo_names = level.repos.keys() - repo_names.invert() + repo_names.reverse() for r in repo_names: var repo = level.repos[r] - var new_repo = preload("res://scenes/repository.tscn").instance() + var new_repo = preload("res://scenes/repository.tscn").instantiate() new_repo.path = repo.path new_repo.label = repo.slug new_repo.size_flags_horizontal = SIZE_EXPAND_FILL @@ -108,7 +108,7 @@ func load_level(level_id): terminal.repository = repositories[repo_names[repo_names.size()-1]] terminal.clear() - terminal.find_node("TextEditor").close() + terminal.find_child("TextEditor").close() update_repos() @@ -118,7 +118,7 @@ func load_level(level_id): t.wait_time = 1 add_child(t) t.start() - yield(t, "timeout") + await t.timeout AudioServer.set_bus_mute(AudioServer.get_bus_index("SFX"), false) # FIXME: Need to clean these up when switching levels somehow. @@ -148,7 +148,7 @@ func show_win_status(win_states): for state in win_states: var b = Label.new() b.text = state - b.align = HALIGN_LEFT + #b.align = HALIGN_LEFT ToDo align fix var bg = StyleBoxFlat.new() if win_states[state]: bg.bg_color = Color(0.1, 0.5, 0.1) @@ -162,18 +162,18 @@ func show_win_status(win_states): bg.content_margin_top = 8 bg.content_margin_left = 8 bg.content_margin_right = 8 - b.set("custom_styles/normal", bg) + b.set("theme_override_styles/normal", bg) #b.connect("pressed", self, "load", [chapter_id, level_id]) #var slug = chapter.slug + "/" + level.slug goals.add_child(b) - b.autowrap = true + b.autowrap_mode = TextServer.AUTOWRAP_ARBITRARY if not win_states[state]: all_won = false var level = levels.chapters[game.current_chapter].levels[game.current_level] - level_description.bbcode_text = level.description[0] + win_text + level_description.text = level.description[0] + win_text for i in range(1,level.tipp_level+1): - level_description.bbcode_text += level.description[i] + level_description.text += level.description[i] if not level_congrats.visible and all_won and win_states.size() > 0: next_level_button.show() @@ -222,7 +222,7 @@ func new_tip(): var level = levels.chapters[game.current_chapter].levels[game.current_level] if level.description.size() - 1 > level.tipp_level : level.tipp_level += 1 - level_description.bbcode_text += level.description[level.tipp_level] + level_description.text += level.description[level.tipp_level] func back(): - get_tree().change_scene("res://scenes/level_select.tscn") + get_tree().change_scene_to_file("res://scenes/level_select.tscn") diff --git a/scenes/main.tscn b/scenes/main.tscn index e19dec2..e14389f 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,283 +1,210 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=14 format=3 uid="uid://v70goeoq4k5y"] -[ext_resource path="res://scenes/terminal.tscn" type="PackedScene" id=1] -[ext_resource path="res://scenes/main.gd" type="Script" id=2] -[ext_resource path="res://scenes/cards.tscn" type="PackedScene" id=3] -[ext_resource path="res://styles/alert_button.tres" type="StyleBox" id=4] -[ext_resource path="res://scenes/file_browser.tscn" type="PackedScene" id=5] -[ext_resource path="res://styles/theme.tres" type="Theme" id=6] -[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=7] -[ext_resource path="res://sounds/success.wav" type="AudioStream" id=8] -[ext_resource path="res://scenes/cursor.gd" type="Script" id=9] -[ext_resource path="res://scenes/cli_badge.tscn" type="PackedScene" id=10] -[ext_resource path="res://scenes/music_button.tscn" type="PackedScene" id=11] +[ext_resource type="PackedScene" uid="uid://bw81a517gpv2u" path="res://scenes/terminal.tscn" id="1"] +[ext_resource type="Script" path="res://scenes/main.gd" id="2"] +[ext_resource type="PackedScene" path="res://scenes/cards.tscn" id="3"] +[ext_resource type="StyleBox" path="res://styles/alert_button.tres" id="4"] +[ext_resource type="PackedScene" path="res://scenes/file_browser.tscn" id="5"] +[ext_resource type="Theme" uid="uid://d2e7phm6ufj2i" path="res://styles/theme.tres" id="6"] +[ext_resource type="FontFile" path="res://fonts/big.tres" id="7"] +[ext_resource type="AudioStream" uid="uid://b4cfjjgk8un1l" path="res://sounds/success.wav" id="8"] +[ext_resource type="Script" path="res://scenes/cursor.gd" id="9"] +[ext_resource type="PackedScene" path="res://scenes/cli_badge.tscn" id="10"] +[ext_resource type="PackedScene" path="res://scenes/music_button.tscn" id="11"] -[sub_resource type="CircleShape2D" id=1] +[sub_resource type="CircleShape2D" id="1"] radius = 1.0 -[sub_resource type="StyleBoxFlat" id=2] +[sub_resource type="StyleBoxFlat" id="2"] content_margin_left = 10.0 -content_margin_right = 10.0 content_margin_top = 5.0 +content_margin_right = 10.0 content_margin_bottom = 5.0 -bg_color = Color( 0.847059, 0.0666667, 0.0666667, 1 ) +bg_color = Color(0.847059, 0.0666667, 0.0666667, 1) corner_radius_top_left = 3 corner_radius_top_right = 3 corner_radius_bottom_right = 3 corner_radius_bottom_left = 3 [node name="Main" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 8.0 -margin_top = 8.0 -margin_right = -8.0 -margin_bottom = -8.0 +offset_left = 8.0 +offset_top = 8.0 +offset_right = -8.0 +offset_bottom = -8.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 -theme = ExtResource( 6 ) -script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} +theme = ExtResource("6") +script = ExtResource("2") [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = -1 [node name="Background" type="ColorRect" parent="CanvasLayer"] +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 -color = Color( 0.0705882, 0.0705882, 0.0705882, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0.0705882, 0.0705882, 0.0705882, 1) [node name="Rows" type="VBoxContainer" parent="."] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -mouse_filter = 2 size_flags_vertical = 3 -custom_constants/separation = 8 -__meta__ = { -"_edit_use_anchors_": false -} +mouse_filter = 2 +theme_override_constants/separation = 8 [node name="Columns" type="HBoxContainer" parent="Rows"] -margin_right = 1904.0 -margin_bottom = 782.0 -mouse_filter = 2 +layout_mode = 2 size_flags_vertical = 3 +mouse_filter = 2 [node name="Repositories" type="VBoxContainer" parent="Rows/Columns"] -margin_right = 1266.0 -margin_bottom = 782.0 -mouse_filter = 2 +layout_mode = 2 size_flags_horizontal = 3 size_flags_stretch_ratio = 2.0 -custom_constants/separation = 8 +mouse_filter = 2 +theme_override_constants/separation = 8 [node name="RightSide" type="VBoxContainer" parent="Rows/Columns"] -margin_left = 1271.0 -margin_right = 1904.0 -margin_bottom = 782.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/separation = 8 +theme_override_constants/separation = 8 [node name="LevelInfo" type="VBoxContainer" parent="Rows/Columns/RightSide"] -margin_right = 633.0 -margin_bottom = 595.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/separation = 8 +theme_override_constants/separation = 8 [node name="LevelPanel" type="VBoxContainer" parent="Rows/Columns/RightSide/LevelInfo"] -margin_right = 633.0 -margin_bottom = 595.0 +layout_mode = 2 size_flags_vertical = 3 [node name="LevelName" type="RichTextLabel" parent="Rows/Columns/RightSide/LevelInfo/LevelPanel"] -margin_right = 633.0 -margin_bottom = 60.0 -rect_min_size = Vector2( 0, 60 ) +custom_minimum_size = Vector2(0, 60) +layout_mode = 2 size_flags_stretch_ratio = 0.0 -custom_fonts/normal_font = ExtResource( 7 ) +theme_override_fonts/normal_font = ExtResource("7") text = "Level name here!" -fit_content_height = true scroll_active = false -__meta__ = { -"_edit_use_anchors_": false -} [node name="Text" type="Control" parent="Rows/Columns/RightSide/LevelInfo/LevelPanel"] -margin_top = 65.0 -margin_right = 633.0 -margin_bottom = 590.0 +layout_mode = 2 size_flags_vertical = 3 [node name="LevelDescription" type="RichTextLabel" parent="Rows/Columns/RightSide/LevelInfo/LevelPanel/Text"] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 size_flags_vertical = 3 bbcode_enabled = true -bbcode_text = "Level description here!" text = "Level description here!" -__meta__ = { -"_edit_use_anchors_": false -} [node name="LevelCongrats" type="RichTextLabel" parent="Rows/Columns/RightSide/LevelInfo/LevelPanel/Text"] visible = false +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 size_flags_vertical = 3 bbcode_enabled = true -bbcode_text = "Level description here!" text = "Level description here!" -__meta__ = { -"_edit_use_anchors_": false -} [node name="Goals" type="VBoxContainer" parent="Rows/Columns/RightSide/LevelInfo/LevelPanel"] -margin_top = 595.0 -margin_right = 633.0 -margin_bottom = 595.0 +layout_mode = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.0 -[node name="FileBrowser" parent="Rows/Columns/RightSide" instance=ExtResource( 5 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_top = 603.0 -margin_right = 633.0 -margin_bottom = 782.0 +[node name="FileBrowser" parent="Rows/Columns/RightSide" instance=ExtResource("5")] +layout_mode = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.3 [node name="Controls" type="HBoxContainer" parent="Rows"] -margin_top = 790.0 -margin_right = 1904.0 -margin_bottom = 1064.0 -mouse_filter = 2 +layout_mode = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.35 +mouse_filter = 2 -[node name="Cards" parent="Rows/Controls" instance=ExtResource( 3 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 1266.0 -margin_bottom = 274.0 +[node name="Cards" parent="Rows/Controls" instance=ExtResource("3")] +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 size_flags_stretch_ratio = 2.0 -[node name="Terminal" parent="Rows/Controls" instance=ExtResource( 1 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 1271.0 -margin_right = 1904.0 -margin_bottom = 274.0 +[node name="Terminal" parent="Rows/Controls" instance=ExtResource("1")] +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="SuccessSound" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 8 ) +stream = ExtResource("8") volume_db = -10.0 [node name="Cursor" type="Node2D" parent="."] -position = Vector2( 68.6342, 59.1206 ) -script = ExtResource( 9 ) +position = Vector2(68.6342, 59.1206) +script = ExtResource("9") [node name="Area2D" type="Area2D" parent="Cursor"] -input_pickable = false collision_layer = 524288 collision_mask = 0 +input_pickable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Cursor/Area2D"] -shape = SubResource( 1 ) +shape = SubResource("1") [node name="Menu" type="HBoxContainer" parent="."] -margin_left = 3.86392 -margin_top = 5.13129 -margin_right = 636.864 -margin_bottom = 44.1313 -custom_constants/separation = 8 -__meta__ = { -"_edit_use_anchors_": false -} +layout_mode = 0 +offset_left = 3.86392 +offset_top = 5.13129 +offset_right = 636.864 +offset_bottom = 44.1313 +theme_override_constants/separation = 8 [node name="BackButton" type="Button" parent="Menu"] -margin_right = 65.0 -margin_bottom = 39.0 +layout_mode = 2 focus_mode = 0 -enabled_focus_mode = 0 text = "Back" -__meta__ = { -"_edit_use_anchors_": false -} [node name="ReloadButton2" type="Button" parent="Menu"] -margin_left = 73.0 -margin_right = 161.0 -margin_bottom = 39.0 +layout_mode = 2 focus_mode = 0 -enabled_focus_mode = 0 text = "Reload" -__meta__ = { -"_edit_use_anchors_": false -} [node name="CardsButton" type="Button" parent="Menu"] visible = false -margin_left = 458.0 -margin_right = 539.0 -margin_bottom = 39.0 +layout_mode = 2 focus_mode = 0 -enabled_focus_mode = 0 text = "Cards!" -__meta__ = { -"_edit_use_anchors_": false -} [node name="Tip!" type="Button" parent="Menu"] visible = false -margin_left = 169.0 -margin_right = 225.0 -margin_bottom = 39.0 +layout_mode = 2 focus_mode = 0 -enabled_focus_mode = 0 text = "Tip!" -__meta__ = { -"_edit_use_anchors_": false -} -[node name="Button3" parent="Menu" instance=ExtResource( 11 )] -margin_left = 169.0 -margin_top = 0.0 -margin_right = 315.0 -margin_bottom = 39.0 +[node name="Button3" parent="Menu" instance=ExtResource("11")] +layout_mode = 2 -[node name="CLIBadge" parent="Menu" instance=ExtResource( 10 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 323.0 -margin_right = 368.0 -margin_bottom = 39.0 +[node name="CLIBadge" parent="Menu" instance=ExtResource("10")] +layout_mode = 2 +expand_mode = 1 [node name="NextLevelButton" type="Button" parent="Menu"] -margin_left = 376.0 -margin_right = 493.0 -margin_bottom = 39.0 +layout_mode = 2 focus_mode = 0 -custom_styles/hover = SubResource( 2 ) -custom_styles/normal = ExtResource( 4 ) -enabled_focus_mode = 0 +theme_override_styles/normal = ExtResource("4") +theme_override_styles/hover = SubResource("2") text = "Next level" -__meta__ = { -"_edit_use_anchors_": false -} + [connection signal="saved" from="Rows/Columns/RightSide/FileBrowser" to="." method="update_repos"] -[connection signal="command_done" from="Rows/Controls/Terminal" to="." method="update_repos"] +[connection signal="command_done_signal" from="Rows/Controls/Terminal" to="." method="update_repos"] [connection signal="pressed" from="Menu/BackButton" to="." method="back"] [connection signal="pressed" from="Menu/ReloadButton2" to="." method="reload_level"] [connection signal="pressed" from="Menu/CardsButton" to="." method="toggle_cards"] diff --git a/scenes/music_button.tscn b/scenes/music_button.tscn index 70f47b0..1e39f27 100644 --- a/scenes/music_button.tscn +++ b/scenes/music_button.tscn @@ -3,12 +3,12 @@ [ext_resource path="res://scenes/music_button.gd" type="Script" id=1] [node name="Button3" type="Button"] -margin_left = 241.005 -margin_top = 58.856 -margin_right = 387.005 -margin_bottom = 97.856 +offset_left = 241.005 +offset_top = 58.856 +offset_right = 387.005 +offset_bottom = 97.856 +focus_mode = 0 focus_mode = 0 -enabled_focus_mode = 0 text = "Toggle music" script = ExtResource( 1 ) __meta__ = { diff --git a/scenes/no_git.tscn b/scenes/no_git.tscn index b4cad7c..87f21ea 100644 --- a/scenes/no_git.tscn +++ b/scenes/no_git.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://styles/theme.tres" type="Theme" id=1] -[ext_resource path="res://images/oh-my-git.png" type="Texture" id=2] +[ext_resource path="res://images/oh-my-git.png" type="Texture2D" id=2] [ext_resource path="res://scenes/no_git.gd" type="Script" id=3] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=5] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=5] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.454902, 0.054902, 0.054902, 1 ) @@ -15,8 +15,8 @@ corner_radius_bottom_left = 8 [node name="Title" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 1.4126 -margin_right = 1.4126 +offset_left = 1.4126 +offset_right = 1.4126 theme = ExtResource( 1 ) script = ExtResource( 3 ) __meta__ = { @@ -24,12 +24,12 @@ __meta__ = { } [node name="Label2" type="Label" parent="."] -margin_left = 797.196 -margin_top = 545.117 -margin_right = 1138.2 -margin_bottom = 601.117 -custom_fonts/font = ExtResource( 5 ) -custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +offset_left = 797.196 +offset_top = 545.117 +offset_right = 1138.2 +offset_bottom = 601.117 +theme_override_fonts/font = ExtResource( 5 ) +theme_override_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { @@ -37,12 +37,12 @@ __meta__ = { } [node name="Label3" type="Label" parent="."] -margin_left = 716.131 -margin_top = 572.398 -margin_right = 1216.13 -margin_bottom = 628.398 -custom_fonts/font = ExtResource( 5 ) -custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +offset_left = 716.131 +offset_top = 572.398 +offset_right = 1216.13 +offset_bottom = 628.398 +theme_override_fonts/font = ExtResource( 5 ) +theme_override_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) text = "Original score by winniehell" align = 1 __meta__ = { @@ -50,50 +50,50 @@ __meta__ = { } [node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 794.627 -margin_top = 959.284 -margin_right = 1146.62 -margin_bottom = 1142.28 +offset_left = 794.627 +offset_top = 959.284 +offset_right = 1146.62 +offset_bottom = 1142.28 __meta__ = { "_edit_use_anchors_": false } [node name="Button" type="Button" parent="VBoxContainer"] visible = false -margin_right = 351.0 -margin_bottom = 39.0 +offset_right = 351.0 +offset_bottom = 39.0 text = "Levels" [node name="Button3" type="Button" parent="VBoxContainer"] visible = false -margin_right = 351.0 -margin_bottom = 39.0 +offset_right = 351.0 +offset_bottom = 39.0 text = "Sandbox" [node name="Button2" type="Button" parent="VBoxContainer"] -margin_right = 351.0 -margin_bottom = 39.0 +offset_right = 351.0 +offset_bottom = 39.0 text = "Sure, I'll install it!" -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="."] -[node name="oh-my-git" type="Sprite" parent="Sprite"] +[node name="oh-my-git" type="Sprite2D" parent="Sprite2D"] position = Vector2( 966.528, 293.526 ) scale = Vector2( 0.320895, 0.320895 ) texture = ExtResource( 2 ) [node name="Panel" type="Panel" parent="."] -margin_left = 695.937 -margin_top = 641.155 -margin_right = 1263.94 -margin_bottom = 911.155 -custom_styles/panel = SubResource( 1 ) +offset_left = 695.937 +offset_top = 641.155 +offset_right = 1263.94 +offset_bottom = 911.155 +theme_override_styles/panel = SubResource( 1 ) [node name="Label" type="Label" parent="Panel"] -margin_left = 20.0 -margin_top = 21.0 -margin_right = 546.0 -margin_bottom = 252.0 +offset_left = 20.0 +offset_top = 21.0 +offset_right = 546.0 +offset_bottom = 252.0 text = "Hi! It seems that you don't have Git installed yet! On Linux, please install it from your package manager, usually the package is called \"git\"! diff --git a/scenes/node.gd b/scenes/node.gd index f19e66a..7004690 100644 --- a/scenes/node.gd +++ b/scenes/node.gd @@ -1,13 +1,13 @@ extends Node2D -var id setget id_set -var content setget content_set -var type setget type_set +var id : set = id_set +var content : set = content_set +var type : set = type_set var repository: Control -onready var content_label = $Content/ContentLabel +@onready var content_label = $Content/ContentLabel -var children = {} setget children_set +var children = {}: set = children_set var id_always_visible = false var held = false var hovered = false @@ -19,7 +19,7 @@ func _ready(): type_set(type) id_set(id) if not repository.simplified_view or (type != "tree" and type != "blob"): - $Pop.pitch_scale = rand_range(0.8, 1.2) + $Pop.pitch_scale = randf_range(0.8, 1.2) $Pop.play() func _process(delta): @@ -75,19 +75,19 @@ func type_set(new_type): z_index = -1 match new_type: "blob": - $Sprite.texture = preload("res://nodes/blob.svg") + $Sprite2D.texture = preload("res://nodes/blob.svg") "tree": - $Sprite.texture = preload("res://nodes/tree.svg") + $Sprite2D.texture = preload("res://nodes/tree.svg") "commit": - $Sprite.texture = preload("res://nodes/commit.svg") + $Sprite2D.texture = preload("res://nodes/commit.svg") game.notify("You can drag these around with your mouse!", self, "drag-nodes") "tag": - $Sprite.texture = preload("res://nodes/blob.svg") + $Sprite2D.texture = preload("res://nodes/blob.svg") "ref": - $Sprite.texture = preload("res://nodes/ref.svg") + $Sprite2D.texture = preload("res://nodes/ref.svg") id_always_visible = true "head": - $Sprite.texture = preload("res://nodes/head3.svg") + $Sprite2D.texture = preload("res://nodes/head3.svg") id_always_visible = false z_index = 0 if id_always_visible: @@ -99,7 +99,7 @@ func children_set(new_children): c.queue_free() for c in new_children: if not children.has(c): - var a = arrow.instance() + var a = arrow.instantiate() if type == "commit": a.source = c a.target = id @@ -128,8 +128,8 @@ func _input(event): if event.is_action_pressed("click") and type != "head": held = true elif event.is_action_pressed("right_click"): - var input = get_tree().get_current_scene().find_node("Input") + var input = get_tree().get_current_scene().find_child("Input") input.text += id - input.caret_position = input.text.length() + input.caret_column = input.text.length() if event.is_action_released("click"): held = false diff --git a/scenes/node.tscn b/scenes/node.tscn index 643a44c..9af9401 100644 --- a/scenes/node.tscn +++ b/scenes/node.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=1] [ext_resource path="res://scenes/node.gd" type="Script" id=2] -[ext_resource path="res://nodes/blob.svg" type="Texture" id=3] +[ext_resource path="res://nodes/blob.svg" type="Texture2D" id=3] [ext_resource path="res://nodes/pop.wav" type="AudioStream" id=5] [ext_resource path="res://scenes/drop_area.tscn" type="PackedScene" id=6] @@ -30,28 +30,28 @@ z_index = -1 [node name="Rect" type="ColorRect" parent="."] visible = false -margin_left = -29.0 -margin_top = -28.0 -margin_right = 29.0 -margin_bottom = 29.0 +offset_left = -29.0 +offset_top = -28.0 +offset_right = 29.0 +offset_bottom = 29.0 mouse_filter = 2 color = Color( 1, 1, 1, 0 ) __meta__ = { "_edit_use_anchors_": false } -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="."] scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 3 ) [node name="ID" type="Label" parent="."] visible = false -margin_left = -19.9265 -margin_top = -12.0097 -margin_right = 129.073 -margin_bottom = 40.9903 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 1, 1, 1 ) +offset_left = -19.9265 +offset_top = -12.0097 +offset_right = 129.073 +offset_bottom = 40.9903 +theme_override_fonts/font = ExtResource( 1 ) +theme_override_colors/font_color = Color( 1, 1, 1, 1 ) text = "object_id" __meta__ = { "_edit_use_anchors_": false @@ -71,13 +71,13 @@ z_index = 1 [node name="ContentLabel" type="Label" parent="Content"] visible = false -margin_left = -22.057 -margin_top = 31.1738 -margin_right = -12.057 -margin_bottom = 66.1738 -custom_styles/normal = SubResource( 2 ) -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 1, 1, 1 ) +offset_left = -22.057 +offset_top = 31.1738 +offset_right = -12.057 +offset_bottom = 66.1738 +theme_override_styles/normal = SubResource( 2 ) +theme_override_fonts/font = ExtResource( 1 ) +theme_override_colors/font_color = Color( 1, 1, 1, 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/scenes/notification.gd b/scenes/notification.gd index 8825be2..b369450 100644 --- a/scenes/notification.gd +++ b/scenes/notification.gd @@ -1,6 +1,6 @@ extends Node2D -var text setget _set_text +var text : set = _set_text var button_texts = ["Got it!", "Interesting!", "Very useful!", "Cool!", "Nice!", "Thanks!", "Whatever...", "Okay!", "Yay!", "Awesome!"] func _ready(): diff --git a/scenes/notification.tscn b/scenes/notification.tscn index 5d944e0..b89b25e 100644 --- a/scenes/notification.tscn +++ b/scenes/notification.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=1] [ext_resource path="res://styles/theme.tres" type="Theme" id=2] [ext_resource path="res://scenes/notification.gd" type="Script" id=3] @@ -16,12 +16,12 @@ z_index = 4096 script = ExtResource( 3 ) [node name="Panel" type="Panel" parent="."] -margin_left = 8.0 -margin_top = 8.0 -margin_right = 492.0 -margin_bottom = 170.0 +offset_left = 8.0 +offset_top = 8.0 +offset_right = 492.0 +offset_bottom = 170.0 theme = ExtResource( 2 ) -custom_styles/panel = SubResource( 1 ) +theme_override_styles/panel = SubResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -29,11 +29,11 @@ __meta__ = { [node name="Label" type="Label" parent="Panel"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 16.0 -margin_top = 13.0 -margin_right = -15.0 -margin_bottom = -15.0 -custom_fonts/font = ExtResource( 1 ) +offset_left = 16.0 +offset_top = 13.0 +offset_right = -15.0 +offset_bottom = -15.0 +theme_override_fonts/font = ExtResource( 1 ) text = "This is a hint! This is a hint! This is a hint! This is a hint! This is a hint! This is a hint! This is a hint! This is a hint! This is a hint!" autowrap = true __meta__ = { @@ -44,18 +44,18 @@ __meta__ = { anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = -58.0 +offset_top = -58.0 __meta__ = { "_edit_use_anchors_": false } [node name="OK" type="Button" parent="Panel/CenterContainer"] -margin_left = 202.0 -margin_top = 9.0 -margin_right = 282.0 -margin_bottom = 48.0 +offset_left = 202.0 +offset_top = 9.0 +offset_right = 282.0 +offset_bottom = 48.0 +focus_mode = 0 focus_mode = 0 -enabled_focus_mode = 0 text = "Got it!" __meta__ = { "_edit_use_anchors_": false diff --git a/scenes/player.tscn b/scenes/player.tscn index 8d723f7..43d93e8 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=2] [sub_resource type="GDScript" id=1] -script/source = "extends KinematicBody2D +script/source = "extends CharacterBody2D -export var speed = 800 +@export var speed = 800 func _ready(): pass @@ -11,20 +11,21 @@ func _ready(): func _process(delta): var right = Input.get_action_strength(\"right\") - Input.get_action_strength(\"left\") var down = Input.get_action_strength(\"down\") - Input.get_action_strength(\"up\") - move_and_slide(Vector2(right, down).normalized()*speed) + set_velocity(Vector2(right, down).normalized()*speed) + move_and_slide() " [sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 50, 50 ) +size = Vector2( 50, 50 ) -[node name="Player" type="KinematicBody2D"] +[node name="Player" type="CharacterBody2D"] script = SubResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 2 ) [node name="Rect" type="ColorRect" parent="."] -margin_left = -50.0 -margin_top = -50.0 -margin_right = 50.0 -margin_bottom = 50.0 +offset_left = -50.0 +offset_top = -50.0 +offset_right = 50.0 +offset_bottom = 50.0 diff --git a/scenes/repository.gd b/scenes/repository.gd index 916bb03..ae6f886 100644 --- a/scenes/repository.gd +++ b/scenes/repository.gd @@ -1,14 +1,14 @@ extends Control -onready var nodes = $Rows/RepoVis/Nodes -onready var label_node = $Rows/RepoVis/Label -onready var path_node = $Rows/RepoVis/Path -onready var simplify_checkbox = $Rows/RepoVis/SimplifyCheckbox +@onready var nodes = $Rows/RepoVis/Nodes +@onready var label_node = $Rows/RepoVis/Label +@onready var path_node = $Rows/RepoVis/Path3D +@onready var simplify_checkbox = $Rows/RepoVis/SimplifyCheckbox -export var label: String setget set_label -export var path: String setget set_path, get_path -export var simplified_view = true setget set_simplified_view -export var editable_path = false setget set_editable_path +@export var label: String: set = set_label +@export var path: String: get = get_the_path, set = set_path +@export var simplified_view = true: set = set_simplified_view +@export var editable_path = false: set = set_editable_path var type = "remote" @@ -38,15 +38,15 @@ func _ready(): #update_node_positions() func _process(_delta): - nodes.rect_pivot_offset = nodes.rect_size / 2 + nodes.pivot_offset = nodes.size / 2 if path: apply_forces() func _unhandled_input(event): - if event.is_action_pressed("zoom_out") and nodes.rect_scale.x > 0.3: - nodes.rect_scale -= Vector2(0.05, 0.05) - if event.is_action_pressed("zoom_in") and nodes.rect_scale.x < 2: - nodes.rect_scale += Vector2(0.05, 0.05) + if event.is_action_pressed("zoom_out") and nodes.scale.x > 0.3: + nodes.scale -= Vector2(0.05, 0.05) + if event.is_action_pressed("zoom_in") and nodes.scale.x < 2: + nodes.scale += Vector2(0.05, 0.05) func there_is_a_git(): return shell.run("test -d .git && echo yes || echo no") == "yes\n" @@ -78,7 +78,7 @@ func set_path(new_path): # if is_inside_tree(): # update_everything() -func get_path(): +func get_the_path(): return path func set_label(new_label): @@ -93,7 +93,7 @@ func set_label(new_label): label_node.text = new_label func random_position(): - return Vector2(rand_range(0, rect_size.x), rand_range(0, rect_size.y)) + return Vector2(randf_range(0, size.x), randf_range(0, size.y)) func update_objects(): all_objects_cache = all_objects() @@ -109,7 +109,7 @@ func update_objects(): if type == "tree" or type == "blob": continue - var n = node.instance() + var n = node.instantiate() n.id = o n.type = object_type(o) n.content = object_content(o) @@ -162,12 +162,12 @@ func update_node_positions(): if objects.has(target_reference): var target = objects[target_reference] objects["HEAD"].position = Vector2(target.position.x ,target.position.y - 100) - + func update_refs(): all_refs_cache = all_refs() for r in all_refs_cache: if not objects.has(r): - var n = node.instance() + var n = node.instantiate() n.id = r n.type = "ref" n.content = "" @@ -193,10 +193,10 @@ func apply_forces(): var f = 2000/pow(d+0.00001,1.5) o.position += dir*f o2.position -= dir*f - var center_of_gravity = nodes.rect_size/2 + var center_of_gravity = nodes.size/2 var d = o.position.distance_to(center_of_gravity) var dir = (o.position - center_of_gravity).normalized() - var f = (d+0.00001)*(Vector2(nodes.rect_size.y/10, nodes.rect_size.x/3).normalized()/30) + var f = (d+0.00001)*(Vector2(nodes.size.y/10, nodes.size.x/3).normalized()/30) o.position -= dir*f func find_position(n): @@ -219,7 +219,8 @@ func git(args, splitlines = false): if splitlines: o = o.split("\n") # Remove last empty line. - o.remove(len(o)-1) + o.remove_at(len(o)-1) + else: # Remove trailing newline. o = o.substr(0,len(o)-1) @@ -227,13 +228,13 @@ func git(args, splitlines = false): func update_head(): if not objects.has("HEAD"): - var n = node.instance() + var n = node.instantiate() n.id = "HEAD" n.type = "head" n.content = "" n.repository = self n.position = find_position(n) - + objects["HEAD"] = n nodes.add_child(n) var n = objects["HEAD"] @@ -309,7 +310,7 @@ func ref_target(ref): func set_simplified_view(simplify): simplified_view = simplify if simplify_checkbox: - simplify_checkbox.pressed = simplify + simplify_checkbox.button_pressed = simplify for o in objects: var obj = objects[o] diff --git a/scenes/repository.tscn b/scenes/repository.tscn index 566b5e8..bb53310 100644 --- a/scenes/repository.tscn +++ b/scenes/repository.tscn @@ -2,13 +2,13 @@ [ext_resource path="res://scenes/repository.gd" type="Script" id=1] [ext_resource path="res://styles/theme.tres" type="Theme" id=2] -[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=3] +[ext_resource path="res://fonts/big.tres" type="FontFile" id=3] [ext_resource path="res://scenes/drop_area.tscn" type="PackedScene" id=4] [node name="Repository" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -rect_clip_content = true +clip_contents = true mouse_filter = 2 theme = ExtResource( 2 ) script = ExtResource( 1 ) @@ -22,8 +22,8 @@ anchor_bottom = 1.0 mouse_filter = 2 [node name="RepoVis" type="Control" parent="Rows"] -margin_right = 1920.0 -margin_bottom = 1080.0 +offset_right = 1920.0 +offset_bottom = 1080.0 mouse_filter = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -35,7 +35,7 @@ __meta__ = { anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = -4.0 +offset_top = -4.0 mouse_filter = 2 color = Color( 0.196078, 0.184314, 0.435294, 1 ) __meta__ = { @@ -48,11 +48,11 @@ position = Vector2( 71.6342, -29.3427 ) [node name="Label" type="Label" parent="Rows/RepoVis"] anchor_top = 1.0 anchor_bottom = 1.0 -margin_left = 7.06314 -margin_top = -64.5048 -margin_right = 229.063 -margin_bottom = -8.50476 -custom_fonts/font = ExtResource( 3 ) +offset_left = 7.06314 +offset_top = -64.5048 +offset_right = 229.063 +offset_bottom = -8.50476 +theme_override_fonts/font = ExtResource( 3 ) text = "Repo name" __meta__ = { "_edit_use_anchors_": false @@ -60,10 +60,10 @@ __meta__ = { [node name="IndexLabel" type="Label" parent="Rows/RepoVis"] visible = false -margin_left = 21.0 -margin_top = 65.0 -margin_right = 377.0 -margin_bottom = 108.0 +offset_left = 21.0 +offset_top = 65.0 +offset_right = 377.0 +offset_bottom = 108.0 text = "Index:" __meta__ = { "_edit_use_anchors_": false @@ -71,10 +71,10 @@ __meta__ = { [node name="Button" type="Button" parent="Rows/RepoVis"] visible = false -margin_left = 36.5602 -margin_top = 67.9891 -margin_right = 119.56 -margin_bottom = 109.989 +offset_left = 36.5602 +offset_top = 67.9891 +offset_right = 119.56 +offset_bottom = 109.989 text = "Update" __meta__ = { "_edit_use_anchors_": false @@ -84,12 +84,12 @@ __meta__ = { visible = false anchor_left = 1.0 anchor_right = 1.0 -margin_left = -208.715 -margin_top = 17.9594 -margin_right = -15.7146 -margin_bottom = 42.9594 +offset_left = -208.715 +offset_top = 17.9594 +offset_right = -15.7146 +offset_bottom = 42.9594 +focus_mode = 0 focus_mode = 0 -enabled_focus_mode = 0 text = "Hide trees and blobs" __meta__ = { "_edit_use_anchors_": false @@ -98,18 +98,18 @@ __meta__ = { [node name="Nodes" type="Control" parent="Rows/RepoVis"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_bottom = -6.10352e-05 +offset_bottom = -6.10352e-05 mouse_filter = 2 __meta__ = { "_edit_use_anchors_": false } -[node name="Path" type="LineEdit" parent="Rows/RepoVis"] +[node name="Path3D" type="LineEdit" parent="Rows/RepoVis"] visible = false -margin_left = 23.0 -margin_top = 12.0 -margin_right = 374.0 -margin_bottom = 61.0 +offset_left = 23.0 +offset_top = 12.0 +offset_right = 374.0 +offset_bottom = 61.0 __meta__ = { "_edit_use_anchors_": false } @@ -117,4 +117,4 @@ __meta__ = { [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] [connection signal="pressed" from="Rows/RepoVis/Button" to="." method="update_everything"] [connection signal="toggled" from="Rows/RepoVis/SimplifyCheckbox" to="." method="set_simplified_view"] -[connection signal="text_entered" from="Rows/RepoVis/Path" to="." method="set_path"] +[connection signal="text_submitted" from="Rows/RepoVis/Path3D" to="." method="set_path"] diff --git a/scenes/sandbox.gd b/scenes/sandbox.gd index ea57d5e..864ec6d 100644 --- a/scenes/sandbox.gd +++ b/scenes/sandbox.gd @@ -8,11 +8,11 @@ func _ready(): if args["sandbox"] is String: if args["sandbox"] == ".": args["sandbox"] = OS.get_environment("PWD") - var dir = Directory.new() - if dir.dir_exists(args["sandbox"]): + + if DirAccess.open(args["sandbox"]): path = args["sandbox"] else: - helpers.crash("Directory %s does not exist" % args["sandbox"]) + helpers.crash("DirAccess %s does not exist" % args["sandbox"]) if path == null: path = game.tmp_prefix+"/repos/sandbox/" @@ -25,7 +25,8 @@ func _ready(): $Columns/Repository.path = path - get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1920, 1080), 1.5) + #ToDo strech modes + #get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1920, 1080), 1.5) $Columns/Terminal.repository = $Columns/Repository diff --git a/scenes/sandbox.tscn b/scenes/sandbox.tscn index ee28577..67f8791 100644 --- a/scenes/sandbox.tscn +++ b/scenes/sandbox.tscn @@ -1,51 +1,42 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://bdev1n7xpa2yd"] -[ext_resource path="res://scenes/terminal.tscn" type="PackedScene" id=1] -[ext_resource path="res://scenes/repository.tscn" type="PackedScene" id=2] -[ext_resource path="res://styles/theme.tres" type="Theme" id=3] -[ext_resource path="res://scenes/sandbox.gd" type="Script" id=4] +[ext_resource type="PackedScene" uid="uid://bw81a517gpv2u" path="res://scenes/terminal.tscn" id="1"] +[ext_resource type="PackedScene" path="res://scenes/repository.tscn" id="2"] +[ext_resource type="Theme" uid="uid://d2e7phm6ufj2i" path="res://styles/theme.tres" id="3"] +[ext_resource type="Script" path="res://scenes/sandbox.gd" id="4"] [node name="Sandbox" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -theme = ExtResource( 3 ) -script = ExtResource( 4 ) -__meta__ = { -"_edit_use_anchors_": false -} +grow_horizontal = 2 +grow_vertical = 2 +theme = ExtResource("3") +script = ExtResource("4") [node name="Background" type="ColorRect" parent="."] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 -color = Color( 0.0705882, 0.0705882, 0.0705882, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0.0705882, 0.0705882, 0.0705882, 1) [node name="Columns" type="HSplitContainer" parent="."] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 5.0 -margin_right = -5.0 -margin_bottom = -5.0 -__meta__ = { -"_edit_use_anchors_": false -} +offset_left = 5.0 +offset_top = 5.0 +offset_right = -5.0 +offset_bottom = -5.0 -[node name="Repository" parent="Columns" instance=ExtResource( 2 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 949.0 -margin_bottom = 1070.0 +[node name="Repository" parent="Columns" instance=ExtResource("2")] +layout_mode = 2 size_flags_horizontal = 3 -[node name="Terminal" parent="Columns" instance=ExtResource( 1 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 961.0 -margin_right = 1910.0 -margin_bottom = 1070.0 +[node name="Terminal" parent="Columns" instance=ExtResource("1")] +layout_mode = 2 size_flags_horizontal = 3 -[connection signal="command_done" from="Columns/Terminal" to="." method="update_repo"] + +[connection signal="command_done_signal" from="Columns/Terminal" to="." method="update_repo"] diff --git a/scenes/shell.gd b/scenes/shell.gd index e406540..39b19b5 100644 --- a/scenes/shell.gd +++ b/scenes/shell.gd @@ -33,7 +33,7 @@ func run_async(command, crash_on_fail=true): var t = Thread.new() shell_command.thread = t - t.start(self, "run_async_thread", shell_command) + t.start(Callable(self, "run_async_thread").bind(shell_command)) return shell_command @@ -58,7 +58,7 @@ func run_async_thread(shell_command): hacky_command += command var result - if _os == "X11" or _os == "OSX": + if _os == "Linux" or _os == "OSX": # Godot's OS.execute wraps each argument in double quotes before executing # on Linux and macOS. # Because we want to be in a single-quote context, where nothing is evaluated, @@ -94,7 +94,7 @@ func run_async_thread(shell_command): shell_command.emit_signal("done") func _shell_binary(): - if _os == "X11" or _os == "OSX": + if _os == "Linux" or _os == "OSX": return "bash" elif _os == "Windows": return "dependencies\\windows\\git\\bin\\bash.exe" diff --git a/scenes/survey.gd b/scenes/survey.gd index 7952543..0ca9f3d 100644 --- a/scenes/survey.gd +++ b/scenes/survey.gd @@ -7,7 +7,7 @@ func quit(): get_tree().quit() func levels(): - get_tree().change_scene("res://scenes/level_select.tscn") + get_tree().change_scene_to_file("res://scenes/level_select.tscn") func on_survey_pressed(): diff --git a/scenes/survey.tscn b/scenes/survey.tscn index 85aa1a1..cc5fe92 100644 --- a/scenes/survey.tscn +++ b/scenes/survey.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://styles/theme.tres" type="Theme" id=1] -[ext_resource path="res://nodes/head.svg" type="Texture" id=2] +[ext_resource path="res://nodes/head.svg" type="Texture2D" id=2] [ext_resource path="res://scenes/survey.gd" type="Script" id=3] -[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=4] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=5] +[ext_resource path="res://fonts/big.tres" type="FontFile" id=4] +[ext_resource path="res://fonts/default.tres" type="FontFile" id=5] [ext_resource path="res://styles/alert_button.tres" type="StyleBox" id=6] [ext_resource path="res://styles/alert_button_hover.tres" type="StyleBox" id=7] @@ -26,30 +26,30 @@ __meta__ = { } [node name="Label" type="Label" parent="."] -margin_left = 854.463 -margin_top = 234.592 -margin_right = 1034.46 -margin_bottom = 290.592 -custom_fonts/font = ExtResource( 4 ) +offset_left = 854.463 +offset_top = 234.592 +offset_right = 1034.46 +offset_bottom = 290.592 +theme_override_fonts/font = ExtResource( 4 ) text = "Oh My Git!" __meta__ = { "_edit_use_anchors_": false } [node name="Label2" type="Label" parent="."] -margin_left = 774.698 -margin_top = 297.059 -margin_right = 1115.7 -margin_bottom = 353.059 -custom_fonts/font = ExtResource( 5 ) -custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +offset_left = 774.698 +offset_top = 297.059 +offset_right = 1115.7 +offset_bottom = 353.059 +theme_override_fonts/font = ExtResource( 5 ) +theme_override_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { "_edit_use_anchors_": false } -[node name="head" type="Sprite" parent="."] +[node name="head" type="Sprite2D" parent="."] position = Vector2( 946.624, 163.148 ) texture = ExtResource( 2 ) @@ -58,16 +58,16 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -margin_left = -175.997 -margin_top = -183.0 -margin_right = 175.997 +offset_left = -175.997 +offset_top = -183.0 +offset_right = 175.997 __meta__ = { "_edit_use_anchors_": false } [node name="Button2" type="Button" parent="VBoxContainer"] -margin_right = 351.0 -margin_bottom = 39.0 +offset_right = 351.0 +offset_bottom = 39.0 text = "Quit" [node name="VBoxContainer2" type="VBoxContainer" parent="."] @@ -75,33 +75,33 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -233.0 -margin_top = -175.0 -margin_right = 233.0 -margin_bottom = 175.0 -custom_constants/separation = 24 +offset_left = -233.0 +offset_top = -175.0 +offset_right = 233.0 +offset_bottom = 175.0 +theme_override_constants/separation = 24 __meta__ = { "_edit_use_anchors_": false } [node name="Label" type="Label" parent="VBoxContainer2"] -margin_right = 466.0 -margin_bottom = 93.0 +offset_right = 466.0 +offset_bottom = 93.0 text = "Thank you very much for playing! Please help us improve Oh My Git! by filling out this survey:" align = 1 [node name="Button" type="Button" parent="VBoxContainer2"] -margin_top = 117.0 -margin_right = 466.0 -margin_bottom = 156.0 +offset_top = 117.0 +offset_right = 466.0 +offset_bottom = 156.0 +focus_mode = 0 +theme_override_styles/hover = ExtResource( 7 ) +theme_override_styles/pressed = ExtResource( 7 ) +theme_override_styles/focus = ExtResource( 7 ) +theme_override_styles/normal = ExtResource( 6 ) focus_mode = 0 -custom_styles/hover = ExtResource( 7 ) -custom_styles/pressed = ExtResource( 7 ) -custom_styles/focus = ExtResource( 7 ) -custom_styles/normal = ExtResource( 6 ) -enabled_focus_mode = 0 text = "To the survey /o/" __meta__ = { "_edit_use_anchors_": false diff --git a/scenes/tcp_server.gd b/scenes/tcp_server.gd index 3e5c114..cbb351b 100644 --- a/scenes/tcp_server.gd +++ b/scenes/tcp_server.gd @@ -3,9 +3,9 @@ extends Node signal data_received(string) signal new_connection -export var port: int +@export var port: int -var _s = TCP_Server.new() +var _s = TCPServer.new() var _c var _connected = false diff --git a/scenes/tcp_server_shell.gd b/scenes/tcp_server_shell.gd index 1756170..dd03a6f 100644 --- a/scenes/tcp_server_shell.gd +++ b/scenes/tcp_server_shell.gd @@ -3,9 +3,9 @@ extends Node signal data_received(string) signal new_connection -export var port: int +@export var port: int -var _s = TCP_Server.new() +var _s = TCPServer.new() var _c var _connected = false diff --git a/scenes/terminal.gd b/scenes/terminal.gd index 5df56af..4362a55 100644 --- a/scenes/terminal.gd +++ b/scenes/terminal.gd @@ -1,17 +1,18 @@ +class_name Terminal extends Control -signal command_done +signal command_done_signal var history_position = 0 var git_commands = ["add", "am", "archive", "bisect", "branch", "bundle", "checkout", "cherry-pick", "citool", "clean", "clone", "commit", "describe", "diff", "fetch", "format-patch", "gc", "gitk", "grep", "gui", "init", "log", "merge", "mv", "notes", "pull", "push", "range-diff", "rebase", "reset", "restore", "revert", "rm", "shortlog", "show", "sparse-checkout", "stash", "status", "submodule", "switch", "tag", "worktree", "config", "fast-export", "fast-import", "filter-branch", "mergetool", "pack-refs", "prune", "reflog", "remote", "repack", "replace", "annotate", "blame", "bugreport", "count-objects", "difftool", "fsck", "gitweb", "help", "instaweb", "merge-tree", "rerere", "show-branch", "verify-commit", "verify-tag", "whatchanged", "archimport", "cvsexportcommit", "cvsimport", "cvsserver", "imap-send", "p", "quiltimport", "request-pull", "send-email", "svn", "apply", "checkout-index", "commit-graph", "commit-tree", "hash-object", "index-pack", "merge-file", "merge-index", "mktag", "mktree", "multi-pack-index", "pack-objects", "prune-packed", "read-tree", "symbolic-ref", "unpack-objects", "update-index", "update-ref", "write-tree", "cat-file", "cherry", "diff-files", "diff-index", "diff-tree", "for-each-ref", "get-tar-commit-id", "ls-files", "ls-remote", "ls-tree", "merge-base", "name-rev", "pack-redundant", "rev-list", "rev-parse", "show-index", "show-ref", "unpack-file", "var", "verify-pack", "daemon", "fetch-pack", "http-backend", "send-pack", "update-server-info", "check-attr", "check-ignore", "check-mailmap", "check-ref-format", "column", "credential", "credential-cache", "credential-store", "fmt-merge-msg", "interpret-trailers", "mailinfo", "mailsplit", "merge-one-file", "patch-id", "sh-i", "sh-setup"] var git_commands_help = [] -onready var input = $Rows/InputLine/Input -onready var output = $Rows/TopHalf/Output -onready var completions = $Rows/TopHalf/Completions +@onready var input = $Rows/InputLine/Input +@onready var output = $Rows/TopHalf/Output +@onready var completions = $Rows/TopHalf/Completions var repository -onready var main = get_tree().get_root().get_node("Main") +@onready var main = get_tree().get_root().get_node("Main") var shell = Shell.new() @@ -22,7 +23,7 @@ var premade_commands = [ ] func _ready(): - var error = $TextEditor.connect("hide", self, "editor_closed") + var error = $TextEditor.connect("hidden", Callable(self, "editor_closed")) if error != OK: helpers.crash("Could not connect TextEditor's hide signal") input.grab_focus() @@ -42,28 +43,28 @@ func _input(event): if history_position > 0: history_position -= 1 input.text = game.state["history"][history_position] - input.caret_position = input.text.length() + input.caret_column = input.text.length() # This prevents the Input taking the arrow as a "skip to beginning" command. - get_tree().set_input_as_handled() + get_viewport().set_input_as_handled() if event.is_action_pressed("ui_down"): if history_position < game.state["history"].size()-1: history_position += 1 input.text = game.state["history"][history_position] - input.caret_position = input.text.length() - get_tree().set_input_as_handled() + input.caret_column = input.text.length() + get_viewport().set_input_as_handled() if event.is_action_pressed("tab_complete"): if completions.visible: completions.get_root().get_children().select(0) - get_tree().set_input_as_handled() + get_viewport().set_input_as_handled() if event.is_action_pressed("delete_word"): - var first_half = input.text.substr(0,input.caret_position) - var second_half = input.text.substr(input.caret_position) + var first_half = input.text.substr(0,input.caret_column) + var second_half = input.text.substr(input.caret_column) - var idx = first_half.strip_edges(false, true).find_last(" ") + var idx = first_half.strip_edges(false, true).rfind(" ") if idx > 0: input.text = first_half.substr(0,idx+1) + second_half - input.caret_position = idx+1 + input.caret_column = idx+1 else: input.text = "" + second_half if event.is_action_pressed("clear"): @@ -71,7 +72,7 @@ func _input(event): func load_command(id): input.text = premade_commands[id] - input.caret_position = input.text.length() + input.caret_column = input.text.length() func send_command(command): close_all_editors() @@ -89,12 +90,12 @@ func send_command(command): shell.cd(repository.path) var cmd = shell.run_async(command, false) - yield(cmd, "done") + await cmd.done call_deferred("command_done", cmd) func command_done(cmd): if cmd.exit_code == 0: - $OkSound.pitch_scale = rand_range(0.8, 1.2) + $OkSound.pitch_scale = randf_range(0.8, 1.2) $OkSound.play() else: $ErrorSound.play() @@ -109,7 +110,7 @@ func command_done(cmd): $Pager/Text.text = cmd.output $Pager.popup() - emit_signal("command_done") + emit_signal("command_done_signal") func receive_output(text): output.text += text @@ -147,7 +148,7 @@ func regenerate_completions_menu(new_text): if idx >= 0: child.set_text(1, git_commands_help[idx]) - completions.margin_top = -min(filtered_comp.size() * 35 + 10, 210) + completions.offset_top = -min(filtered_comp.size() * 35 + 10, 210) func relevant_subcommands(): var result = {} @@ -165,7 +166,7 @@ func relevant_subcommands(): for r in result: result_array.push_back([r, result[r]]) - result_array.sort_custom(self, "sort_by_frequency_desc") + result_array.sort_custom(Callable(self, "sort_by_frequency_desc")) var plain_result = [] for r in result_array: @@ -212,7 +213,7 @@ func _completion_selected(): input.emit_signal("text_changed", input.text) #completions.hide() input.grab_focus() - input.caret_position = input.text.length() + input.caret_column = input.text.length() func editor_saved(): emit_signal("command_done") diff --git a/scenes/terminal.tscn b/scenes/terminal.tscn index 2e8d6fa..54ff938 100644 --- a/scenes/terminal.tscn +++ b/scenes/terminal.tscn @@ -1,25 +1,25 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=9 format=3 uid="uid://bw81a517gpv2u"] -[ext_resource path="res://sounds/typewriter_ding.wav" type="AudioStream" id=2] -[ext_resource path="res://fonts/monospace.tres" type="DynamicFont" id=3] -[ext_resource path="res://scenes/terminal.gd" type="Script" id=4] -[ext_resource path="res://scenes/text_editor.tscn" type="PackedScene" id=5] -[ext_resource path="res://scenes/tcp_server.tscn" type="PackedScene" id=6] -[ext_resource path="res://sounds/buzzer.wav" type="AudioStream" id=7] +[ext_resource type="AudioStream" uid="uid://b83v18ysjftqi" path="res://sounds/typewriter_ding.wav" id="2"] +[ext_resource type="FontFile" path="res://fonts/monospace.tres" id="3"] +[ext_resource type="Script" path="res://scenes/terminal.gd" id="4"] +[ext_resource type="PackedScene" uid="uid://d00aa7p4xsxf2" path="res://scenes/text_editor.tscn" id="5"] +[ext_resource type="PackedScene" path="res://scenes/tcp_server.tscn" id="6"] +[ext_resource type="AudioStream" uid="uid://cco182msscd1y" path="res://sounds/buzzer.wav" id="7"] -[sub_resource type="StyleBoxFlat" id=1] +[sub_resource type="StyleBoxFlat" id="1"] content_margin_left = 5.0 -content_margin_right = 5.0 content_margin_top = 5.0 +content_margin_right = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0, 0, 0, 1 ) -border_color = Color( 0.415686, 0.333333, 1, 1 ) +bg_color = Color(0, 0, 0, 1) +border_color = Color(0.415686, 0.333333, 1, 1) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="GDScript" id=2] +[sub_resource type="GDScript" id="2"] script/source = "extends Button func _ready(): @@ -30,128 +30,98 @@ func pressed(): " [node name="Terminal" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 1 -script = ExtResource( 4 ) -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("4") [node name="Rows" type="VBoxContainer" parent="."] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="TopHalf" type="Control" parent="Rows"] -margin_right = 1920.0 -margin_bottom = 1052.0 +layout_mode = 2 size_flags_vertical = 3 [node name="Output" type="RichTextLabel" parent="Rows/TopHalf"] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = -1.92206 -margin_bottom = -1.92212 +offset_top = -1.92206 +offset_bottom = -1.92212 size_flags_vertical = 3 -custom_styles/normal = SubResource( 1 ) -custom_fonts/normal_font = ExtResource( 3 ) +theme_override_fonts/normal_font = ExtResource("3") +theme_override_styles/normal = SubResource("1") scroll_following = true -__meta__ = { -"_edit_use_anchors_": false -} [node name="Completions" type="Tree" parent="Rows/TopHalf"] +layout_mode = 0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = -34.0 +offset_top = -34.0 columns = 2 hide_root = true -__meta__ = { -"_edit_use_anchors_": false -} [node name="VBoxContainer" type="VBoxContainer" parent="Rows"] visible = false -margin_top = 984.0 -margin_right = 1920.0 -margin_bottom = 1052.0 +layout_mode = 2 [node name="Button" type="Button" parent="Rows/VBoxContainer"] -margin_right = 1920.0 -margin_bottom = 20.0 +layout_mode = 2 text = "git commit --allow-empty -m \"$RANDOM\"" -script = SubResource( 2 ) +script = SubResource("2") [node name="Button2" type="Button" parent="Rows/VBoxContainer"] -margin_top = 24.0 -margin_right = 1920.0 -margin_bottom = 44.0 +layout_mode = 2 text = "git checkout HEAD^" -script = SubResource( 2 ) +script = SubResource("2") [node name="Button3" type="Button" parent="Rows/VBoxContainer"] -margin_top = 48.0 -margin_right = 1920.0 -margin_bottom = 68.0 +layout_mode = 2 text = "git checkout -b \"$RANDOM\"" -script = SubResource( 2 ) +script = SubResource("2") [node name="InputLine" type="HBoxContainer" parent="Rows"] -margin_top = 1056.0 -margin_right = 1920.0 -margin_bottom = 1080.0 +layout_mode = 2 [node name="Input" type="LineEdit" parent="Rows/InputLine"] -margin_right = 1920.0 -margin_bottom = 24.0 +layout_mode = 2 size_flags_horizontal = 3 caret_blink = true -__meta__ = { -"_edit_use_anchors_": false -} -[node name="TextEditor" parent="." instance=ExtResource( 5 )] +[node name="TextEditor" parent="." instance=ExtResource("5")] visible = false +layout_mode = 0 mouse_filter = 1 -syntax_highlighting = false +syntax_highlighter = null -[node name="TCPServer" parent="." instance=ExtResource( 6 )] +[node name="TCPServer" parent="." instance=ExtResource("6")] -[node name="Pager" type="WindowDialog" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 18.0 -margin_top = 39.0 -margin_right = -687.0 -margin_bottom = -48.0 -__meta__ = { -"_edit_use_anchors_": false -} +[node name="Pager" type="Window" parent="."] [node name="Text" type="RichTextLabel" parent="Pager"] +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -custom_fonts/normal_font = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} +theme_override_fonts/normal_font = ExtResource("3") [node name="ErrorSound" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 7 ) +stream = ExtResource("7") volume_db = -10.0 [node name="OkSound" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 2 ) +stream = ExtResource("2") volume_db = -5.0 + [connection signal="item_selected" from="Rows/TopHalf/Completions" to="." method="_completion_selected"] [connection signal="pressed" from="Rows/VBoxContainer/Button" to="Rows/VBoxContainer/Button" method="pressed"] [connection signal="pressed" from="Rows/VBoxContainer/Button2" to="Rows/VBoxContainer/Button2" method="pressed"] [connection signal="pressed" from="Rows/VBoxContainer/Button3" to="Rows/VBoxContainer/Button3" method="pressed"] [connection signal="text_changed" from="Rows/InputLine/Input" to="." method="_input_changed"] -[connection signal="text_entered" from="Rows/InputLine/Input" to="." method="send_command"] +[connection signal="text_submitted" from="Rows/InputLine/Input" to="." method="send_command"] [connection signal="saved" from="TextEditor" to="." method="editor_saved"] [connection signal="data_received" from="TCPServer" to="." method="receive_output"] diff --git a/scenes/text_editor.gd b/scenes/text_editor.gd index 2018eec..b1be5ed 100644 --- a/scenes/text_editor.gd +++ b/scenes/text_editor.gd @@ -9,7 +9,7 @@ var _client_connection func _ready(): # Initialize TCP server for fake editor. - _server = TCP_Server.new() + _server = TCPServer.new() _server.listen(1234) func _process(_delta): @@ -44,7 +44,8 @@ func save(): close() func close(): - if _client_connection and _client_connection.is_connected_to_host(): + if _client_connection and _client_connection.get_status() == StreamPeerTCP.STATUS_CONNECTED: _client_connection.disconnect_from_host() + text = "" hide() diff --git a/scenes/text_editor.tscn b/scenes/text_editor.tscn index 732784f..87fe2f2 100644 --- a/scenes/text_editor.tscn +++ b/scenes/text_editor.tscn @@ -1,52 +1,41 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://d00aa7p4xsxf2"] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] -[ext_resource path="res://scenes/text_editor.gd" type="Script" id=2] +[ext_resource type="FontFile" path="res://fonts/default.tres" id="1"] +[ext_resource type="Script" path="res://scenes/text_editor.gd" id="2"] -[node name="TextEditor" type="TextEdit" groups=[ -"editors", -]] +[node name="TextEditor" type="TextEdit" groups=["editors"]] +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/background_color = Color( 0, 0, 0, 1 ) +theme_override_colors/background_color = Color(0, 0, 0, 1) text = "Text here" -syntax_highlighting = true -wrap_enabled = true -script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("2") [node name="SaveButton" type="Button" parent="."] +layout_mode = 0 anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -114.396 -margin_top = -59.399 -margin_right = -14.3955 -margin_bottom = -14.399 +offset_left = -114.396 +offset_top = -59.399 +offset_right = -14.3955 +offset_bottom = -14.399 focus_mode = 0 -custom_fonts/font = ExtResource( 1 ) -enabled_focus_mode = 0 +theme_override_fonts/font = ExtResource("1") text = "Save" -__meta__ = { -"_edit_use_anchors_": false -} [node name="CloseButton" type="Button" parent="."] +layout_mode = 0 anchor_left = 1.0 anchor_right = 1.0 -margin_left = -54.3247 -margin_top = 12.0 -margin_right = -14.3247 -margin_bottom = 52.0 +offset_left = -54.3247 +offset_top = 12.0 +offset_right = -14.3247 +offset_bottom = 52.0 focus_mode = 0 -custom_fonts/font = ExtResource( 1 ) -enabled_focus_mode = 0 +theme_override_fonts/font = ExtResource("1") text = "x" -__meta__ = { -"_edit_use_anchors_": false -} + [connection signal="pressed" from="SaveButton" to="." method="save"] [connection signal="pressed" from="CloseButton" to="." method="close"] diff --git a/scenes/title.gd b/scenes/title.gd index f2374af..cfc8ffd 100644 --- a/scenes/title.gd +++ b/scenes/title.gd @@ -3,13 +3,14 @@ extends Control func _ready(): if !OS.has_feature("standalone") and !game.skipped_title: game.skipped_title = true - get_tree().change_scene("res://scenes/level_select.tscn") + get_tree().change_scene_to_file("res://scenes/level_select.tscn") func quit(): get_tree().quit() -func levels(): - get_tree().change_scene("res://scenes/level_select.tscn") +#ehelemals levels() +func open_level_select(): + get_tree().change_scene_to_file("res://scenes/level_select.tscn") func on_survey_pressed(): @@ -19,4 +20,4 @@ func on_survey_pressed(): func sandbox(): game.current_chapter = levels.chapters.size() - 1 game.current_level = levels.chapters[game.current_chapter].levels.size() -1 - get_tree().change_scene("res://scenes/main.tscn") + get_tree().change_scene_to_file("res://scenes/main.tscn") diff --git a/scenes/title.tscn b/scenes/title.tscn index 8363e84..7478300 100644 --- a/scenes/title.tscn +++ b/scenes/title.tscn @@ -1,77 +1,64 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://b1567m7y80gn0"] -[ext_resource path="res://styles/theme.tres" type="Theme" id=1] -[ext_resource path="res://images/oh-my-git.png" type="Texture" id=2] -[ext_resource path="res://scenes/title.gd" type="Script" id=3] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=5] +[ext_resource type="Theme" uid="uid://d2e7phm6ufj2i" path="res://styles/theme.tres" id="1"] +[ext_resource type="Texture2D" uid="uid://w1afg4vatjcq" path="res://images/oh-my-git.png" id="2"] +[ext_resource type="Script" path="res://scenes/title.gd" id="3"] +[ext_resource type="FontFile" path="res://fonts/default.tres" id="5"] [node name="Title" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -theme = ExtResource( 1 ) -script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} +theme = ExtResource("1") +script = ExtResource("3") [node name="Label2" type="Label" parent="."] -margin_left = 790.778 -margin_top = 594.135 -margin_right = 1131.78 -margin_bottom = 650.135 -custom_fonts/font = ExtResource( 5 ) -custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +layout_mode = 0 +offset_left = 790.778 +offset_top = 594.135 +offset_right = 1131.78 +offset_bottom = 650.135 +theme_override_colors/font_color = Color(0.533333, 0.392157, 0.392157, 1) +theme_override_fonts/font = ExtResource("5") text = "by bleeptrack & blinry" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Label3" type="Label" parent="."] -margin_left = 709.713 -margin_top = 621.416 -margin_right = 1209.71 -margin_bottom = 677.416 -custom_fonts/font = ExtResource( 5 ) -custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +layout_mode = 0 +offset_left = 709.713 +offset_top = 621.416 +offset_right = 1209.71 +offset_bottom = 677.416 +theme_override_colors/font_color = Color(0.533333, 0.392157, 0.392157, 1) +theme_override_fonts/font = ExtResource("5") text = "Original score by winniehell" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 784.553 -margin_top = 702.517 -margin_right = 1136.55 -margin_bottom = 885.517 -__meta__ = { -"_edit_use_anchors_": false -} +layout_mode = 0 +offset_left = 784.553 +offset_top = 702.517 +offset_right = 1136.55 +offset_bottom = 885.517 [node name="Button" type="Button" parent="VBoxContainer"] -margin_right = 351.0 -margin_bottom = 39.0 +layout_mode = 2 text = "Levels" [node name="Button3" type="Button" parent="VBoxContainer"] -margin_top = 44.0 -margin_right = 351.0 -margin_bottom = 83.0 +layout_mode = 2 text = "Sandbox" [node name="Button2" type="Button" parent="VBoxContainer"] -margin_top = 88.0 -margin_right = 351.0 -margin_bottom = 127.0 +layout_mode = 2 text = "Quit" -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="."] + +[node name="oh-my-git" type="Sprite2D" parent="Sprite2D"] +position = Vector2(967.924, 306.066) +scale = Vector2(0.320895, 0.320895) +texture = ExtResource("2") -[node name="oh-my-git" type="Sprite" parent="Sprite"] -position = Vector2( 967.924, 306.066 ) -scale = Vector2( 0.320895, 0.320895 ) -texture = ExtResource( 2 ) [connection signal="pressed" from="VBoxContainer/Button" to="." method="levels"] [connection signal="pressed" from="VBoxContainer/Button3" to="." method="sandbox"] [connection signal="pressed" from="VBoxContainer/Button2" to="." method="quit"] diff --git a/scripts/input_dialog.gd b/scripts/input_dialog.gd index d27e07a..b70f99f 100644 --- a/scripts/input_dialog.gd +++ b/scripts/input_dialog.gd @@ -1,4 +1,4 @@ -extends WindowDialog +extends Window signal entered(text) @@ -7,5 +7,7 @@ func _text_entered(text): queue_free() func _notification(what): - if what == Popup.NOTIFICATION_POST_POPUP: - $LineEdit.grab_focus() + pass + #ToDo + #if what == Popup.NOTIFICATION_POST_POPUP: + # $LineEdit.grab_focus() diff --git a/sounds/buzzer.wav.import b/sounds/buzzer.wav.import index 0df076d..dd06782 100644 --- a/sounds/buzzer.wav.import +++ b/sounds/buzzer.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/buzzer.wav-2dd9ed8c0fc10c99ff5279a9bd90ea75.sample" +type="AudioStreamWAV" +uid="uid://cco182msscd1y" +path="res://.godot/imported/buzzer.wav-2dd9ed8c0fc10c99ff5279a9bd90ea75.sample" [deps] source_file="res://sounds/buzzer.wav" -dest_files=[ "res://.import/buzzer.wav-2dd9ed8c0fc10c99ff5279a9bd90ea75.sample" ] +dest_files=["res://.godot/imported/buzzer.wav-2dd9ed8c0fc10c99ff5279a9bd90ea75.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/sounds/poof.wav.import b/sounds/poof.wav.import index 57110c6..61feb08 100644 --- a/sounds/poof.wav.import +++ b/sounds/poof.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/poof.wav-db49a4251469e51fe6b35ddc6fb05dcc.sample" +type="AudioStreamWAV" +uid="uid://dtwmw0q8ohu46" +path="res://.godot/imported/poof.wav-db49a4251469e51fe6b35ddc6fb05dcc.sample" [deps] source_file="res://sounds/poof.wav" -dest_files=[ "res://.import/poof.wav-db49a4251469e51fe6b35ddc6fb05dcc.sample" ] +dest_files=["res://.godot/imported/poof.wav-db49a4251469e51fe6b35ddc6fb05dcc.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/sounds/success.wav.import b/sounds/success.wav.import index b6da387..063539f 100644 --- a/sounds/success.wav.import +++ b/sounds/success.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/success.wav-51d483ad4ceec15770f55296ad79faf0.sample" +type="AudioStreamWAV" +uid="uid://b4cfjjgk8un1l" +path="res://.godot/imported/success.wav-51d483ad4ceec15770f55296ad79faf0.sample" [deps] source_file="res://sounds/success.wav" -dest_files=[ "res://.import/success.wav-51d483ad4ceec15770f55296ad79faf0.sample" ] +dest_files=["res://.godot/imported/success.wav-51d483ad4ceec15770f55296ad79faf0.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/sounds/swish.wav.import b/sounds/swish.wav.import index 6eda4c4..b767034 100644 --- a/sounds/swish.wav.import +++ b/sounds/swish.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/swish.wav-e61d890ee6364cfac7a66a257b308699.sample" +type="AudioStreamWAV" +uid="uid://cekpnqcyhfhjx" +path="res://.godot/imported/swish.wav-e61d890ee6364cfac7a66a257b308699.sample" [deps] source_file="res://sounds/swish.wav" -dest_files=[ "res://.import/swish.wav-e61d890ee6364cfac7a66a257b308699.sample" ] +dest_files=["res://.godot/imported/swish.wav-e61d890ee6364cfac7a66a257b308699.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/sounds/swoosh.wav.import b/sounds/swoosh.wav.import index 78d86f8..056b248 100644 --- a/sounds/swoosh.wav.import +++ b/sounds/swoosh.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/swoosh.wav-d94298cb8d05e0380c25da11f976f097.sample" +type="AudioStreamWAV" +uid="uid://pnmkitao07xe" +path="res://.godot/imported/swoosh.wav-d94298cb8d05e0380c25da11f976f097.sample" [deps] source_file="res://sounds/swoosh.wav" -dest_files=[ "res://.import/swoosh.wav-d94298cb8d05e0380c25da11f976f097.sample" ] +dest_files=["res://.godot/imported/swoosh.wav-d94298cb8d05e0380c25da11f976f097.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/sounds/typewriter_ding.wav.import b/sounds/typewriter_ding.wav.import index 59f1cf7..a03b8e3 100644 --- a/sounds/typewriter_ding.wav.import +++ b/sounds/typewriter_ding.wav.import @@ -1,13 +1,14 @@ [remap] importer="wav" -type="AudioStreamSample" -path="res://.import/typewriter_ding.wav-261baf709f530d1d0a04e5c5a6efc553.sample" +type="AudioStreamWAV" +uid="uid://b83v18ysjftqi" +path="res://.godot/imported/typewriter_ding.wav-261baf709f530d1d0a04e5c5a6efc553.sample" [deps] source_file="res://sounds/typewriter_ding.wav" -dest_files=[ "res://.import/typewriter_ding.wav-261baf709f530d1d0a04e5c5a6efc553.sample" ] +dest_files=["res://.godot/imported/typewriter_ding.wav-261baf709f530d1d0a04e5c5a6efc553.sample"] [params] @@ -17,5 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/styles/theme.tres b/styles/theme.tres index 35315aa..ce808f1 100644 --- a/styles/theme.tres +++ b/styles/theme.tres @@ -1,319 +1,319 @@ -[gd_resource type="Theme" load_steps=25 format=2] +[gd_resource type="Theme" load_steps=25 format=3 uid="uid://d2e7phm6ufj2i"] -[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] -[ext_resource path="res://fonts/monospace.tres" type="DynamicFont" id=2] +[ext_resource type="FontFile" path="res://fonts/default.tres" id="1"] +[ext_resource type="FontFile" path="res://fonts/monospace.tres" id="2"] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.223529, 0.223529, 0.223529, 1 ) +[sub_resource type="StyleBoxFlat" id="1"] +bg_color = Color(0.223529, 0.223529, 0.223529, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 0.207843, 0.207843, 0.207843, 1 ) +[sub_resource type="StyleBoxFlat" id="2"] +bg_color = Color(0.207843, 0.207843, 0.207843, 1) border_width_left = 2 border_width_top = 2 border_width_right = 2 border_width_bottom = 2 -border_color = Color( 0.45098, 0.466667, 0.996078, 1 ) +border_color = Color(0.45098, 0.466667, 0.996078, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=3] +[sub_resource type="StyleBoxFlat" id="3"] content_margin_left = 10.0 -content_margin_right = 10.0 content_margin_top = 5.0 +content_margin_right = 10.0 content_margin_bottom = 5.0 -bg_color = Color( 0.278431, 0.278431, 0.278431, 1 ) +bg_color = Color(0.278431, 0.278431, 0.278431, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=4] +[sub_resource type="StyleBoxFlat" id="4"] content_margin_left = 10.0 -content_margin_right = 10.0 content_margin_top = 5.0 +content_margin_right = 10.0 content_margin_bottom = 5.0 -bg_color = Color( 0.227451, 0.227451, 0.227451, 1 ) +bg_color = Color(0.227451, 0.227451, 0.227451, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=5] +[sub_resource type="StyleBoxFlat" id="5"] content_margin_left = 10.0 -content_margin_right = 10.0 content_margin_top = 5.0 +content_margin_right = 10.0 content_margin_bottom = 5.0 -bg_color = Color( 0.333333, 0.333333, 0.333333, 1 ) +bg_color = Color(0.333333, 0.333333, 0.333333, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxEmpty" id=6] +[sub_resource type="StyleBoxEmpty" id="6"] -[sub_resource type="StyleBoxEmpty" id=7] +[sub_resource type="StyleBoxEmpty" id="7"] -[sub_resource type="StyleBoxEmpty" id=8] +[sub_resource type="StyleBoxEmpty" id="8"] -[sub_resource type="StyleBoxEmpty" id=9] +[sub_resource type="StyleBoxEmpty" id="9"] -[sub_resource type="StyleBoxEmpty" id=10] +[sub_resource type="StyleBoxEmpty" id="10"] -[sub_resource type="StyleBoxEmpty" id=11] +[sub_resource type="StyleBoxEmpty" id="11"] -[sub_resource type="StyleBoxFlat" id=12] -bg_color = Color( 0, 0, 0, 1 ) +[sub_resource type="StyleBoxFlat" id="12"] +bg_color = Color(0, 0, 0, 1) border_width_left = 2 border_width_top = 2 border_width_right = 2 border_width_bottom = 2 -border_color = Color( 0.490196, 0.494118, 0.929412, 1 ) +border_color = Color(0.490196, 0.494118, 0.929412, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=13] +[sub_resource type="StyleBoxFlat" id="13"] content_margin_left = 7.0 -content_margin_right = 7.0 content_margin_top = 5.0 +content_margin_right = 7.0 content_margin_bottom = 3.0 -bg_color = Color( 0, 0, 0, 1 ) +bg_color = Color(0, 0, 0, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=14] +[sub_resource type="StyleBoxFlat" id="14"] content_margin_left = 7.0 -content_margin_right = 7.0 content_margin_top = 5.0 +content_margin_right = 7.0 content_margin_bottom = 3.0 -bg_color = Color( 0, 0, 0, 1 ) +bg_color = Color(0, 0, 0, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=15] +[sub_resource type="StyleBoxFlat" id="15"] content_margin_left = 8.0 -content_margin_right = 8.0 content_margin_top = 8.0 +content_margin_right = 8.0 content_margin_bottom = 8.0 -bg_color = Color( 0.231373, 0.298039, 0.388235, 1 ) +bg_color = Color(0.231373, 0.298039, 0.388235, 1) corner_radius_top_left = 8 corner_radius_top_right = 8 corner_radius_bottom_right = 8 corner_radius_bottom_left = 8 -[sub_resource type="StyleBoxFlat" id=16] -bg_color = Color( 0.294118, 0.294118, 0.294118, 1 ) +[sub_resource type="StyleBoxFlat" id="16"] +bg_color = Color(0.294118, 0.294118, 0.294118, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=17] +[sub_resource type="StyleBoxFlat" id="17"] content_margin_left = 10.0 -content_margin_right = 10.0 content_margin_top = 10.0 +content_margin_right = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0.172549, 0.172549, 0.172549, 1 ) +bg_color = Color(0.172549, 0.172549, 0.172549, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=18] +[sub_resource type="StyleBoxFlat" id="18"] content_margin_left = 0.0 -content_margin_right = 0.0 content_margin_top = 0.0 +content_margin_right = 0.0 content_margin_bottom = 0.0 -bg_color = Color( 0.027451, 0.34902, 0.141176, 0.745098 ) +bg_color = Color(0.027451, 0.34902, 0.141176, 0.745098) corner_radius_top_left = 8 corner_radius_top_right = 8 corner_radius_bottom_right = 8 corner_radius_bottom_left = 8 -[sub_resource type="StyleBoxFlat" id=19] +[sub_resource type="StyleBoxFlat" id="19"] content_margin_left = 5.0 -content_margin_right = 5.0 content_margin_top = 10.0 +content_margin_right = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0, 0, 0, 1 ) +bg_color = Color(0, 0, 0, 1) border_width_left = 2 border_width_top = 2 border_width_right = 2 border_width_bottom = 2 -border_color = Color( 0.529412, 0.384314, 1, 1 ) +border_color = Color(0.529412, 0.384314, 1, 1) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id=20] +[sub_resource type="StyleBoxFlat" id="20"] content_margin_left = 5.0 -content_margin_right = 5.0 content_margin_top = 5.0 +content_margin_right = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0, 0, 0, 1 ) +bg_color = Color(0, 0, 0, 1) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id=21] +[sub_resource type="StyleBoxFlat" id="21"] content_margin_left = 5.0 -content_margin_right = 5.0 content_margin_top = 5.0 +content_margin_right = 5.0 content_margin_bottom = 5.0 -bg_color = Color( 0.215686, 0.219608, 0.258824, 1 ) +bg_color = Color(0.215686, 0.219608, 0.258824, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=22] -bg_color = Color( 0.309804, 0.317647, 0.372549, 1 ) +[sub_resource type="StyleBoxFlat" id="22"] +bg_color = Color(0.309804, 0.317647, 0.372549, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 [resource] -default_font = ExtResource( 1 ) -Button/colors/font_color = Color( 1, 1, 1, 1 ) -Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) -Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) -Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +default_font = ExtResource("1") +Button/colors/font_color = Color(1, 1, 1, 1) +Button/colors/font_color_disabled = Color(0.9, 0.9, 0.9, 0.2) +Button/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1) +Button/colors/font_color_pressed = Color(1, 1, 1, 1) Button/constants/hseparation = 2 -Button/fonts/font = null -Button/styles/disabled = SubResource( 1 ) -Button/styles/focus = SubResource( 2 ) -Button/styles/hover = SubResource( 3 ) -Button/styles/normal = SubResource( 4 ) -Button/styles/pressed = SubResource( 5 ) -CheckBox/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) -CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) -CheckBox/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) -CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 ) -CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/fonts/font = ExtResource("1") +Button/styles/disabled = SubResource("1") +Button/styles/focus = SubResource("2") +Button/styles/hover = SubResource("3") +Button/styles/normal = SubResource("4") +Button/styles/pressed = SubResource("5") +CheckBox/colors/font_color = Color(0.88, 0.88, 0.88, 1) +CheckBox/colors/font_color_disabled = Color(0.9, 0.9, 0.9, 0.2) +CheckBox/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1) +CheckBox/colors/font_color_hover_pressed = Color(1, 1, 1, 1) +CheckBox/colors/font_color_pressed = Color(1, 1, 1, 1) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null +CheckBox/fonts/font = ExtResource("1") CheckBox/icons/checked = null CheckBox/icons/radio_checked = null CheckBox/icons/radio_unchecked = null CheckBox/icons/unchecked = null -CheckBox/styles/disabled = SubResource( 6 ) -CheckBox/styles/focus = SubResource( 7 ) -CheckBox/styles/hover = SubResource( 8 ) -CheckBox/styles/hover_pressed = SubResource( 9 ) -CheckBox/styles/normal = SubResource( 10 ) -CheckBox/styles/pressed = SubResource( 11 ) +CheckBox/styles/disabled = SubResource("6") +CheckBox/styles/focus = SubResource("7") +CheckBox/styles/hover = SubResource("8") +CheckBox/styles/hover_pressed = SubResource("9") +CheckBox/styles/normal = SubResource("10") +CheckBox/styles/pressed = SubResource("11") HBoxContainer/constants/separation = 5 -LineEdit/colors/clear_button_color = Color( 0.878431, 0.878431, 0.878431, 1 ) -LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) -LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 ) -LineEdit/colors/font_color = Color( 1, 1, 1, 1 ) -LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) -LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 ) -LineEdit/colors/selection_color = Color( 0.584314, 0.415686, 0.972549, 0.462745 ) +LineEdit/colors/clear_button_color = Color(0.878431, 0.878431, 0.878431, 1) +LineEdit/colors/clear_button_color_pressed = Color(1, 1, 1, 1) +LineEdit/colors/cursor_color = Color(0.94, 0.94, 0.94, 1) +LineEdit/colors/font_color = Color(1, 1, 1, 1) +LineEdit/colors/font_color_selected = Color(1, 1, 1, 1) +LineEdit/colors/font_color_uneditable = Color(0.88, 0.88, 0.88, 0.5) +LineEdit/colors/selection_color = Color(0.584314, 0.415686, 0.972549, 0.462745) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = ExtResource( 2 ) +LineEdit/fonts/font = ExtResource("2") LineEdit/icons/clear = null -LineEdit/styles/focus = SubResource( 12 ) -LineEdit/styles/normal = SubResource( 13 ) -LineEdit/styles/read_only = SubResource( 14 ) -Panel/styles/panel = SubResource( 15 ) -PopupMenu/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) -PopupMenu/colors/font_color_accel = Color( 0.7, 0.7, 0.7, 0.8 ) -PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 ) -PopupMenu/colors/font_color_hover = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/styles/focus = SubResource("12") +LineEdit/styles/normal = SubResource("13") +LineEdit/styles/read_only = SubResource("14") +Panel/styles/panel = SubResource("15") +PopupMenu/colors/font_color = Color(0.88, 0.88, 0.88, 1) +PopupMenu/colors/font_color_accel = Color(0.7, 0.7, 0.7, 0.8) +PopupMenu/colors/font_color_disabled = Color(0.4, 0.4, 0.4, 0.8) +PopupMenu/colors/font_color_hover = Color(0.88, 0.88, 0.88, 1) PopupMenu/constants/hseparation = 4 PopupMenu/constants/vseparation = 4 -PopupMenu/fonts/font = null +PopupMenu/fonts/font = ExtResource("1") PopupMenu/icons/checked = null PopupMenu/icons/radio_checked = null PopupMenu/icons/radio_unchecked = null PopupMenu/icons/submenu = null PopupMenu/icons/unchecked = null -PopupMenu/styles/hover = SubResource( 16 ) +PopupMenu/styles/hover = SubResource("16") PopupMenu/styles/labeled_separator_left = null PopupMenu/styles/labeled_separator_right = null -PopupMenu/styles/panel = SubResource( 17 ) +PopupMenu/styles/panel = SubResource("17") PopupMenu/styles/panel_disabled = null PopupMenu/styles/separator = null -PopupPanel/styles/panel = SubResource( 18 ) -RichTextLabel/colors/default_color = Color( 1, 1, 1, 1 ) -RichTextLabel/colors/font_color_selected = Color( 0.49, 0.49, 0.49, 1 ) -RichTextLabel/colors/font_color_shadow = Color( 0, 0, 0, 0 ) -RichTextLabel/colors/selection_color = Color( 0.1, 0.1, 1, 0.8 ) +PopupPanel/styles/panel = SubResource("18") +RichTextLabel/colors/default_color = Color(1, 1, 1, 1) +RichTextLabel/colors/font_color_selected = Color(0.49, 0.49, 0.49, 1) +RichTextLabel/colors/font_color_shadow = Color(0, 0, 0, 0) +RichTextLabel/colors/selection_color = Color(0.1, 0.1, 1, 0.8) RichTextLabel/constants/line_separation = 1 RichTextLabel/constants/shadow_as_outline = 0 RichTextLabel/constants/shadow_offset_x = 1 RichTextLabel/constants/shadow_offset_y = 1 RichTextLabel/constants/table_hseparation = 3 RichTextLabel/constants/table_vseparation = 3 -RichTextLabel/fonts/bold_font = null -RichTextLabel/fonts/bold_italics_font = null -RichTextLabel/fonts/italics_font = null -RichTextLabel/fonts/mono_font = ExtResource( 2 ) -RichTextLabel/fonts/normal_font = null +RichTextLabel/fonts/bold_font = ExtResource("1") +RichTextLabel/fonts/bold_italics_font = ExtResource("1") +RichTextLabel/fonts/italics_font = ExtResource("1") +RichTextLabel/fonts/mono_font = ExtResource("2") +RichTextLabel/fonts/normal_font = ExtResource("1") RichTextLabel/styles/focus = null RichTextLabel/styles/normal = null -TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) -TextEdit/colors/bookmark_color = Color( 0.08, 0.49, 0.98, 1 ) -TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) -TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) -TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/caret_color = Color( 0.88, 0.88, 0.88, 1 ) -TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) -TextEdit/colors/completion_background_color = Color( 0.17, 0.16, 0.2, 1 ) -TextEdit/colors/completion_existing_color = Color( 0.87, 0.87, 0.87, 0.13 ) -TextEdit/colors/completion_font_color = Color( 0.67, 0.67, 0.67, 1 ) -TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) -TextEdit/colors/completion_selected_color = Color( 0.26, 0.26, 0.27, 1 ) -TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) -TextEdit/colors/executing_line_color = Color( 0.2, 0.8, 0.2, 0.4 ) -TextEdit/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) -TextEdit/colors/font_color_readonly = Color( 0.88, 0.88, 0.88, 0.5 ) -TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) -TextEdit/colors/function_color = Color( 0.4, 0.64, 0.81, 1 ) -TextEdit/colors/line_number_color = Color( 0.67, 0.67, 0.67, 0.4 ) -TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) -TextEdit/colors/member_variable_color = Color( 0.9, 0.31, 0.35, 1 ) -TextEdit/colors/number_color = Color( 0.92, 0.58, 0.2, 1 ) -TextEdit/colors/safe_line_number_color = Color( 0.67, 0.78, 0.67, 0.6 ) -TextEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) -TextEdit/colors/symbol_color = Color( 0.94, 0.94, 0.94, 1 ) -TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/colors/background_color = Color(0, 0, 0, 0) +TextEdit/colors/bookmark_color = Color(0.08, 0.49, 0.98, 1) +TextEdit/colors/brace_mismatch_color = Color(1, 0.2, 0.2, 1) +TextEdit/colors/breakpoint_color = Color(0.8, 0.8, 0.4, 0.2) +TextEdit/colors/caret_background_color = Color(0, 0, 0, 1) +TextEdit/colors/caret_color = Color(0.88, 0.88, 0.88, 1) +TextEdit/colors/code_folding_color = Color(0.8, 0.8, 0.8, 0.8) +TextEdit/colors/completion_background_color = Color(0.17, 0.16, 0.2, 1) +TextEdit/colors/completion_existing_color = Color(0.87, 0.87, 0.87, 0.13) +TextEdit/colors/completion_font_color = Color(0.67, 0.67, 0.67, 1) +TextEdit/colors/completion_scroll_color = Color(1, 1, 1, 1) +TextEdit/colors/completion_selected_color = Color(0.26, 0.26, 0.27, 1) +TextEdit/colors/current_line_color = Color(0.25, 0.25, 0.26, 0.8) +TextEdit/colors/executing_line_color = Color(0.2, 0.8, 0.2, 0.4) +TextEdit/colors/font_color = Color(0.88, 0.88, 0.88, 1) +TextEdit/colors/font_color_readonly = Color(0.88, 0.88, 0.88, 0.5) +TextEdit/colors/font_color_selected = Color(0, 0, 0, 1) +TextEdit/colors/function_color = Color(0.4, 0.64, 0.81, 1) +TextEdit/colors/line_number_color = Color(0.67, 0.67, 0.67, 0.4) +TextEdit/colors/mark_color = Color(1, 0.4, 0.4, 0.4) +TextEdit/colors/member_variable_color = Color(0.9, 0.31, 0.35, 1) +TextEdit/colors/number_color = Color(0.92, 0.58, 0.2, 1) +TextEdit/colors/safe_line_number_color = Color(0.67, 0.78, 0.67, 0.6) +TextEdit/colors/selection_color = Color(0.49, 0.49, 0.49, 1) +TextEdit/colors/symbol_color = Color(0.94, 0.94, 0.94, 1) +TextEdit/colors/word_highlighted_color = Color(0.8, 0.9, 0.9, 0.15) TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = ExtResource( 2 ) +TextEdit/fonts/font = ExtResource("2") TextEdit/icons/fold = null TextEdit/icons/folded = null TextEdit/icons/space = null TextEdit/icons/tab = null TextEdit/styles/completion = null -TextEdit/styles/focus = SubResource( 19 ) -TextEdit/styles/normal = SubResource( 20 ) +TextEdit/styles/focus = SubResource("19") +TextEdit/styles/normal = SubResource("20") TextEdit/styles/read_only = null -Tree/colors/custom_button_font_highlight = Color( 0.94, 0.94, 0.94, 1 ) -Tree/colors/drop_position_color = Color( 1, 0.3, 0.2, 1 ) -Tree/colors/font_color = Color( 0.69, 0.69, 0.69, 1 ) -Tree/colors/font_color_selected = Color( 1, 1, 1, 1 ) -Tree/colors/guide_color = Color( 0, 0, 0, 0.1 ) -Tree/colors/relationship_line_color = Color( 0.27, 0.27, 0.27, 1 ) -Tree/colors/title_button_color = Color( 0.88, 0.88, 0.88, 1 ) +Tree/colors/custom_button_font_highlight = Color(0.94, 0.94, 0.94, 1) +Tree/colors/drop_position_color = Color(1, 0.3, 0.2, 1) +Tree/colors/font_color = Color(0.69, 0.69, 0.69, 1) +Tree/colors/font_color_selected = Color(1, 1, 1, 1) +Tree/colors/guide_color = Color(0, 0, 0, 0.1) +Tree/colors/relationship_line_color = Color(0.27, 0.27, 0.27, 1) +Tree/colors/title_button_color = Color(0.88, 0.88, 0.88, 1) Tree/constants/button_margin = 4 Tree/constants/draw_guides = 0 Tree/constants/draw_relationship_lines = 0 @@ -322,15 +322,15 @@ Tree/constants/item_margin = 0 Tree/constants/scroll_border = 4 Tree/constants/scroll_speed = 12 Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null +Tree/fonts/font = ExtResource("1") +Tree/fonts/title_button_font = ExtResource("1") Tree/icons/arrow = null Tree/icons/arrow_collapsed = null Tree/icons/checked = null Tree/icons/select_arrow = null Tree/icons/unchecked = null Tree/icons/updown = null -Tree/styles/bg = SubResource( 21 ) +Tree/styles/bg = SubResource("21") Tree/styles/bg_focus = null Tree/styles/button_pressed = null Tree/styles/cursor = null @@ -338,7 +338,7 @@ Tree/styles/cursor_unfocused = null Tree/styles/custom_button = null Tree/styles/custom_button_hover = null Tree/styles/custom_button_pressed = null -Tree/styles/selected = SubResource( 22 ) +Tree/styles/selected = SubResource("22") Tree/styles/selected_focus = null Tree/styles/title_button_hover = null Tree/styles/title_button_normal = null