From b9bb17e73f8ed1c9b076cf583509ab0d5432cb70 Mon Sep 17 00:00:00 2001 From: Nordup Date: Thu, 24 Oct 2024 06:17:02 +0400 Subject: [PATCH] update to 4.3 --- app/export_presets.cfg | 173 ++++++++++++++++++++++++++++-- app/project.godot | 6 +- app/scenes/app.tscn | 23 ++++ app/scenes/components/result.tscn | 22 ++-- app/scenes/debug.tscn | 4 +- app/scenes/menu_body/world.tscn | 10 +- godot | 2 +- 7 files changed, 209 insertions(+), 31 deletions(-) diff --git a/app/export_presets.cfg b/app/export_presets.cfg index b6db32e..1c5a312 100644 --- a/app/export_presets.cfg +++ b/app/export_presets.cfg @@ -1,8 +1,9 @@ [preset.0] name="Linux/X11" -platform="Linux/X11" +platform="Linux" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -13,6 +14,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.0.options] @@ -20,10 +22,8 @@ custom_template/debug="" custom_template/release="/media/common/Projects/thegates-folder/thegates/godot/bin/godot.linuxbsd.template_release.x86_64" debug/export_console_wrapper=1 binary_format/embed_pck=true -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=true -texture_format/etc2=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false binary_format/architecture="x86_64" ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" @@ -37,6 +37,10 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +texture_format/bptc=false +texture_format/s3tc=true +texture_format/etc=true +texture_format/etc2=false debug/export_console_script=1 [preset.1] @@ -44,6 +48,7 @@ debug/export_console_script=1 name="Windows Desktop" platform="Windows Desktop" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -54,6 +59,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.1.options] @@ -61,10 +67,8 @@ custom_template/debug="" custom_template/release="D:/Projects/thegates-folder/thegates/godot/bin/godot.windows.template_release.x86_64.exe" debug/export_console_wrapper=1 binary_format/embed_pck=false -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false binary_format/architecture="x86_64" codesign/enable=false codesign/timestamp=true @@ -84,6 +88,8 @@ application/file_description="TheGates - Building new Internet" application/copyright="" application/trademarks="" application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" @@ -101,6 +107,10 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" +texture_format/bptc=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false debug/export_console_script=1 [preset.2] @@ -108,6 +118,7 @@ debug/export_console_script=1 name="macOS" platform="macOS" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -118,6 +129,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.2.options] @@ -138,6 +150,7 @@ application/copyright_localized={} application/min_macos_version="10.12" application/export_angle=0 display/high_res=true +application/additional_plist_content="" xcode/platform_build="14C18" xcode/sdk_version="13.1" xcode/sdk_build="22C55" @@ -196,6 +209,148 @@ privacy/network_volumes_usage_description="" privacy/network_volumes_usage_description_localized={} privacy/removable_volumes_usage_description="" privacy/removable_volumes_usage_description_localized={} +privacy/tracking_enabled=false +privacy/tracking_domains=PackedStringArray() +privacy/collected_data/name/collected=false +privacy/collected_data/name/linked_to_user=false +privacy/collected_data/name/used_for_tracking=false +privacy/collected_data/name/collection_purposes=0 +privacy/collected_data/email_address/collected=false +privacy/collected_data/email_address/linked_to_user=false +privacy/collected_data/email_address/used_for_tracking=false +privacy/collected_data/email_address/collection_purposes=0 +privacy/collected_data/phone_number/collected=false +privacy/collected_data/phone_number/linked_to_user=false +privacy/collected_data/phone_number/used_for_tracking=false +privacy/collected_data/phone_number/collection_purposes=0 +privacy/collected_data/physical_address/collected=false +privacy/collected_data/physical_address/linked_to_user=false +privacy/collected_data/physical_address/used_for_tracking=false +privacy/collected_data/physical_address/collection_purposes=0 +privacy/collected_data/other_contact_info/collected=false +privacy/collected_data/other_contact_info/linked_to_user=false +privacy/collected_data/other_contact_info/used_for_tracking=false +privacy/collected_data/other_contact_info/collection_purposes=0 +privacy/collected_data/health/collected=false +privacy/collected_data/health/linked_to_user=false +privacy/collected_data/health/used_for_tracking=false +privacy/collected_data/health/collection_purposes=0 +privacy/collected_data/fitness/collected=false +privacy/collected_data/fitness/linked_to_user=false +privacy/collected_data/fitness/used_for_tracking=false +privacy/collected_data/fitness/collection_purposes=0 +privacy/collected_data/payment_info/collected=false +privacy/collected_data/payment_info/linked_to_user=false +privacy/collected_data/payment_info/used_for_tracking=false +privacy/collected_data/payment_info/collection_purposes=0 +privacy/collected_data/credit_info/collected=false +privacy/collected_data/credit_info/linked_to_user=false +privacy/collected_data/credit_info/used_for_tracking=false +privacy/collected_data/credit_info/collection_purposes=0 +privacy/collected_data/other_financial_info/collected=false +privacy/collected_data/other_financial_info/linked_to_user=false +privacy/collected_data/other_financial_info/used_for_tracking=false +privacy/collected_data/other_financial_info/collection_purposes=0 +privacy/collected_data/precise_location/collected=false +privacy/collected_data/precise_location/linked_to_user=false +privacy/collected_data/precise_location/used_for_tracking=false +privacy/collected_data/precise_location/collection_purposes=0 +privacy/collected_data/coarse_location/collected=false +privacy/collected_data/coarse_location/linked_to_user=false +privacy/collected_data/coarse_location/used_for_tracking=false +privacy/collected_data/coarse_location/collection_purposes=0 +privacy/collected_data/sensitive_info/collected=false +privacy/collected_data/sensitive_info/linked_to_user=false +privacy/collected_data/sensitive_info/used_for_tracking=false +privacy/collected_data/sensitive_info/collection_purposes=0 +privacy/collected_data/contacts/collected=false +privacy/collected_data/contacts/linked_to_user=false +privacy/collected_data/contacts/used_for_tracking=false +privacy/collected_data/contacts/collection_purposes=0 +privacy/collected_data/emails_or_text_messages/collected=false +privacy/collected_data/emails_or_text_messages/linked_to_user=false +privacy/collected_data/emails_or_text_messages/used_for_tracking=false +privacy/collected_data/emails_or_text_messages/collection_purposes=0 +privacy/collected_data/photos_or_videos/collected=false +privacy/collected_data/photos_or_videos/linked_to_user=false +privacy/collected_data/photos_or_videos/used_for_tracking=false +privacy/collected_data/photos_or_videos/collection_purposes=0 +privacy/collected_data/audio_data/collected=false +privacy/collected_data/audio_data/linked_to_user=false +privacy/collected_data/audio_data/used_for_tracking=false +privacy/collected_data/audio_data/collection_purposes=0 +privacy/collected_data/gameplay_content/collected=false +privacy/collected_data/gameplay_content/linked_to_user=false +privacy/collected_data/gameplay_content/used_for_tracking=false +privacy/collected_data/gameplay_content/collection_purposes=0 +privacy/collected_data/customer_support/collected=false +privacy/collected_data/customer_support/linked_to_user=false +privacy/collected_data/customer_support/used_for_tracking=false +privacy/collected_data/customer_support/collection_purposes=0 +privacy/collected_data/other_user_content/collected=false +privacy/collected_data/other_user_content/linked_to_user=false +privacy/collected_data/other_user_content/used_for_tracking=false +privacy/collected_data/other_user_content/collection_purposes=0 +privacy/collected_data/browsing_history/collected=false +privacy/collected_data/browsing_history/linked_to_user=false +privacy/collected_data/browsing_history/used_for_tracking=false +privacy/collected_data/browsing_history/collection_purposes=0 +privacy/collected_data/search_hhistory/collected=false +privacy/collected_data/search_hhistory/linked_to_user=false +privacy/collected_data/search_hhistory/used_for_tracking=false +privacy/collected_data/search_hhistory/collection_purposes=0 +privacy/collected_data/user_id/collected=false +privacy/collected_data/user_id/linked_to_user=false +privacy/collected_data/user_id/used_for_tracking=false +privacy/collected_data/user_id/collection_purposes=0 +privacy/collected_data/device_id/collected=false +privacy/collected_data/device_id/linked_to_user=false +privacy/collected_data/device_id/used_for_tracking=false +privacy/collected_data/device_id/collection_purposes=0 +privacy/collected_data/purchase_history/collected=false +privacy/collected_data/purchase_history/linked_to_user=false +privacy/collected_data/purchase_history/used_for_tracking=false +privacy/collected_data/purchase_history/collection_purposes=0 +privacy/collected_data/product_interaction/collected=false +privacy/collected_data/product_interaction/linked_to_user=false +privacy/collected_data/product_interaction/used_for_tracking=false +privacy/collected_data/product_interaction/collection_purposes=0 +privacy/collected_data/advertising_data/collected=false +privacy/collected_data/advertising_data/linked_to_user=false +privacy/collected_data/advertising_data/used_for_tracking=false +privacy/collected_data/advertising_data/collection_purposes=0 +privacy/collected_data/other_usage_data/collected=false +privacy/collected_data/other_usage_data/linked_to_user=false +privacy/collected_data/other_usage_data/used_for_tracking=false +privacy/collected_data/other_usage_data/collection_purposes=0 +privacy/collected_data/crash_data/collected=false +privacy/collected_data/crash_data/linked_to_user=false +privacy/collected_data/crash_data/used_for_tracking=false +privacy/collected_data/crash_data/collection_purposes=0 +privacy/collected_data/performance_data/collected=false +privacy/collected_data/performance_data/linked_to_user=false +privacy/collected_data/performance_data/used_for_tracking=false +privacy/collected_data/performance_data/collection_purposes=0 +privacy/collected_data/other_diagnostic_data/collected=false +privacy/collected_data/other_diagnostic_data/linked_to_user=false +privacy/collected_data/other_diagnostic_data/used_for_tracking=false +privacy/collected_data/other_diagnostic_data/collection_purposes=0 +privacy/collected_data/environment_scanning/collected=false +privacy/collected_data/environment_scanning/linked_to_user=false +privacy/collected_data/environment_scanning/used_for_tracking=false +privacy/collected_data/environment_scanning/collection_purposes=0 +privacy/collected_data/hands/collected=false +privacy/collected_data/hands/linked_to_user=false +privacy/collected_data/hands/used_for_tracking=false +privacy/collected_data/hands/collection_purposes=0 +privacy/collected_data/head/collected=false +privacy/collected_data/head/linked_to_user=false +privacy/collected_data/head/used_for_tracking=false +privacy/collected_data/head/collection_purposes=0 +privacy/collected_data/other_data_types/collected=false +privacy/collected_data/other_data_types/linked_to_user=false +privacy/collected_data/other_data_types/used_for_tracking=false +privacy/collected_data/other_data_types/collection_purposes=0 ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" diff --git a/app/project.godot b/app/project.godot index 38d4abf..cb938d8 100644 --- a/app/project.godot +++ b/app/project.godot @@ -14,7 +14,7 @@ config/name="TheGates" config/description="Building new Internet" config/tags=PackedStringArray("thegates") run/main_scene="res://scenes/app.tscn" -config/features=PackedStringArray("4.2") +config/features=PackedStringArray("4.3") run/max_fps=144 boot_splash/bg_color=Color(0.156863, 0.156863, 0.156863, 1) boot_splash/show_image=false @@ -55,12 +55,12 @@ theme/custom_font="res://assets/fonts/Inter-Regular.otf" show_ui={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"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":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } open_debug={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194343,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194343,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } diff --git a/app/scenes/app.tscn b/app/scenes/app.tscn index 6a840af..2b4b141 100644 --- a/app/scenes/app.tscn +++ b/app/scenes/app.tscn @@ -69,5 +69,28 @@ bookmarks = ExtResource("6_rupvx") [node name="Menu" parent="." instance=ExtResource("3_o1f7b")] +[node name="GoBack" parent="Menu/VBoxContainer/Top/MenuNavigation" index="0"] +physics_interpolation_mode = 2 +auto_translate_mode = 1 + +[node name="GoForward" parent="Menu/VBoxContainer/Top/MenuNavigation" index="1"] +physics_interpolation_mode = 2 +auto_translate_mode = 1 + +[node name="Reload" parent="Menu/VBoxContainer/Top/MenuNavigation" index="2"] +physics_interpolation_mode = 2 +auto_translate_mode = 1 + +[node name="Search" parent="Menu/VBoxContainer/Top/MenuNavigation" index="3"] +auto_translate_mode = 2 + +[node name="Home" parent="Menu/VBoxContainer/Top/MenuNavigation" index="4"] +physics_interpolation_mode = 2 +auto_translate_mode = 1 + +[node name="Exit" parent="Menu/VBoxContainer/Top" index="2"] +physics_interpolation_mode = 2 +auto_translate_mode = 1 + [editable path="Debug"] [editable path="Menu"] diff --git a/app/scenes/components/result.tscn b/app/scenes/components/result.tscn index e9cc717..b105b7c 100644 --- a/app/scenes/components/result.tscn +++ b/app/scenes/components/result.tscn @@ -10,15 +10,15 @@ [ext_resource type="FontFile" uid="uid://tfj3o1e1wytn" path="res://assets/fonts/Inter-BoldItalic.otf" id="7_gyppg"] [ext_resource type="FontFile" uid="uid://bjeupg0ikc2kv" path="res://assets/fonts/Monospace.ttf" id="8_qjqxs"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7mafe"] -bg_color = Color(0.25098, 0.25098, 0.25098, 0) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_37xan"] +bg_color = Color(0.25098, 0.25098, 0.25098, 1) corner_radius_top_left = 16 corner_radius_top_right = 16 corner_radius_bottom_right = 16 corner_radius_bottom_left = 16 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_37xan"] -bg_color = Color(0.25098, 0.25098, 0.25098, 1) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7mafe"] +bg_color = Color(0.25098, 0.25098, 0.25098, 0) corner_radius_top_left = 16 corner_radius_top_right = 16 corner_radius_bottom_right = 16 @@ -38,10 +38,10 @@ anchor_right = 1.0 anchor_bottom = 0.5 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/normal = SubResource("StyleBoxFlat_7mafe") +theme_override_styles/focus = SubResource("StyleBoxFlat_37xan") theme_override_styles/hover = SubResource("StyleBoxFlat_37xan") theme_override_styles/pressed = SubResource("StyleBoxFlat_37xan") -theme_override_styles/focus = SubResource("StyleBoxFlat_37xan") +theme_override_styles/normal = SubResource("StyleBoxFlat_7mafe") script = ExtResource("1_b6nfm") gate_events = ExtResource("2_wgd6i") url = NodePath("HBoxContainer/VBoxContainer/SpanLimiter/HBoxContainer/Url") @@ -124,15 +124,15 @@ layout_mode = 2 size_flags_vertical = 3 mouse_filter = 1 theme_override_fonts/normal_font = ExtResource("4_tevcf") -theme_override_fonts/bold_font = ExtResource("5_vkte5") +theme_override_fonts/mono_font = ExtResource("8_qjqxs") theme_override_fonts/italics_font = ExtResource("6_10owe") theme_override_fonts/bold_italics_font = ExtResource("7_gyppg") -theme_override_fonts/mono_font = ExtResource("8_qjqxs") +theme_override_fonts/bold_font = ExtResource("5_vkte5") +theme_override_font_sizes/bold_italics_font_size = 20 +theme_override_font_sizes/italics_font_size = 20 +theme_override_font_sizes/mono_font_size = 20 theme_override_font_sizes/normal_font_size = 20 theme_override_font_sizes/bold_font_size = 20 -theme_override_font_sizes/italics_font_size = 20 -theme_override_font_sizes/bold_italics_font_size = 20 -theme_override_font_sizes/mono_font_size = 20 bbcode_enabled = true text = "Description" scroll_active = false diff --git a/app/scenes/debug.tscn b/app/scenes/debug.tscn index 23f40f6..35d8e77 100644 --- a/app/scenes/debug.tscn +++ b/app/scenes/debug.tscn @@ -37,10 +37,10 @@ grow_horizontal = 2 grow_vertical = 2 focus_mode = 2 theme_override_fonts/normal_font = ExtResource("2_da5xc") -theme_override_fonts/bold_font = ExtResource("3_w27g3") +theme_override_fonts/mono_font = ExtResource("6_vcylm") theme_override_fonts/italics_font = ExtResource("4_jcerd") theme_override_fonts/bold_italics_font = ExtResource("5_jgvml") -theme_override_fonts/mono_font = ExtResource("6_vcylm") +theme_override_fonts/bold_font = ExtResource("3_w27g3") bbcode_enabled = true scroll_following = true autowrap_mode = 1 diff --git a/app/scenes/menu_body/world.tscn b/app/scenes/menu_body/world.tscn index 761b4f4..d9c0e4f 100644 --- a/app/scenes/menu_body/world.tscn +++ b/app/scenes/menu_body/world.tscn @@ -425,15 +425,15 @@ layout_mode = 2 size_flags_vertical = 3 focus_mode = 2 theme_override_fonts/normal_font = ExtResource("15_1gk43") -theme_override_fonts/bold_font = ExtResource("16_m0ubw") +theme_override_fonts/mono_font = ExtResource("19_ntc6f") theme_override_fonts/italics_font = ExtResource("17_s7ouj") theme_override_fonts/bold_italics_font = ExtResource("18_qgdgb") -theme_override_fonts/mono_font = ExtResource("19_ntc6f") +theme_override_fonts/bold_font = ExtResource("16_m0ubw") +theme_override_font_sizes/bold_italics_font_size = 24 +theme_override_font_sizes/italics_font_size = 24 +theme_override_font_sizes/mono_font_size = 24 theme_override_font_sizes/normal_font_size = 24 theme_override_font_sizes/bold_font_size = 24 -theme_override_font_sizes/italics_font_size = 24 -theme_override_font_sizes/bold_italics_font_size = 24 -theme_override_font_sizes/mono_font_size = 24 theme_override_styles/focus = SubResource("StyleBoxEmpty_27sha") bbcode_enabled = true context_menu_enabled = true diff --git a/godot b/godot index 500bba8..ed89c45 160000 --- a/godot +++ b/godot @@ -1 +1 @@ -Subproject commit 500bba8f37e77cd9951b7e00f50ce8f75bcaa60f +Subproject commit ed89c45ea8dd91167e7c2351e6326983e5a46d06