diff --git a/cards/add.svg.import b/cards/add.svg.import index cca9696..4ec9107 100644 --- a/cards/add.svg.import +++ b/cards/add.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/bisect-bad.svg.import b/cards/bisect-bad.svg.import index c2afba5..a23974f 100644 --- a/cards/bisect-bad.svg.import +++ b/cards/bisect-bad.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/bisect-good.svg.import b/cards/bisect-good.svg.import index 50f3eef..eccfb46 100644 --- a/cards/bisect-good.svg.import +++ b/cards/bisect-good.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/bisect-start.svg.import b/cards/bisect-start.svg.import index cd672e1..f58b103 100644 --- a/cards/bisect-start.svg.import +++ b/cards/bisect-start.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/branch-delete.svg.import b/cards/branch-delete.svg.import index 6277fe4..385e0b9 100644 --- a/cards/branch-delete.svg.import +++ b/cards/branch-delete.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/branch.svg.import b/cards/branch.svg.import index ff2d5b8..f0a165e 100644 --- a/cards/branch.svg.import +++ b/cards/branch.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/checkout-file.svg.import b/cards/checkout-file.svg.import index a960142..10b175c 100644 --- a/cards/checkout-file.svg.import +++ b/cards/checkout-file.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/checkout-from.svg.import b/cards/checkout-from.svg.import index 2892f47..7e6160e 100644 --- a/cards/checkout-from.svg.import +++ b/cards/checkout-from.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/checkout.svg.import b/cards/checkout.svg.import index 895efd6..ba8c88a 100644 --- a/cards/checkout.svg.import +++ b/cards/checkout.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/cherry-pick.svg.import b/cards/cherry-pick.svg.import index 3549183..1c88964 100644 --- a/cards/cherry-pick.svg.import +++ b/cards/cherry-pick.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/clone.svg.import b/cards/clone.svg.import index 1f894b7..6fa25e0 100644 --- a/cards/clone.svg.import +++ b/cards/clone.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/commit-a.svg.import b/cards/commit-a.svg.import index d514e29..be711b0 100644 --- a/cards/commit-a.svg.import +++ b/cards/commit-a.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/commit-auto.svg.import b/cards/commit-auto.svg.import index 51e7cfd..4f561ca 100644 --- a/cards/commit-auto.svg.import +++ b/cards/commit-auto.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/commit.svg.import b/cards/commit.svg.import index 613bc09..1e1535b 100644 --- a/cards/commit.svg.import +++ b/cards/commit.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/fetch.svg.import b/cards/fetch.svg.import index 3c65896..80da734 100644 --- a/cards/fetch.svg.import +++ b/cards/fetch.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/file-copy.svg.import b/cards/file-copy.svg.import index ebd39cb..f5c9405 100644 --- a/cards/file-copy.svg.import +++ b/cards/file-copy.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/file-delete.svg.import b/cards/file-delete.svg.import index 9c9d9da..942334e 100644 --- a/cards/file-delete.svg.import +++ b/cards/file-delete.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/file-new.svg.import b/cards/file-new.svg.import index 968c800..334d7a1 100644 --- a/cards/file-new.svg.import +++ b/cards/file-new.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/file-rename.svg.import b/cards/file-rename.svg.import index 79f1261..ca2d82c 100644 --- a/cards/file-rename.svg.import +++ b/cards/file-rename.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/init.svg.import b/cards/init.svg.import index aacb273..dedbfe6 100644 --- a/cards/init.svg.import +++ b/cards/init.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/merge-abort.svg.import b/cards/merge-abort.svg.import index cbdf0a8..4a919d2 100644 --- a/cards/merge-abort.svg.import +++ b/cards/merge-abort.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/merge.svg.import b/cards/merge.svg.import index b96f40d..a83da3d 100644 --- a/cards/merge.svg.import +++ b/cards/merge.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/pull.svg.import b/cards/pull.svg.import index 15ab40d..e792f8f 100644 --- a/cards/pull.svg.import +++ b/cards/pull.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/push.svg.import b/cards/push.svg.import index aa6a9ff..e191ead 100644 --- a/cards/push.svg.import +++ b/cards/push.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/rebase-continue.svg.import b/cards/rebase-continue.svg.import index 4276f0a..41f5eda 100644 --- a/cards/rebase-continue.svg.import +++ b/cards/rebase-continue.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/rebase-interactive.svg.import b/cards/rebase-interactive.svg.import index a65c315..ebe0624 100644 --- a/cards/rebase-interactive.svg.import +++ b/cards/rebase-interactive.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/rebase.svg.import b/cards/rebase.svg.import index 97241e1..460096a 100644 --- a/cards/rebase.svg.import +++ b/cards/rebase.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/reflog.svg.import b/cards/reflog.svg.import index 17b81f7..00dcf26 100644 --- a/cards/reflog.svg.import +++ b/cards/reflog.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/reset-file.svg.import b/cards/reset-file.svg.import index 883becf..03dc0bd 100644 --- a/cards/reset-file.svg.import +++ b/cards/reset-file.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/reset-hard.svg.import b/cards/reset-hard.svg.import index 199bee3..103b70b 100644 --- a/cards/reset-hard.svg.import +++ b/cards/reset-hard.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/reset.svg.import b/cards/reset.svg.import index 3409230..0e43dc4 100644 --- a/cards/reset.svg.import +++ b/cards/reset.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/revert.svg.import b/cards/revert.svg.import index 6f0bbfc..6491f9c 100644 --- a/cards/revert.svg.import +++ b/cards/revert.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/rm.svg.import b/cards/rm.svg.import index 2830052..ab96873 100644 --- a/cards/rm.svg.import +++ b/cards/rm.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/cards/show.svg.import b/cards/show.svg.import index 39cebac..40f1504 100644 --- a/cards/show.svg.import +++ b/cards/show.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/export_presets.cfg b/export_presets.cfg index 99aaf85..e408ade 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,21 +8,20 @@ export_filter="all_resources" include_filter="levels/*, scripts/*, resources/*, cards/*" exclude_filter="dependencies/*, cache/*" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.0.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" [preset.1] @@ -34,7 +33,6 @@ export_filter="all_resources" include_filter="levels/*, scripts/*, resources/*, cards/*" exclude_filter="dependencies/*, cache/*" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" @@ -47,12 +45,54 @@ application/info="" application/icon="" application/identifier="" application/signature="" +application/app_category="Games" application/short_version="1.0" application/version="1.0" application/copyright="" display/high_res=false -privacy/camera_usage_description="" privacy/microphone_usage_description="" +privacy/camera_usage_description="" +privacy/location_usage_description="" +privacy/address_book_usage_description="" +privacy/calendar_usage_description="" +privacy/photos_library_usage_description="" +privacy/desktop_folder_usage_description="" +privacy/documents_folder_usage_description="" +privacy/downloads_folder_usage_description="" +privacy/network_volumes_usage_description="" +privacy/removable_volumes_usage_description="" +codesign/enable=true +codesign/identity="" +codesign/timestamp=true +codesign/hardened_runtime=true +codesign/replace_existing_signature=true +codesign/entitlements/custom_file="" +codesign/entitlements/allow_jit_code_execution=false +codesign/entitlements/allow_unsigned_executable_memory=false +codesign/entitlements/allow_dyld_environment_variables=false +codesign/entitlements/disable_library_validation=false +codesign/entitlements/audio_input=false +codesign/entitlements/camera=false +codesign/entitlements/location=false +codesign/entitlements/address_book=false +codesign/entitlements/calendars=false +codesign/entitlements/photos_library=false +codesign/entitlements/apple_events=false +codesign/entitlements/debugging=false +codesign/entitlements/app_sandbox/enabled=false +codesign/entitlements/app_sandbox/network_server=false +codesign/entitlements/app_sandbox/network_client=false +codesign/entitlements/app_sandbox/device_usb=false +codesign/entitlements/app_sandbox/device_bluetooth=false +codesign/entitlements/app_sandbox/files_downloads=0 +codesign/entitlements/app_sandbox/files_pictures=0 +codesign/entitlements/app_sandbox/files_music=0 +codesign/entitlements/app_sandbox/files_movies=0 +codesign/custom_options=PoolStringArray( ) +notarization/enable=false +notarization/apple_id_name="" +notarization/apple_id_password="" +notarization/apple_team_id="" texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false @@ -67,22 +107,22 @@ export_filter="all_resources" include_filter="levels/*, scripts/*, resources/*, cards/*" exclude_filter="dependencies/*, cache/*" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.2.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false +codesign/identity_type=0 codesign/identity="" codesign/password="" codesign/timestamp=true @@ -90,6 +130,7 @@ codesign/timestamp_server_url="" codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PoolStringArray( ) +application/modify_resources=true application/icon="" application/file_version="" application/product_version="" @@ -109,15 +150,27 @@ export_filter="all_resources" include_filter="levels/*, scripts/*, resources/*" exclude_filter="dependencies/*, cache/*" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.3.options] +custom_template/debug="" +custom_template/release="" +variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false +html/export_icon=true html/custom_html_shell="" html/head_include="" -custom_template/release="" -custom_template/debug="" +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color( 0, 0, 0, 1 ) diff --git a/images/cli-badge.svg.import b/images/cli-badge.svg.import index 53031f8..930d998 100644 --- a/images/cli-badge.svg.import +++ b/images/cli-badge.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/commit.svg.import b/images/commit.svg.import index 54316cf..fbf6f82 100644 --- a/images/commit.svg.import +++ b/images/commit.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/conflict.svg.import b/images/conflict.svg.import index 5053a2b..63c961d 100644 --- a/images/conflict.svg.import +++ b/images/conflict.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/file.svg.import b/images/file.svg.import index 12aa5dd..49fd863 100644 --- a/images/file.svg.import +++ b/images/file.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/head.svg.import b/images/head.svg.import index 2a5c3cf..b92f7aa 100644 --- a/images/head.svg.import +++ b/images/head.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/modified.svg.import b/images/modified.svg.import index a7356bb..c8ba6f4 100644 --- a/images/modified.svg.import +++ b/images/modified.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/new.svg.import b/images/new.svg.import index 4b01767..1218f0e 100644 --- a/images/new.svg.import +++ b/images/new.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/oh-my-git.png.import b/images/oh-my-git.png.import index 708ee15..a173ad8 100644 --- a/images/oh-my-git.png.import +++ b/images/oh-my-git.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/ref.svg.import b/images/ref.svg.import index 480c664..1b179ae 100644 --- a/images/ref.svg.import +++ b/images/ref.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/remote.svg.import b/images/remote.svg.import index 762dceb..7c90ac0 100644 --- a/images/remote.svg.import +++ b/images/remote.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/removed.svg.import b/images/removed.svg.import index 1e0dd8a..104b392 100644 --- a/images/removed.svg.import +++ b/images/removed.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/string.svg.import b/images/string.svg.import index 97a8d20..53ec0cd 100644 --- a/images/string.svg.import +++ b/images/string.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/images/untracked.svg.import b/images/untracked.svg.import index 95cb700..ab65e26 100644 --- a/images/untracked.svg.import +++ b/images/untracked.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/blob.svg.import b/nodes/blob.svg.import index 725b562..bcb068a 100644 --- a/nodes/blob.svg.import +++ b/nodes/blob.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/commit.svg.import b/nodes/commit.svg.import index d47ebc6..86b4574 100644 --- a/nodes/commit.svg.import +++ b/nodes/commit.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/document.svg.import b/nodes/document.svg.import index 4c5b739..d038a7f 100644 --- a/nodes/document.svg.import +++ b/nodes/document.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/head.svg.import b/nodes/head.svg.import index f011619..db9e9e9 100644 --- a/nodes/head.svg.import +++ b/nodes/head.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/head1.svg.import b/nodes/head1.svg.import index 0888d00..6ad89b1 100644 --- a/nodes/head1.svg.import +++ b/nodes/head1.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/head2.svg.import b/nodes/head2.svg.import index 92a04d2..f1fd364 100644 --- a/nodes/head2.svg.import +++ b/nodes/head2.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/head3.svg.import b/nodes/head3.svg.import index 7ba33f4..1641097 100644 --- a/nodes/head3.svg.import +++ b/nodes/head3.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/pop.wav.import b/nodes/pop.wav.import index f7152c5..e59a702 100644 --- a/nodes/pop.wav.import +++ b/nodes/pop.wav.import @@ -17,5 +17,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..a7b3421 100644 --- a/nodes/ref.svg.import +++ b/nodes/ref.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/nodes/tree.svg.import b/nodes/tree.svg.import index 8192b20..f613eaf 100644 --- a/nodes/tree.svg.import +++ b/nodes/tree.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project.godot b/project.godot index 8af698d..ce54de4 100644 --- a/project.godot +++ b/project.godot @@ -81,26 +81,26 @@ window/stretch/aspect="keep" 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,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"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,"physical_scancode":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,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"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,"physical_scancode":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,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"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,"physical_scancode":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,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } click={ @@ -125,27 +125,27 @@ right_click={ } 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,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"physical_scancode":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,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":83,"physical_scancode":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,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":87,"physical_scancode":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,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":76,"physical_scancode":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,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":77,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } diff --git a/scenes/arrow.tscn b/scenes/arrow.tscn index 53c1d62..55bcb53 100644 --- a/scenes/arrow.tscn +++ b/scenes/arrow.tscn @@ -30,8 +30,8 @@ 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 ) +custom_fonts/font = ExtResource( 1 ) text = "label" align = 1 __meta__ = { @@ -43,8 +43,8 @@ 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 ) +custom_fonts/font = ExtResource( 1 ) text = "label" align = 1 __meta__ = { diff --git a/scenes/better_shell.gd b/scenes/better_shell.gd index 34b9ef8..fecf9eb 100644 --- a/scenes/better_shell.gd +++ b/scenes/better_shell.gd @@ -41,7 +41,6 @@ func run_async_thread(shell_command): var debug = false var command = shell_command.command - var crash_on_fail = shell_command.crash_on_fail if debug: print("$ %s" % command) @@ -59,7 +58,6 @@ func run_async_thread(shell_command): #print(hacky_command) - var result var shell_command_internal = game.shell_test(hacky_command) shell_command.output = shell_command_internal.output diff --git a/scenes/card.gd b/scenes/card.gd index 8c97c5a..2ac4cd4 100644 --- a/scenes/card.gd +++ b/scenes/card.gd @@ -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: diff --git a/scenes/card.tscn b/scenes/card.tscn index 55c230f..a4e81f1 100644 --- a/scenes/card.tscn +++ b/scenes/card.tscn @@ -49,9 +49,7 @@ corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[node name="Card" type="Node2D" groups=[ -"cards", -]] +[node name="Card" type="Node2D" groups=["cards"]] script = ExtResource( 3 ) [node name="Panel" type="Panel" parent="."] @@ -120,8 +118,8 @@ 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 ) +custom_fonts/font = ExtResource( 7 ) text = "Description" autowrap = true __meta__ = { @@ -170,5 +168,6 @@ stretch_mode = 6 __meta__ = { "_edit_use_anchors_": false } + [connection signal="mouse_entered" from="Area2D" to="." method="_mouse_entered"] [connection signal="mouse_exited" from="Area2D" to="." method="_mouse_exited"] diff --git a/scenes/cards.tscn b/scenes/cards.tscn index 1fc2fcc..dbade8d 100644 --- a/scenes/cards.tscn +++ b/scenes/cards.tscn @@ -9,9 +9,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="ColorRect" type="ColorRect" parent="."] anchor_right = 1.0 @@ -49,4 +46,5 @@ text = "3" __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="Button" to="." method="redraw_all_cards"] diff --git a/scenes/cli_badge.tscn b/scenes/cli_badge.tscn index 740e2a3..37bbb26 100644 --- a/scenes/cli_badge.tscn +++ b/scenes/cli_badge.tscn @@ -32,9 +32,6 @@ texture = ExtResource( 1 ) expand = true stretch_mode = 6 script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Particles2D" type="Particles2D" parent="."] show_behind_parent = true diff --git a/scenes/drop_area.tscn b/scenes/drop_area.tscn index ed564e6..9326dc4 100644 --- a/scenes/drop_area.tscn +++ b/scenes/drop_area.tscn @@ -23,16 +23,14 @@ resource_local_to_scene = true shader = SubResource( 2 ) shader_param/hovered = 0.0 -[node name="DropArea" type="Node2D" groups=[ -"drop_areas", -]] +[node name="DropArea" type="Node2D" groups=["drop_areas"]] position = Vector2( -0.197731, 0.0673599 ) script = ExtResource( 1 ) [node name="Area2D" type="Area2D" parent="."] -input_pickable = false collision_layer = 0 collision_mask = 524288 +input_pickable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] shape = SubResource( 1 ) @@ -45,5 +43,6 @@ material = SubResource( 3 ) position = Vector2( -0.102825, -0.377726 ) scale = Vector2( 2.25501, 2.25501 ) texture = ExtResource( 2 ) + [connection signal="area_entered" from="Area2D" to="." method="_mouse_entered"] [connection signal="area_exited" from="Area2D" to="." method="_mouse_exited"] diff --git a/scenes/file_browser.gd b/scenes/file_browser.gd index 1af3fa2..e2c8033 100644 --- a/scenes/file_browser.gd +++ b/scenes/file_browser.gd @@ -121,7 +121,6 @@ func update(): #var is_visible = false if repository and repository.there_is_a_git_cache: - var deleted_files = Array(repository.shell.run("git status -s | grep '^D' | sed 's/^...//'").split("\n")) # The last entries are empty strings, remove them. for file_path in files: diff --git a/scenes/file_browser.tscn b/scenes/file_browser.tscn index cbc6bec..eee8ac5 100644 --- a/scenes/file_browser.tscn +++ b/scenes/file_browser.tscn @@ -4,17 +4,12 @@ [ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2] [ext_resource path="res://styles/theme.tres" type="Theme" id=3] -[node name="FileBrowser" type="Control" groups=[ -"editors", -]] +[node name="FileBrowser" type="Control" groups=["editors"]] anchor_right = 1.0 anchor_bottom = 1.0 rect_min_size = Vector2( 0, 142 ) theme = ExtResource( 3 ) script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Panel" type="Panel" parent="."] anchor_right = 1.0 @@ -131,5 +126,6 @@ __meta__ = { [node name="PopupMenu" type="PopupMenu" parent="."] margin_right = 20.0 margin_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.tscn b/scenes/file_browser_item.tscn index d623e75..4ceb076 100644 --- a/scenes/file_browser_item.tscn +++ b/scenes/file_browser_item.tscn @@ -122,4 +122,5 @@ 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 b9cab74..31bf018 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -142,13 +142,13 @@ func shell_test(command): mutex.lock() #print("go") #print(command) - var before = OS.get_ticks_msec() + #var before = OS.get_ticks_msec() while not $ShellServer._connected: $ShellServer._process(0.1) var response = $ShellServer.send(command) - var after = OS.get_ticks_msec() + #var after = OS.get_ticks_msec() #print("took " + str(after-before)+" ms") #print("stop") mutex.unlock() diff --git a/scenes/input_dialog.tscn b/scenes/input_dialog.tscn index 17876b9..4642eed 100644 --- a/scenes/input_dialog.tscn +++ b/scenes/input_dialog.tscn @@ -21,4 +21,5 @@ anchor_bottom = 1.0 __meta__ = { "_edit_use_anchors_": false } + [connection signal="text_entered" from="LineEdit" to="." method="_text_entered"] diff --git a/scenes/level_select.tscn b/scenes/level_select.tscn index 2f8e4f3..c2b47a1 100644 --- a/scenes/level_select.tscn +++ b/scenes/level_select.tscn @@ -90,6 +90,7 @@ text = "To the survey /o/" __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="Button" to="." method="back"] [connection signal="pressed" from="Button2" to="." method="reload"] [connection signal="pressed" from="HelpLabel/Button3" to="." method="onSurveyPressed"] diff --git a/scenes/main.gd b/scenes/main.gd index 0ad09c2..f243e0a 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -44,7 +44,7 @@ func _ready(): load_level(game.current_level) input.grab_focus() -func _process(delta): +func _process(_delta): if _hint_server.is_connection_available(): _hint_client_connection = _hint_server.take_connection() var length = _hint_client_connection.get_u32() diff --git a/scenes/main.tscn b/scenes/main.tscn index e19dec2..af86901 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -189,9 +189,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 ) @@ -276,6 +276,7 @@ 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="pressed" from="Menu/BackButton" to="." method="back"] diff --git a/scenes/music_button.tscn b/scenes/music_button.tscn index 70f47b0..1e6db4e 100644 --- a/scenes/music_button.tscn +++ b/scenes/music_button.tscn @@ -14,4 +14,5 @@ script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="." to="." method="toggle_music"] diff --git a/scenes/no_git.tscn b/scenes/no_git.tscn index b4cad7c..9a0b4e3 100644 --- a/scenes/no_git.tscn +++ b/scenes/no_git.tscn @@ -19,17 +19,14 @@ margin_left = 1.4126 margin_right = 1.4126 theme = ExtResource( 1 ) script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} [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 ) +custom_fonts/font = ExtResource( 5 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { @@ -41,8 +38,8 @@ 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 ) +custom_fonts/font = ExtResource( 5 ) text = "Original score by winniehell" align = 1 __meta__ = { @@ -100,6 +97,7 @@ On Linux, please install it from your package manager, usually the package is ca On macOS 10.8 and below, you can download Git from git-scm.com." autowrap = true + [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/scenes/node.tscn b/scenes/node.tscn index 643a44c..0905cc2 100644 --- a/scenes/node.tscn +++ b/scenes/node.tscn @@ -50,8 +50,8 @@ 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 ) +custom_fonts/font = ExtResource( 1 ) text = "object_id" __meta__ = { "_edit_use_anchors_": false @@ -75,12 +75,13 @@ 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 ) +custom_fonts/font = ExtResource( 1 ) +custom_styles/normal = SubResource( 2 ) __meta__ = { "_edit_use_anchors_": false } + [connection signal="mouse_entered" from="Rect" to="." method="_on_hover"] [connection signal="mouse_exited" from="Rect" to="." method="_on_unhover"] [connection signal="mouse_entered" from="Area2D" to="." method="_on_hover"] diff --git a/scenes/notification.tscn b/scenes/notification.tscn index 5d944e0..3b552c5 100644 --- a/scenes/notification.tscn +++ b/scenes/notification.tscn @@ -60,4 +60,5 @@ text = "Got it!" __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="Panel/CenterContainer/OK" to="." method="confirm"] diff --git a/scenes/repository.tscn b/scenes/repository.tscn index 566b5e8..b669fbe 100644 --- a/scenes/repository.tscn +++ b/scenes/repository.tscn @@ -12,9 +12,6 @@ rect_clip_content = true mouse_filter = 2 theme = ExtResource( 2 ) script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Rows" type="HSplitContainer" parent="."] anchor_right = 1.0 @@ -113,6 +110,7 @@ margin_bottom = 61.0 __meta__ = { "_edit_use_anchors_": false } + [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] [connection signal="pressed" from="Rows/RepoVis/Button" to="." method="update_everything"] diff --git a/scenes/sandbox.tscn b/scenes/sandbox.tscn index ee28577..fc1e113 100644 --- a/scenes/sandbox.tscn +++ b/scenes/sandbox.tscn @@ -48,4 +48,5 @@ margin_left = 961.0 margin_right = 1910.0 margin_bottom = 1070.0 size_flags_horizontal = 3 + [connection signal="command_done" from="Columns/Terminal" to="." method="update_repo"] diff --git a/scenes/survey.tscn b/scenes/survey.tscn index 85aa1a1..a3a2a58 100644 --- a/scenes/survey.tscn +++ b/scenes/survey.tscn @@ -41,8 +41,8 @@ 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 ) +custom_fonts/font = ExtResource( 5 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { @@ -106,5 +106,6 @@ text = "To the survey /o/" __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="VBoxContainer/Button2" to="." method="quit"] [connection signal="pressed" from="VBoxContainer2/Button" to="." method="on_survey_pressed"] diff --git a/scenes/tcp_server_shell.gd b/scenes/tcp_server_shell.gd index 1756170..a9c6c93 100644 --- a/scenes/tcp_server_shell.gd +++ b/scenes/tcp_server_shell.gd @@ -1,6 +1,6 @@ extends Node -signal data_received(string) +#signal data_received(string) signal new_connection export var port: int diff --git a/scenes/terminal.tscn b/scenes/terminal.tscn index 2e8d6fa..b4799f6 100644 --- a/scenes/terminal.tscn +++ b/scenes/terminal.tscn @@ -34,9 +34,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 1 script = ExtResource( 4 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Rows" type="VBoxContainer" parent="."] anchor_right = 1.0 @@ -56,8 +53,8 @@ anchor_bottom = 1.0 margin_top = -1.92206 margin_bottom = -1.92212 size_flags_vertical = 3 -custom_styles/normal = SubResource( 1 ) custom_fonts/normal_font = ExtResource( 3 ) +custom_styles/normal = SubResource( 1 ) scroll_following = true __meta__ = { "_edit_use_anchors_": false @@ -147,6 +144,7 @@ volume_db = -10.0 [node name="OkSound" type="AudioStreamPlayer" parent="."] 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"] diff --git a/scenes/text_editor.tscn b/scenes/text_editor.tscn index 732784f..1738b65 100644 --- a/scenes/text_editor.tscn +++ b/scenes/text_editor.tscn @@ -3,9 +3,7 @@ [ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1] [ext_resource path="res://scenes/text_editor.gd" type="Script" id=2] -[node name="TextEditor" type="TextEdit" groups=[ -"editors", -]] +[node name="TextEditor" type="TextEdit" groups=["editors"]] anchor_right = 1.0 anchor_bottom = 1.0 custom_colors/background_color = Color( 0, 0, 0, 1 ) @@ -48,5 +46,6 @@ 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.tscn b/scenes/title.tscn index 8363e84..5743c26 100644 --- a/scenes/title.tscn +++ b/scenes/title.tscn @@ -19,8 +19,8 @@ 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 ) +custom_fonts/font = ExtResource( 5 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { @@ -32,8 +32,8 @@ 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 ) +custom_fonts/font = ExtResource( 5 ) text = "Original score by winniehell" align = 1 __meta__ = { @@ -72,6 +72,7 @@ text = "Quit" 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/sounds/buzzer.wav.import b/sounds/buzzer.wav.import index 0df076d..081434c 100644 --- a/sounds/buzzer.wav.import +++ b/sounds/buzzer.wav.import @@ -17,5 +17,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..0eba4d0 100644 --- a/sounds/poof.wav.import +++ b/sounds/poof.wav.import @@ -17,5 +17,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..4f12acd 100644 --- a/sounds/success.wav.import +++ b/sounds/success.wav.import @@ -17,5 +17,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..1a6b412 100644 --- a/sounds/swish.wav.import +++ b/sounds/swish.wav.import @@ -17,5 +17,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..f71cf6a 100644 --- a/sounds/swoosh.wav.import +++ b/sounds/swoosh.wav.import @@ -17,5 +17,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..922ee3d 100644 --- a/sounds/typewriter_ding.wav.import +++ b/sounds/typewriter_ding.wav.import @@ -17,5 +17,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..a56c333 100644 --- a/styles/theme.tres +++ b/styles/theme.tres @@ -193,7 +193,7 @@ 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/fonts/font = ExtResource( 1 ) Button/styles/disabled = SubResource( 1 ) Button/styles/focus = SubResource( 2 ) Button/styles/hover = SubResource( 3 ) @@ -206,7 +206,7 @@ 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 @@ -238,7 +238,7 @@ 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 @@ -261,11 +261,11 @@ 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/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 = null +RichTextLabel/fonts/normal_font = ExtResource( 1 ) RichTextLabel/styles/focus = null RichTextLabel/styles/normal = null TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) @@ -322,8 +322,8 @@ 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