From b59aed05dfbd6023011b83427de4350776c091f5 Mon Sep 17 00:00:00 2001 From: Towfie Fanous Date: Thu, 21 Dec 2023 22:01:26 -0500 Subject: [PATCH 1/7] Update the test project and the export action workflow to 4x --- .github/workflows/godot-ci.yml | 78 +-- test-project/default_env.tres | 99 +-- test-project/export_presets.cfg | 612 +++++------------- test-project/icon.png.import | 35 +- test-project/project.godot | 43 +- test-project/resources/img/1.png.import | 35 +- test-project/resources/img/2.png.import | 35 +- .../img/bullet-placeholder.png.import | 35 +- test-project/resources/img/cat0.png.import | 35 +- test-project/resources/img/coil.png.import | 35 +- .../img/missile-placeholder.png.import | 35 +- test-project/scenes/Background.tscn | 14 +- test-project/scenes/Base.tscn | 14 +- test-project/scenes/Cannon.tscn | 24 +- test-project/scenes/EnemyGenerator.tscn | 2 +- test-project/scenes/HUD.tscn | 60 +- test-project/scenes/Main.tscn | 74 +-- test-project/scenes/Player.tscn | 6 +- test-project/scenes/Projectile.tscn | 12 +- test-project/scripts/Cannon.gd | 14 +- test-project/scripts/EnemyGenerator.gd | 9 +- test-project/scripts/Main.gd | 4 +- test-project/scripts/Projectile.gd | 31 +- 23 files changed, 464 insertions(+), 877 deletions(-) mode change 100755 => 100644 test-project/default_env.tres mode change 100755 => 100644 test-project/export_presets.cfg mode change 100755 => 100644 test-project/icon.png.import mode change 100755 => 100644 test-project/resources/img/1.png.import mode change 100755 => 100644 test-project/resources/img/2.png.import mode change 100755 => 100644 test-project/resources/img/bullet-placeholder.png.import mode change 100755 => 100644 test-project/resources/img/cat0.png.import mode change 100755 => 100644 test-project/resources/img/coil.png.import mode change 100755 => 100644 test-project/resources/img/missile-placeholder.png.import mode change 100755 => 100644 test-project/scenes/Main.tscn mode change 100755 => 100644 test-project/scripts/Cannon.gd mode change 100755 => 100644 test-project/scripts/EnemyGenerator.gd mode change 100755 => 100644 test-project/scripts/Projectile.gd diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml index 056cafc..468d7f3 100644 --- a/.github/workflows/godot-ci.yml +++ b/.github/workflows/godot-ci.yml @@ -9,108 +9,74 @@ env: jobs: export-windows: name: Windows Export - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: barichello/godot-ci:4.2.1 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - name: Setup run: | - mkdir -v -p ~/.local/share/godot/export_templates/ - mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + mkdir -v -p ~/.local/share/godot/export_templates + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - name: Windows Build run: | mkdir -v -p build/windows - cd $PROJECT_PATH - godot --headless --verbose --export-release "Windows Desktop" ../build/windows/$EXPORT_NAME.exe + godot --headless --verbose --export-release "Windows Desktop" build/windows/$EXPORT_NAME.exe - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: - name: windows + name: test-project-windows-x86_64 path: build/windows export-linux: name: Linux Export - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: barichello/godot-ci:4.2.1 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - name: Setup run: | - mkdir -v -p ~/.local/share/godot/export_templates/ - mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + mkdir -v -p ~/.local/share/godot/export_templates + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export-templates/${GODOT_VERSION}.stable - name: Linux Build run: | mkdir -v -p build/linux - cd $PROJECT_PATH - godot --headless --verbose --export-release "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64 + godot --headless --verbose --export-release "Linux/X11" build/linux/$EXPORT_NAME.x86_64 - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 # for some reason v4 fails in the linux export job with: - name: linux + name: test-project-linux-x86_64 path: build/linux - export-web: - name: Web Export - runs-on: ubuntu-20.04 - container: - image: barichello/godot-ci:4.2.1 - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - lfs: true - - name: Setup - run: | - mkdir -v -p ~/.local/share/godot/export_templates/ - mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - - name: Web Build - run: | - mkdir -v -p build/web - cd $PROJECT_PATH - godot --headless --verbose --export-release "HTML5" ../build/web/index.html - - name: Upload Artifact - uses: actions/upload-artifact@v1 - with: - name: web - path: build/web - - name: Install rsync 📚 - run: | - apt-get update && apt-get install -y rsync - - name: Deploy to GitHub Pages 🚀 - uses: JamesIves/github-pages-deploy-action@releases/v4 - with: - branch: gh-pages # The branch the action should deploy to. - folder: build/web # The folder the action should deploy. + # removed the export-web until it is fixed in 4x export-mac: name: Mac Export - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: barichello/godot-ci:4.2.1 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: lfs: true - name: Setup run: | - mkdir -v -p ~/.local/share/godot/export_templates/ - mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + mkdir -v -p ~/.local/share/godot/export-templates + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export-templates/${GODOT_VERSION}.stable - name: Mac Build run: | mkdir -v -p build/mac - cd $PROJECT_PATH - godot --headless --verbose --export-release "Mac OSX" ../build/mac/$EXPORT_NAME.zip + godot --headless --verbose --export-release "Mac OSX" build/mac/$EXPORT_NAME.zip - name: Upload Artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: - name: mac + name: test-project-mac-universal path: build/mac diff --git a/test-project/default_env.tres b/test-project/default_env.tres old mode 100755 new mode 100644 index 4a4b981..379a8cd --- a/test-project/default_env.tres +++ b/test-project/default_env.tres @@ -1,102 +1,9 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] +[gd_resource type="Environment" load_steps=2 format=3 uid="uid://4hsvpo3j62v6"] +[sub_resource type="Sky" id="1"] radiance_size = 4 -sky_top_color = Color( 0.647059, 0.839216, 0.945098, 1 ) -sky_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 ) -sky_curve = 0.09 -sky_energy = 1.0 -ground_bottom_color = Color( 0.156863, 0.184314, 0.211765, 1 ) -ground_horizon_color = Color( 0.423529, 0.396078, 0.372549, 1 ) -ground_curve = 0.02 -ground_energy = 1.0 -sun_color = Color( 1, 1, 1, 1 ) -sun_latitude = 35.0 -sun_longitude = 0.0 -sun_angle_min = 1.0 -sun_angle_max = 100.0 -sun_curve = 0.05 -sun_energy = 16.0 -texture_size = 2 [resource] - background_mode = 2 -background_sky = SubResource( 1 ) -background_sky_custom_fov = 0.0 -background_color = Color( 0, 0, 0, 1 ) -background_energy = 1.0 -background_canvas_max_layer = 0 -ambient_light_color = Color( 0, 0, 0, 1 ) -ambient_light_energy = 1.0 -ambient_light_sky_contribution = 1.0 -fog_enabled = false -fog_color = Color( 0.5, 0.6, 0.7, 1 ) -fog_sun_color = Color( 1, 0.9, 0.7, 1 ) -fog_sun_amount = 0.0 -fog_depth_enabled = true -fog_depth_begin = 10.0 -fog_depth_curve = 1.0 -fog_transmit_enabled = false -fog_transmit_curve = 1.0 -fog_height_enabled = false -fog_height_min = 0.0 -fog_height_max = 100.0 -fog_height_curve = 1.0 -tonemap_mode = 0 -tonemap_exposure = 1.0 -tonemap_white = 1.0 -auto_exposure_enabled = false -auto_exposure_scale = 0.4 -auto_exposure_min_luma = 0.05 -auto_exposure_max_luma = 8.0 -auto_exposure_speed = 0.5 -ss_reflections_enabled = false -ss_reflections_max_steps = 64 -ss_reflections_fade_in = 0.15 -ss_reflections_fade_out = 2.0 -ss_reflections_depth_tolerance = 0.2 -ss_reflections_roughness = true -ssao_enabled = false -ssao_radius = 1.0 +sky = SubResource("1") ssao_intensity = 1.0 -ssao_radius2 = 0.0 -ssao_intensity2 = 1.0 -ssao_bias = 0.01 -ssao_light_affect = 0.0 -ssao_ao_channel_affect = 0.0 -ssao_color = Color( 0, 0, 0, 1 ) -ssao_quality = 0 -ssao_blur = 3 -ssao_edge_sharpness = 4.0 -dof_blur_far_enabled = false -dof_blur_far_distance = 10.0 -dof_blur_far_transition = 5.0 -dof_blur_far_amount = 0.1 -dof_blur_far_quality = 1 -dof_blur_near_enabled = false -dof_blur_near_distance = 2.0 -dof_blur_near_transition = 1.0 -dof_blur_near_amount = 0.1 -dof_blur_near_quality = 1 -glow_enabled = false -glow_levels/1 = false -glow_levels/2 = false -glow_levels/3 = true -glow_levels/4 = false -glow_levels/5 = true -glow_levels/6 = false -glow_levels/7 = false -glow_intensity = 0.8 -glow_strength = 1.0 -glow_bloom = 0.0 -glow_blend_mode = 2 -glow_hdr_threshold = 1.0 -glow_hdr_scale = 2.0 -glow_bicubic_upscale = false -adjustment_enabled = false -adjustment_brightness = 1.0 -adjustment_contrast = 1.0 -adjustment_saturation = 1.0 - diff --git a/test-project/export_presets.cfg b/test-project/export_presets.cfg old mode 100755 new mode 100644 index 6b7efd0..1b4a352 --- a/test-project/export_presets.cfg +++ b/test-project/export_presets.cfg @@ -3,24 +3,38 @@ name="Windows Desktop" platform="Windows Desktop" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false [preset.0.options] +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false texture_format/bptc=true texture_format/s3tc=true texture_format/etc=true texture_format/etc2=true -texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=true application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 application/file_version="" application/product_version="" application/company_name="" @@ -28,477 +42,179 @@ application/product_name="" application/file_description="" application/copyright="" application/trademarks="" +application/export_angle=0 +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +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}'" +dotnet/include_scripts_content=false +dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false +texture_format/no_bptc_fallbacks=true +binary_format/64_bits=true [preset.1] -name="Mac OSX" -platform="Mac OSX" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="" -patch_list=PoolStringArray( ) - -[preset.1.options] - -custom_package/debug="" -custom_package/release="" -application/name="" -application/info="Made with Godot Engine" -application/icon="" -application/identifier="" -application/signature="" -application/short_version="1.0" -application/version="1.0" -application/copyright="" -display/high_res=true -texture_format/s3tc=true -texture_format/etc=true -texture_format/etc2=true - -[preset.2] - name="Linux/X11" platform="Linux/X11" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false -[preset.2.options] +[preset.1.options] +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false texture_format/bptc=true texture_format/s3tc=true texture_format/etc=true texture_format/etc2=true +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" +dotnet/include_scripts_content=false +dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false texture_format/no_bptc_fallbacks=true binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" -[preset.3] +[preset.2] -name="HTML5" -platform="HTML5" +name="macOS" +platform="macOS" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) - -[preset.3.options] - -texture_format/s3tc=true -texture_format/etc=true -texture_format/etc2=true -html/custom_html_shell="" -html/head_include="" -custom_template/release="" -custom_template/debug="" - -[preset.4] - -name="Android Debug" -platform="Android" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false -[preset.4.options] - -graphics/32_bits_framebuffer=true -xr_features/xr_mode=0 -xr_features/degrees_of_freedom=0 -xr_features/hand_tracking=0 -xr_features/focus_awareness=false -one_click_deploy/clear_previous_install=false -custom_template/debug="" -custom_template/release="" -custom_template/use_custom_build=false -command_line/extra_args="" -version/code=1 -version/name="1.0" -package/unique_name="org.godotengine.$genname" -package/name="" -package/signed=true -screen/immersive_mode=true -screen/orientation=0 -screen/support_small=true -screen/support_normal=true -screen/support_large=true -screen/support_xlarge=true -screen/opengl_debug=false -launcher_icons/main_192x192="" -launcher_icons/adaptive_foreground_432x432="" -launcher_icons/adaptive_background_432x432="" -keystore/debug="" -keystore/debug_user="" -keystore/debug_password="" -keystore/release="" -keystore/release_user="" -keystore/release_password="" -apk_expansion/enable=false -apk_expansion/SALT="" -apk_expansion/public_key="" -architectures/armeabi-v7a=true -architectures/arm64-v8a=true -architectures/x86=false -architectures/x86_64=false -permissions/custom_permissions=PoolStringArray( ) -permissions/access_checkin_properties=false -permissions/access_coarse_location=false -permissions/access_fine_location=false -permissions/access_location_extra_commands=false -permissions/access_mock_location=false -permissions/access_network_state=false -permissions/access_surface_flinger=false -permissions/access_wifi_state=false -permissions/account_manager=false -permissions/add_voicemail=false -permissions/authenticate_accounts=false -permissions/battery_stats=false -permissions/bind_accessibility_service=false -permissions/bind_appwidget=false -permissions/bind_device_admin=false -permissions/bind_input_method=false -permissions/bind_nfc_service=false -permissions/bind_notification_listener_service=false -permissions/bind_print_service=false -permissions/bind_remoteviews=false -permissions/bind_text_service=false -permissions/bind_vpn_service=false -permissions/bind_wallpaper=false -permissions/bluetooth=false -permissions/bluetooth_admin=false -permissions/bluetooth_privileged=false -permissions/brick=false -permissions/broadcast_package_removed=false -permissions/broadcast_sms=false -permissions/broadcast_sticky=false -permissions/broadcast_wap_push=false -permissions/call_phone=false -permissions/call_privileged=false -permissions/camera=false -permissions/capture_audio_output=false -permissions/capture_secure_video_output=false -permissions/capture_video_output=false -permissions/change_component_enabled_state=false -permissions/change_configuration=false -permissions/change_network_state=false -permissions/change_wifi_multicast_state=false -permissions/change_wifi_state=false -permissions/clear_app_cache=false -permissions/clear_app_user_data=false -permissions/control_location_updates=false -permissions/delete_cache_files=false -permissions/delete_packages=false -permissions/device_power=false -permissions/diagnostic=false -permissions/disable_keyguard=false -permissions/dump=false -permissions/expand_status_bar=false -permissions/factory_test=false -permissions/flashlight=false -permissions/force_back=false -permissions/get_accounts=false -permissions/get_package_size=false -permissions/get_tasks=false -permissions/get_top_activity_info=false -permissions/global_search=false -permissions/hardware_test=false -permissions/inject_events=false -permissions/install_location_provider=false -permissions/install_packages=false -permissions/install_shortcut=false -permissions/internal_system_window=false -permissions/internet=false -permissions/kill_background_processes=false -permissions/location_hardware=false -permissions/manage_accounts=false -permissions/manage_app_tokens=false -permissions/manage_documents=false -permissions/master_clear=false -permissions/media_content_control=false -permissions/modify_audio_settings=false -permissions/modify_phone_state=false -permissions/mount_format_filesystems=false -permissions/mount_unmount_filesystems=false -permissions/nfc=false -permissions/persistent_activity=false -permissions/process_outgoing_calls=false -permissions/read_calendar=false -permissions/read_call_log=false -permissions/read_contacts=false -permissions/read_external_storage=false -permissions/read_frame_buffer=false -permissions/read_history_bookmarks=false -permissions/read_input_state=false -permissions/read_logs=false -permissions/read_phone_state=false -permissions/read_profile=false -permissions/read_sms=false -permissions/read_social_stream=false -permissions/read_sync_settings=false -permissions/read_sync_stats=false -permissions/read_user_dictionary=false -permissions/reboot=false -permissions/receive_boot_completed=false -permissions/receive_mms=false -permissions/receive_sms=false -permissions/receive_wap_push=false -permissions/record_audio=false -permissions/reorder_tasks=false -permissions/restart_packages=false -permissions/send_respond_via_message=false -permissions/send_sms=false -permissions/set_activity_watcher=false -permissions/set_alarm=false -permissions/set_always_finish=false -permissions/set_animation_scale=false -permissions/set_debug_app=false -permissions/set_orientation=false -permissions/set_pointer_speed=false -permissions/set_preferred_applications=false -permissions/set_process_limit=false -permissions/set_time=false -permissions/set_time_zone=false -permissions/set_wallpaper=false -permissions/set_wallpaper_hints=false -permissions/signal_persistent_processes=false -permissions/status_bar=false -permissions/subscribed_feeds_read=false -permissions/subscribed_feeds_write=false -permissions/system_alert_window=false -permissions/transmit_ir=false -permissions/uninstall_shortcut=false -permissions/update_device_stats=false -permissions/use_credentials=false -permissions/use_sip=false -permissions/vibrate=false -permissions/wake_lock=false -permissions/write_apn_settings=false -permissions/write_calendar=false -permissions/write_call_log=false -permissions/write_contacts=false -permissions/write_external_storage=false -permissions/write_gservices=false -permissions/write_history_bookmarks=false -permissions/write_profile=false -permissions/write_secure_settings=false -permissions/write_settings=false -permissions/write_sms=false -permissions/write_social_stream=false -permissions/write_sync_settings=false -permissions/write_user_dictionary=false - -[preset.5] - -name="Android" -platform="Android" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.5.options] +[preset.2.options] -graphics/32_bits_framebuffer=true -xr_features/xr_mode=0 -xr_features/degrees_of_freedom=0 -xr_features/hand_tracking=0 -xr_features/focus_awareness=false -one_click_deploy/clear_previous_install=false +export/distribution_type=1 +binary_format/architecture="universal" custom_template/debug="" custom_template/release="" -custom_template/use_custom_build=false -command_line/extra_args="" -version/code=1 -version/name="1.0" -package/unique_name="org.godotengine.$genname" -package/name="" -package/signed=true -screen/immersive_mode=true -screen/orientation=0 -screen/support_small=true -screen/support_normal=true -screen/support_large=true -screen/support_xlarge=true -screen/opengl_debug=false -launcher_icons/main_192x192="" -launcher_icons/adaptive_foreground_432x432="" -launcher_icons/adaptive_background_432x432="" -keystore/debug="" -keystore/debug_user="" -keystore/debug_password="" -keystore/release="" -keystore/release_user="" -keystore/release_password="" -apk_expansion/enable=false -apk_expansion/SALT="" -apk_expansion/public_key="" -architectures/armeabi-v7a=true -architectures/arm64-v8a=true -architectures/x86=false -architectures/x86_64=false -permissions/custom_permissions=PoolStringArray( ) -permissions/access_checkin_properties=false -permissions/access_coarse_location=false -permissions/access_fine_location=false -permissions/access_location_extra_commands=false -permissions/access_mock_location=false -permissions/access_network_state=false -permissions/access_surface_flinger=false -permissions/access_wifi_state=false -permissions/account_manager=false -permissions/add_voicemail=false -permissions/authenticate_accounts=false -permissions/battery_stats=false -permissions/bind_accessibility_service=false -permissions/bind_appwidget=false -permissions/bind_device_admin=false -permissions/bind_input_method=false -permissions/bind_nfc_service=false -permissions/bind_notification_listener_service=false -permissions/bind_print_service=false -permissions/bind_remoteviews=false -permissions/bind_text_service=false -permissions/bind_vpn_service=false -permissions/bind_wallpaper=false -permissions/bluetooth=false -permissions/bluetooth_admin=false -permissions/bluetooth_privileged=false -permissions/brick=false -permissions/broadcast_package_removed=false -permissions/broadcast_sms=false -permissions/broadcast_sticky=false -permissions/broadcast_wap_push=false -permissions/call_phone=false -permissions/call_privileged=false -permissions/camera=false -permissions/capture_audio_output=false -permissions/capture_secure_video_output=false -permissions/capture_video_output=false -permissions/change_component_enabled_state=false -permissions/change_configuration=false -permissions/change_network_state=false -permissions/change_wifi_multicast_state=false -permissions/change_wifi_state=false -permissions/clear_app_cache=false -permissions/clear_app_user_data=false -permissions/control_location_updates=false -permissions/delete_cache_files=false -permissions/delete_packages=false -permissions/device_power=false -permissions/diagnostic=false -permissions/disable_keyguard=false -permissions/dump=false -permissions/expand_status_bar=false -permissions/factory_test=false -permissions/flashlight=false -permissions/force_back=false -permissions/get_accounts=false -permissions/get_package_size=false -permissions/get_tasks=false -permissions/get_top_activity_info=false -permissions/global_search=false -permissions/hardware_test=false -permissions/inject_events=false -permissions/install_location_provider=false -permissions/install_packages=false -permissions/install_shortcut=false -permissions/internal_system_window=false -permissions/internet=false -permissions/kill_background_processes=false -permissions/location_hardware=false -permissions/manage_accounts=false -permissions/manage_app_tokens=false -permissions/manage_documents=false -permissions/master_clear=false -permissions/media_content_control=false -permissions/modify_audio_settings=false -permissions/modify_phone_state=false -permissions/mount_format_filesystems=false -permissions/mount_unmount_filesystems=false -permissions/nfc=false -permissions/persistent_activity=false -permissions/process_outgoing_calls=false -permissions/read_calendar=false -permissions/read_call_log=false -permissions/read_contacts=false -permissions/read_external_storage=false -permissions/read_frame_buffer=false -permissions/read_history_bookmarks=false -permissions/read_input_state=false -permissions/read_logs=false -permissions/read_phone_state=false -permissions/read_profile=false -permissions/read_sms=false -permissions/read_social_stream=false -permissions/read_sync_settings=false -permissions/read_sync_stats=false -permissions/read_user_dictionary=false -permissions/reboot=false -permissions/receive_boot_completed=false -permissions/receive_mms=false -permissions/receive_sms=false -permissions/receive_wap_push=false -permissions/record_audio=false -permissions/reorder_tasks=false -permissions/restart_packages=false -permissions/send_respond_via_message=false -permissions/send_sms=false -permissions/set_activity_watcher=false -permissions/set_alarm=false -permissions/set_always_finish=false -permissions/set_animation_scale=false -permissions/set_debug_app=false -permissions/set_orientation=false -permissions/set_pointer_speed=false -permissions/set_preferred_applications=false -permissions/set_process_limit=false -permissions/set_time=false -permissions/set_time_zone=false -permissions/set_wallpaper=false -permissions/set_wallpaper_hints=false -permissions/signal_persistent_processes=false -permissions/status_bar=false -permissions/subscribed_feeds_read=false -permissions/subscribed_feeds_write=false -permissions/system_alert_window=false -permissions/transmit_ir=false -permissions/uninstall_shortcut=false -permissions/update_device_stats=false -permissions/use_credentials=false -permissions/use_sip=false -permissions/vibrate=false -permissions/wake_lock=false -permissions/write_apn_settings=false -permissions/write_calendar=false -permissions/write_call_log=false -permissions/write_contacts=false -permissions/write_external_storage=false -permissions/write_gservices=false -permissions/write_history_bookmarks=false -permissions/write_profile=false -permissions/write_secure_settings=false -permissions/write_settings=false -permissions/write_sms=false -permissions/write_social_stream=false -permissions/write_sync_settings=false -permissions/write_user_dictionary=false \ No newline at end of file +debug/export_console_wrapper=1 +application/icon="" +application/icon_interpolation=4 +application/bundle_identifier="com.godotci.gameoff" +application/signature="" +application/app_category="Games" +application/short_version="" +application/version="" +application/copyright="" +application/copyright_localized={} +application/min_macos_version="10.12" +application/export_angle=0 +display/high_res=true +xcode/platform_build="14C18" +xcode/sdk_version="13.1" +xcode/sdk_build="22C55" +xcode/sdk_name="macosx13.1" +xcode/xcode_version="1420" +xcode/xcode_build="14C18" +codesign/codesign=1 +codesign/installer_identity="" +codesign/apple_team_id="" +codesign/identity="" +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/entitlements/app_sandbox/files_user_selected=0 +codesign/entitlements/app_sandbox/helper_executables=[] +codesign/custom_options=PackedStringArray() +notarization/notarization=0 +privacy/microphone_usage_description="" +privacy/microphone_usage_description_localized={} +privacy/camera_usage_description="" +privacy/camera_usage_description_localized={} +privacy/location_usage_description="" +privacy/location_usage_description_localized={} +privacy/address_book_usage_description="" +privacy/address_book_usage_description_localized={} +privacy/calendar_usage_description="" +privacy/calendar_usage_description_localized={} +privacy/photos_library_usage_description="" +privacy/photos_library_usage_description_localized={} +privacy/desktop_folder_usage_description="" +privacy/desktop_folder_usage_description_localized={} +privacy/documents_folder_usage_description="" +privacy/documents_folder_usage_description_localized={} +privacy/downloads_folder_usage_description="" +privacy/downloads_folder_usage_description_localized={} +privacy/network_volumes_usage_description="" +privacy/network_volumes_usage_description_localized={} +privacy/removable_volumes_usage_description="" +privacy/removable_volumes_usage_description_localized={} +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" +dotnet/include_scripts_content=false +dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false diff --git a/test-project/icon.png.import b/test-project/icon.png.import old mode 100755 new mode 100644 index 45ee6af..224b941 --- a/test-project/icon.png.import +++ b/test-project/icon.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +type="CompressedTexture2D" +uid="uid://cgaf1k1anrqqf" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.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/test-project/project.godot b/test-project/project.godot index de93b44..3769257 100644 --- a/test-project/project.godot +++ b/test-project/project.godot @@ -6,17 +6,13 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 - -_global_script_classes=[ ] -_global_script_class_icons={ - -} +config_version=5 [application] config/name="gameoff" run/main_scene="res://scenes/Main.tscn" +config/features=PackedStringArray("4.2") config/icon="res://icon.png" [autoload] @@ -25,39 +21,44 @@ GLOBAL="*res://scripts/GLOBAL.gd" [display] -window/size/width=1920 -window/size/height=1080 +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/size/resizable=false +[dotnet] + +project/assembly_name="gameoff" + [input] ui_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(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":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(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":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) +] } ui_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(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":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(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":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) +] } swap={ "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":2,"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":2,"canceled":false,"pressed":false,"double_click":false,"script":null) +] } fire={ "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) +] } [rendering] +textures/vram_compression/import_etc2_astc=true +environment/defaults/default_environment="res://default_env.tres" quality/driver/driver_name="GLES2" vram_compression/import_etc=true -environment/default_environment="res://default_env.tres" diff --git a/test-project/resources/img/1.png.import b/test-project/resources/img/1.png.import old mode 100755 new mode 100644 index 096219c..6e1721a --- a/test-project/resources/img/1.png.import +++ b/test-project/resources/img/1.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/1.png-874a0dfc3e148ca5b5c7b731b459b9a9.stex" +type="CompressedTexture2D" +uid="uid://b72cmf6alugjt" +path="res://.godot/imported/1.png-874a0dfc3e148ca5b5c7b731b459b9a9.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://resources/img/1.png" -dest_files=[ "res://.import/1.png-874a0dfc3e148ca5b5c7b731b459b9a9.stex" ] +dest_files=["res://.godot/imported/1.png-874a0dfc3e148ca5b5c7b731b459b9a9.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/test-project/resources/img/2.png.import b/test-project/resources/img/2.png.import old mode 100755 new mode 100644 index a3c0a7f..d1de74a --- a/test-project/resources/img/2.png.import +++ b/test-project/resources/img/2.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/2.png-a7dea376fea94ea1eb370fce6b063bfe.stex" +type="CompressedTexture2D" +uid="uid://bi6cni5x2q21n" +path="res://.godot/imported/2.png-a7dea376fea94ea1eb370fce6b063bfe.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://resources/img/2.png" -dest_files=[ "res://.import/2.png-a7dea376fea94ea1eb370fce6b063bfe.stex" ] +dest_files=["res://.godot/imported/2.png-a7dea376fea94ea1eb370fce6b063bfe.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/test-project/resources/img/bullet-placeholder.png.import b/test-project/resources/img/bullet-placeholder.png.import old mode 100755 new mode 100644 index 917ce70..87ff4fb --- a/test-project/resources/img/bullet-placeholder.png.import +++ b/test-project/resources/img/bullet-placeholder.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/bullet-placeholder.png-eeaa4de234c0486ca1a9eb8dc6789c56.stex" +type="CompressedTexture2D" +uid="uid://ckxvdgyaobi5m" +path="res://.godot/imported/bullet-placeholder.png-eeaa4de234c0486ca1a9eb8dc6789c56.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://resources/img/bullet-placeholder.png" -dest_files=[ "res://.import/bullet-placeholder.png-eeaa4de234c0486ca1a9eb8dc6789c56.stex" ] +dest_files=["res://.godot/imported/bullet-placeholder.png-eeaa4de234c0486ca1a9eb8dc6789c56.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/test-project/resources/img/cat0.png.import b/test-project/resources/img/cat0.png.import old mode 100755 new mode 100644 index 390818f..7e922e9 --- a/test-project/resources/img/cat0.png.import +++ b/test-project/resources/img/cat0.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/cat0.png-c2a0d2145a7b7ae5da0c2cedfce916ba.stex" +type="CompressedTexture2D" +uid="uid://coeqs1kvn2d86" +path="res://.godot/imported/cat0.png-c2a0d2145a7b7ae5da0c2cedfce916ba.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://resources/img/cat0.png" -dest_files=[ "res://.import/cat0.png-c2a0d2145a7b7ae5da0c2cedfce916ba.stex" ] +dest_files=["res://.godot/imported/cat0.png-c2a0d2145a7b7ae5da0c2cedfce916ba.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/test-project/resources/img/coil.png.import b/test-project/resources/img/coil.png.import old mode 100755 new mode 100644 index 29a288b..0588a9b --- a/test-project/resources/img/coil.png.import +++ b/test-project/resources/img/coil.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/coil.png-9a3ed0a2a28db47534112a3d0aada371.stex" +type="CompressedTexture2D" +uid="uid://c18o0e5s7umc7" +path="res://.godot/imported/coil.png-9a3ed0a2a28db47534112a3d0aada371.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://resources/img/coil.png" -dest_files=[ "res://.import/coil.png-9a3ed0a2a28db47534112a3d0aada371.stex" ] +dest_files=["res://.godot/imported/coil.png-9a3ed0a2a28db47534112a3d0aada371.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/test-project/resources/img/missile-placeholder.png.import b/test-project/resources/img/missile-placeholder.png.import old mode 100755 new mode 100644 index 6cbedb6..78989f4 --- a/test-project/resources/img/missile-placeholder.png.import +++ b/test-project/resources/img/missile-placeholder.png.import @@ -1,31 +1,34 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/missile-placeholder.png-1d86beeaaa1c40b1fbc4c2a8d00be077.stex" +type="CompressedTexture2D" +uid="uid://b5wcuvu5x0h52" +path="res://.godot/imported/missile-placeholder.png-1d86beeaaa1c40b1fbc4c2a8d00be077.ctex" +metadata={ +"vram_texture": false +} [deps] source_file="res://resources/img/missile-placeholder.png" -dest_files=[ "res://.import/missile-placeholder.png-1d86beeaaa1c40b1fbc4c2a8d00be077.stex" ] +dest_files=["res://.godot/imported/missile-placeholder.png-1d86beeaaa1c40b1fbc4c2a8d00be077.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/test-project/scenes/Background.tscn b/test-project/scenes/Background.tscn index 5ee8484..e9b1292 100755 --- a/test-project/scenes/Background.tscn +++ b/test-project/scenes/Background.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://scripts/ColoredEntity.gd" type="Script" id=1] -[ext_resource path="res://resources/img/2.png" type="Texture" id=2] +[ext_resource path="res://resources/img/2.png" type="Texture2D" id=2] [node name="Background" type="Node2D" groups=[ "ColoredEntity", @@ -13,12 +13,12 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = -199.0 -margin_top = -157.0 -margin_right = 2097.0 -margin_bottom = 1217.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_left = -199.0 +offset_top = -157.0 +offset_right = 2097.0 +offset_bottom = 1217.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 diff --git a/test-project/scenes/Base.tscn b/test-project/scenes/Base.tscn index d7e239c..46a2427 100755 --- a/test-project/scenes/Base.tscn +++ b/test-project/scenes/Base.tscn @@ -17,12 +17,12 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -60.5 -margin_top = -33.0 -margin_right = 60.5 -margin_bottom = 33.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_left = -60.5 +offset_top = -33.0 +offset_right = 60.5 +offset_bottom = 33.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 @@ -31,7 +31,7 @@ color = Color( 1, 1, 1, 1 ) [node name="Body" type="Area2D" parent="."] input_pickable = true -gravity_vec = Vector2( 0, 1 ) +gravity_direction = Vector2( 0, 1 ) gravity = 98.0 linear_damp = 0.1 angular_damp = 1.0 diff --git a/test-project/scenes/Cannon.tscn b/test-project/scenes/Cannon.tscn index 60106c4..c193108 100755 --- a/test-project/scenes/Cannon.tscn +++ b/test-project/scenes/Cannon.tscn @@ -1,24 +1,24 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://scripts/Cannon.gd" type="Script" id=1] -[ext_resource path="res://resources/img/1.png" type="Texture" id=2] +[ext_resource path="res://resources/img/1.png" type="Texture2D" id=2] [node name="Cannon" type="Node2D" groups=[ "ColoredEntity", ]] script = ExtResource( 1 ) -[node name="Sprite" type="TextureRect" parent="."] +[node name="Sprite2D" type="TextureRect" parent="."] anchor_left = 0.0 anchor_top = 0.5 anchor_right = 0.0 anchor_bottom = 0.5 -margin_top = -10.0 -margin_right = 150.0 -margin_bottom = 38.0 -rect_min_size = Vector2( 150, 24 ) -rect_pivot_offset = Vector2( 10, 10 ) -rect_clip_content = false +offset_top = -10.0 +offset_right = 150.0 +offset_bottom = 38.0 +custom_minimum_size = Vector2( 150, 24 ) +pivot_offset = Vector2( 10, 10 ) +clip_contents = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 0 @@ -26,11 +26,11 @@ size_flags_vertical = 0 texture = ExtResource( 2 ) stretch_mode = 2 -[node name="GuideLine" type="Line2D" parent="Sprite"] +[node name="GuideLine" type="Line2D" parent="Sprite2D"] modulate = Color( 1, 1, 1, 0.1 ) show_behind_parent = true position = Vector2( 0, 10 ) -points = PoolVector2Array( 135, 2, 2000, 2 ) +points = PackedVector2Array( 135, 2, 2000, 2 ) width = 5.0 default_color = Color( 1, 1, 1, 1 ) texture_mode = 1 @@ -38,10 +38,10 @@ joint_mode = 2 sharp_limit = 2.0 round_precision = 10 -[node name="CannonTip" type="Position2D" parent="Sprite"] +[node name="CannonTip" type="Marker2D" parent="Sprite2D"] position = Vector2( 120, 12 ) -[node name="CannonBase" type="Position2D" parent="Sprite"] +[node name="CannonBase" type="Marker2D" parent="Sprite2D"] position = Vector2( 0, 12 ) [node name="Projectiles" type="Node" parent="."] diff --git a/test-project/scenes/EnemyGenerator.tscn b/test-project/scenes/EnemyGenerator.tscn index 5e33fcd..a22ba28 100755 --- a/test-project/scenes/EnemyGenerator.tscn +++ b/test-project/scenes/EnemyGenerator.tscn @@ -6,7 +6,7 @@ bake_interval = 5.0 _data = { -"points": PoolVector2Array( 0, 0, 0, 0, 802.371, -163.584, 0, 0, 0, 0, 959.909, -42.497, 0, 0, 0, 0, 1955.58, -35.2126, 0, 0, 0, 0, 1977.69, -34.257, 0, 0, 0, 0, 2072.89, -95.3282, 0, 0, 0, 0, 2171.96, -161.2, 0, 0, 0, 0, 1329.54, -162.398, 0, 0, 0, 0, 958.623, -161.461, 0, 0, 0, 0, 801.772, -163.584, 0, 0, 0, 0, 802.371, -163.584 ) +"points": PackedVector2Array( 0, 0, 0, 0, 802.371, -163.584, 0, 0, 0, 0, 959.909, -42.497, 0, 0, 0, 0, 1955.58, -35.2126, 0, 0, 0, 0, 1977.69, -34.257, 0, 0, 0, 0, 2072.89, -95.3282, 0, 0, 0, 0, 2171.96, -161.2, 0, 0, 0, 0, 1329.54, -162.398, 0, 0, 0, 0, 958.623, -161.461, 0, 0, 0, 0, 801.772, -163.584, 0, 0, 0, 0, 802.371, -163.584 ) } [node name="EnemyGenerator" type="Node2D"] diff --git a/test-project/scenes/HUD.tscn b/test-project/scenes/HUD.tscn index 897d548..ccdee48 100755 --- a/test-project/scenes/HUD.tscn +++ b/test-project/scenes/HUD.tscn @@ -7,8 +7,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +pivot_offset = Vector2( 0, 0 ) +clip_contents = false mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 @@ -20,12 +20,12 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 1.0 -margin_top = 84.0 -margin_right = 496.0 -margin_bottom = 196.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_left = 1.0 +offset_top = 84.0 +offset_right = 496.0 +offset_bottom = 196.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 @@ -37,17 +37,17 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 63.0 -margin_bottom = 112.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_right = 63.0 +offset_bottom = 112.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false focus_mode = 2 mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 toggle_mode = false -enabled_focus_mode = 2 +focus_mode = 2 shortcut = null group = null text = "THEME1" @@ -59,18 +59,18 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 67.0 -margin_right = 130.0 -margin_bottom = 112.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_left = 67.0 +offset_right = 130.0 +offset_bottom = 112.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false focus_mode = 2 mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 toggle_mode = false -enabled_focus_mode = 2 +focus_mode = 2 shortcut = null group = null text = "THEME2" @@ -82,18 +82,18 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 134.0 -margin_right = 197.0 -margin_bottom = 112.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_left = 134.0 +offset_right = 197.0 +offset_bottom = 112.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false focus_mode = 2 mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 toggle_mode = false -enabled_focus_mode = 2 +focus_mode = 2 shortcut = null group = null text = "THEME3" @@ -105,17 +105,17 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 203.0 -margin_bottom = 78.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false +offset_right = 203.0 +offset_bottom = 78.0 +pivot_offset = Vector2( 0, 0 ) +clip_contents = false focus_mode = 2 mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 toggle_mode = false -enabled_focus_mode = 2 +focus_mode = 2 shortcut = null group = null text = "START" diff --git a/test-project/scenes/Main.tscn b/test-project/scenes/Main.tscn old mode 100755 new mode 100644 index 4f0638c..a1906d6 --- a/test-project/scenes/Main.tscn +++ b/test-project/scenes/Main.tscn @@ -1,68 +1,46 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://ie45rqmj7kbe"] -[ext_resource path="res://scripts/Main.gd" type="Script" id=1] -[ext_resource path="res://scenes/Game.tscn" type="PackedScene" id=2] -[ext_resource path="res://scenes/HUD.tscn" type="PackedScene" id=3] +[ext_resource type="Script" path="res://scripts/Main.gd" id="1"] +[ext_resource type="PackedScene" path="res://scenes/Game.tscn" id="2"] +[ext_resource type="PackedScene" path="res://scenes/HUD.tscn" id="3"] -[sub_resource type="Curve2D" id=1] - -bake_interval = 5.0 +[sub_resource type="Curve2D" id="1"] _data = { -"points": PoolVector2Array( 0, 0, 0, 0, 18.8947, 55.4928, 0, 0, 0, 0, -269.905, -419.567 ) +"points": PackedVector2Array(0, 0, 0, 0, 18.8947, 55.4928, 0, 0, 0, 0, -269.905, -419.567) } +point_count = 2 [node name="Main" type="Node2D"] -script = ExtResource( 1 ) +script = ExtResource("1") -[node name="Game" parent="." instance=ExtResource( 2 )] +[node name="Game" parent="." instance=ExtResource("2")] [node name="Path2D" type="Path2D" parent="."] -editor/display_folded = true -self_modulate = Color( 0.5, 0.6, 1, 0.7 ) -position = Vector2( 460.871, 779.989 ) +self_modulate = Color(0.5, 0.6, 1, 0.7) +position = Vector2(460.871, 779.989) rotation = -3.14159 -scale = Vector2( 2.52308, -0.891921 ) -curve = SubResource( 1 ) +scale = Vector2(2.52308, -0.891921) +curve = SubResource("1") [node name="PathFollow2D" type="PathFollow2D" parent="Path2D"] -position = Vector2( -17.0181, -3.58169 ) -offset = 69.1956 -h_offset = 0.0 -v_offset = 0.0 -rotate = false -cubic_interp = true +position = Vector2(18.8947, 55.4928) +rotation = -2.11702 loop = false -lookahead = 4.0 [node name="MenuCamera" type="Camera2D" parent="Path2D/PathFollow2D"] -position = Vector2( 21.2, 58.5266 ) -anchor_mode = 1 -rotating = false -current = true -zoom = Vector2( 0.5, 0.5 ) -limit_left = -10000000 -limit_top = -10000000 -limit_right = 10000000 -limit_bottom = 10000000 -limit_smoothed = false -drag_margin_h_enabled = true -drag_margin_v_enabled = true -smoothing_enabled = false -smoothing_speed = 5.0 -offset_v = 0.0 -offset_h = 0.0 -drag_margin_left = 0.2 -drag_margin_top = 0.2 -drag_margin_right = 0.2 -drag_margin_bottom = 0.2 -editor_draw_screen = true +position = Vector2(21.2, 58.5266) +zoom = Vector2(0.5, 0.5) +drag_horizontal_enabled = true +drag_vertical_enabled = true editor_draw_limits = true editor_draw_drag_margin = true -[node name="HUD" parent="." instance=ExtResource( 3 )] -margin_left = 625.0 -margin_top = 820.0 -margin_right = 625.0 -margin_bottom = 820.0 +[node name="HUD" parent="." instance=ExtResource("3")] +layout_mode = 3 +anchors_preset = 15 +offset_left = 625.0 +offset_top = 820.0 +offset_right = 625.0 +offset_bottom = 820.0 [connection signal="start_zoom_out" from="." to="." method="_on_Main_start_zoom_out"] diff --git a/test-project/scenes/Player.tscn b/test-project/scenes/Player.tscn index cdc6764..b9c7899 100755 --- a/test-project/scenes/Player.tscn +++ b/test-project/scenes/Player.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://scripts/Player.gd" type="Script" id=1] [ext_resource path="res://scenes/Cannon.tscn" type="PackedScene" id=2] -[ext_resource path="res://resources/img/cat0.png" type="Texture" id=3] +[ext_resource path="res://resources/img/cat0.png" type="Texture2D" id=3] [sub_resource type="CapsuleShape2D" id=1] @@ -18,11 +18,11 @@ script = ExtResource( 1 ) [node name="Cannon" parent="." instance=ExtResource( 2 )] position = Vector2( -50.0759, 40.2842 ) -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="."] scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 3 ) -[node name="Body" type="KinematicBody2D" parent="."] +[node name="Body" type="CharacterBody2D" parent="."] input_pickable = false collision_layer = 1 collision_mask = 1 diff --git a/test-project/scenes/Projectile.tscn b/test-project/scenes/Projectile.tscn index 5e74d7e..7867968 100755 --- a/test-project/scenes/Projectile.tscn +++ b/test-project/scenes/Projectile.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://scripts/Projectile.gd" type="Script" id=1] [ext_resource path="res://scripts/ColoredEntity.gd" type="Script" id=2] -[ext_resource path="res://resources/img/missile-placeholder.png" type="Texture" id=3] +[ext_resource path="res://resources/img/missile-placeholder.png" type="Texture2D" id=3] [sub_resource type="RectangleShape2D" id=1] @@ -23,7 +23,7 @@ mass = 3.0 gravity_scale = 1.0 custom_integrator = false continuous_cd = 0 -contacts_reported = 0 +max_contacts_reported = 0 contact_monitor = false sleeping = false can_sleep = true @@ -36,18 +36,18 @@ script = ExtResource( 1 ) [node name="Mask" type="Node2D" parent="."] script = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="Mask"] +[node name="Sprite2D" type="Sprite2D" parent="Mask"] texture = ExtResource( 3 ) [node name="Collision" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) -[node name="VisibilityNotifier" type="VisibilityNotifier2D" parent="."] +[node name="VisibleOnScreenNotifier3D" type="VisibleOnScreenNotifier2D" parent="."] rect = Rect2( -12, -12, 22, 24 ) [node name="ExplosionArea" type="Area2D" parent="."] input_pickable = true -gravity_vec = Vector2( 0, 1 ) +gravity_direction = Vector2( 0, 1 ) gravity = 98.0 linear_damp = 0.1 angular_damp = 1.0 @@ -60,6 +60,6 @@ audio_bus_name = "Master" shape = SubResource( 2 ) [connection signal="body_entered" from="." to="." method="_on_Projectile_body_entered"] -[connection signal="screen_exited" from="VisibilityNotifier" to="." method="_on_VisibilityNotifier2D_screen_exited"] +[connection signal="screen_exited" from="VisibleOnScreenNotifier3D" to="." method="_on_VisibilityNotifier2D_screen_exited"] [connection signal="body_entered" from="ExplosionArea" to="." method="_on_ExplosionArea_body_entered"] [connection signal="body_exited" from="ExplosionArea" to="." method="_on_ExplosionArea_body_exited"] diff --git a/test-project/scripts/Cannon.gd b/test-project/scripts/Cannon.gd old mode 100755 new mode 100644 index 1ddf29d..5a31fc9 --- a/test-project/scripts/Cannon.gd +++ b/test-project/scripts/Cannon.gd @@ -1,6 +1,6 @@ extends "res://scripts/ColoredEntity.gd" -onready var Bullet: PackedScene = preload("res://scenes/Projectile.tscn") +@onready var Bullet: PackedScene = preload("res://scenes/Projectile.tscn") const RATE_OF_CHANGE: float = 0.9 const UPPER_LIMIT: int = -89 const LOWER_LIMIT: int = -5 @@ -11,8 +11,8 @@ func _ready(): self.highlight() func _process(delta): - $Sprite.set_rotation(deg2rad(self.angle)) - $Sprite.rect_size.y = 24 + $Sprite2D.set_rotation(deg_to_rad(self.angle)) + $Sprite2D.size.y = 24 func _input(event): if Input.is_action_pressed("ui_up"): @@ -30,10 +30,10 @@ func move_down() -> void: func shoot() -> void: if $FireCooldown.time_left == 0: - var NewBullet = Bullet.instance() - NewBullet.global_position = $Sprite/CannonTip.global_position + var NewBullet = Bullet.instantiate() + NewBullet.global_position = $Sprite2D/CannonTip.global_position NewBullet.rotation_degrees = self.angle - var at: Vector2 = $Sprite/CannonTip.global_position - $Sprite/CannonBase.global_position + var at: Vector2 = $Sprite2D/CannonTip.global_position - $Sprite2D/CannonBase.global_position NewBullet.shoot(at) var BulletSprite = NewBullet.get_node("Mask") @@ -42,7 +42,7 @@ func shoot() -> void: else: BulletSprite.lowlight() - NewBullet.setup(GLOBAL.BULLET, GLOBAL.BULLET_SPEED) + NewBullet.setup(GLOBAL.SpriteType.BULLET, GLOBAL.BULLET_SPEED) NewBullet.update_collision_layer() $Projectiles.add_child(NewBullet) $FireCooldown.start() diff --git a/test-project/scripts/EnemyGenerator.gd b/test-project/scripts/EnemyGenerator.gd old mode 100755 new mode 100644 index dfc236d..4f79d49 --- a/test-project/scripts/EnemyGenerator.gd +++ b/test-project/scripts/EnemyGenerator.gd @@ -1,6 +1,6 @@ extends Node2D -onready var EnemyScene: PackedScene = preload("res://scenes/Projectile.tscn") +@onready var EnemyScene: PackedScene = preload("res://scenes/Projectile.tscn") signal start signal stop @@ -11,16 +11,15 @@ func _ready(): self.emit_signal("stop") func setup_enemy() -> void: - self.Enemy = EnemyScene.instance() - Enemy.setup(GLOBAL.MISSILE, GLOBAL.MISSILE_SPEED["max"]) + self.Enemy = EnemyScene.instantiate() + Enemy.setup(GLOBAL.SpriteType.MISSILE, GLOBAL.MISSILE_SPEED["max"]) func spawn_and_shoot_enemy() -> void: - var Duplicate = Enemy.duplicate(Node.DUPLICATE_USE_INSTANCING) + var Duplicate = Enemy.duplicate(Node.DUPLICATE_USE_INSTANTIATION) Duplicate.set_random_color() Duplicate.update_collision_layer() $Enemies.add_child(Duplicate) - $SpawnArea/SpawnLocation.set_offset(randi()) Duplicate.global_position = $SpawnArea/SpawnLocation.position var direction: Vector2 = (Vector2(0, 1080) - Duplicate.global_position).normalized() diff --git a/test-project/scripts/Main.gd b/test-project/scripts/Main.gd index 52081dd..9ce66fc 100755 --- a/test-project/scripts/Main.gd +++ b/test-project/scripts/Main.gd @@ -5,7 +5,7 @@ signal start_zoom_out const ZOOM_DELTA: float = 0.2 const MOVE_DELTA: float = 0.353 -onready var camera: Camera2D = $Path2D/PathFollow2D/MenuCamera +@onready var camera: Camera2D = $Path2D/PathFollow2D/MenuCamera var camera_zooming: bool = false func _process(delta: float): @@ -19,7 +19,7 @@ func zoom_out_proccess(delta: float) -> void: else: self.camera_zooming = false - $Path2D/PathFollow2D.unit_offset += delta * MOVE_DELTA + $Path2D/PathFollow2D.progress_ratio += delta * MOVE_DELTA func _on_Main_start_zoom_out(): self.camera_zooming = true diff --git a/test-project/scripts/Projectile.gd b/test-project/scripts/Projectile.gd old mode 100755 new mode 100644 index 1ad7215..194d3b4 --- a/test-project/scripts/Projectile.gd +++ b/test-project/scripts/Projectile.gd @@ -1,7 +1,7 @@ extends RigidBody2D -var MissileSprite: Texture = load("res://resources/img/missile-placeholder.png") -var BulletSprite: Texture = load("res://resources/img/bullet-placeholder.png") +var MissileSprite: Texture2D = load("res://resources/img/missile-placeholder.png") +var BulletSprite: Texture2D = load("res://resources/img/bullet-placeholder.png") var bodies_in_area: Array = [] var sprite_type: int @@ -10,20 +10,19 @@ var armed: bool = false func _ready(): self.gravity_scale = 0.0 - self.friction = 0 self.contact_monitor = true - self.contacts_reported = 1 + self.max_contacts_reported = 1 func setup(sprite_type: int, speed: float) -> void: self.sprite_type = sprite_type self.speed = speed - if sprite_type == GLOBAL.BULLET: - $Mask/Sprite.set_texture(self.BulletSprite) + if sprite_type == GLOBAL.SpriteType.BULLET: + $Mask/Sprite2D.set_texture(self.BulletSprite) self.armed = true $ExplosionArea/ExplosionShape.disabled = false else: - $Mask/Sprite.set_texture(self.MissileSprite) + $Mask/Sprite2D.set_texture(self.MissileSprite) func shoot(at: Vector2) -> void: var direction = (at - self.global_position) @@ -31,22 +30,22 @@ func shoot(at: Vector2) -> void: func shoot_missile(at: Vector2) -> void: var direction = (at - self.global_position) - self.add_central_force(at * GLOBAL.MISSILE_SPEED["max"]) + self.apply_central_force(at * GLOBAL.MISSILE_SPEED["max"]) func set_random_color() -> void: $Mask.set_random_color() func update_collision_layer() -> void: if $Mask.highlighted: - self.set_collision_layer_bit(GLOBAL.HIGH_COLLISION, 1) - self.set_collision_mask_bit(GLOBAL.HIGH_COLLISION, 1) - $ExplosionArea.set_collision_layer_bit(GLOBAL.HIGH_COLLISION, 1) - $ExplosionArea.set_collision_mask_bit(GLOBAL.HIGH_COLLISION, 1) + self.set_collision_layer_value(GLOBAL.HIGH_COLLISION, 1) + self.set_collision_mask_value(GLOBAL.HIGH_COLLISION, 1) + $ExplosionArea.set_collision_layer_value(GLOBAL.HIGH_COLLISION, 1) + $ExplosionArea.set_collision_mask_value(GLOBAL.HIGH_COLLISION, 1) else: - self.set_collision_layer_bit(GLOBAL.LOW_COLLISION, 1) - self.set_collision_mask_bit(GLOBAL.LOW_COLLISION, 1) - $ExplosionArea.set_collision_layer_bit(GLOBAL.LOW_COLLISION, 1) - $ExplosionArea.set_collision_mask_bit(GLOBAL.LOW_COLLISION, 1) + self.set_collision_layer_value(GLOBAL.LOW_COLLISION, 1) + self.set_collision_mask_value(GLOBAL.LOW_COLLISION, 1) + $ExplosionArea.set_collision_layer_value(GLOBAL.LOW_COLLISION, 1) + $ExplosionArea.set_collision_mask_value(GLOBAL.LOW_COLLISION, 1) # --- Signals --- From eb728e19586563b00fcea47d71d21deaf8ec54dc Mon Sep 17 00:00:00 2001 From: Towfie Fanous Date: Tue, 2 Jan 2024 21:41:57 -0500 Subject: [PATCH 2/7] added gitignore to root folder --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd89a0a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +test-project/.godot/ + From 0f7201f40fb0f5eaa366a7eba2adc03576c9b76f Mon Sep 17 00:00:00 2001 From: Towfie Fanous Date: Tue, 2 Jan 2024 21:56:23 -0500 Subject: [PATCH 3/7] Added the web export section as a comment in case we would like to uncomment it in the future --- .github/workflows/godot-ci.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml index 468d7f3..7b7aee1 100644 --- a/.github/workflows/godot-ci.yml +++ b/.github/workflows/godot-ci.yml @@ -56,6 +56,38 @@ jobs: path: build/linux # removed the export-web until it is fixed in 4x + # export-web: + # name: Web Export + # runs-on: ubuntu-20.04 + # container: + # image: barichello/godot-ci:3.3.4 + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # with: + # lfs: true + # - name: Setup + # run: | + # mkdir -v -p ~/.local/share/godot/templates + # mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable + # - name: Web Build + # run: | + # mkdir -v -p build/web + # cd $PROJECT_PATH + # godot --headless --verbose --export-release "HTML5" ../build/web/index.html + # - name: Upload Artifact + # uses: actions/upload-artifact@v1 + # with: + # name: web + # path: build/web + # - name: Install rsync 📚 + # run: | + # apt-get update && apt-get install -y rsync + # - name: Deploy to GitHub Pages 🚀 + # uses: JamesIves/github-pages-deploy-action@releases/v4 + # with: + # branch: gh-pages # The branch the action should deploy to. + # folder: build/web # The folder the action should deploy. export-mac: name: Mac Export From 873a4fc6045d6c27070cc4b73603c6d7d0066bbd Mon Sep 17 00:00:00 2001 From: Towfie Fanous Date: Tue, 2 Jan 2024 22:30:53 -0500 Subject: [PATCH 4/7] corrected folder path to allow the job to find the export resource --- .github/workflows/godot-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml index 7b7aee1..a2a4fa2 100644 --- a/.github/workflows/godot-ci.yml +++ b/.github/workflows/godot-ci.yml @@ -44,7 +44,7 @@ jobs: - name: Setup run: | mkdir -v -p ~/.local/share/godot/export_templates - mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export-templates/${GODOT_VERSION}.stable + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - name: Linux Build run: | mkdir -v -p build/linux From d85bb8a6c1eba9a6acdd5cdb5102b5a3834eb3b7 Mon Sep 17 00:00:00 2001 From: Towfie Fanous Date: Tue, 2 Jan 2024 23:51:35 -0500 Subject: [PATCH 5/7] correct path to artifacts in the godot-ci worflow --- .github/workflows/godot-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml index a2a4fa2..2fc8c3b 100644 --- a/.github/workflows/godot-ci.yml +++ b/.github/workflows/godot-ci.yml @@ -24,7 +24,8 @@ jobs: - name: Windows Build run: | mkdir -v -p build/windows - godot --headless --verbose --export-release "Windows Desktop" build/windows/$EXPORT_NAME.exe + cd $PROJECT_PATH + godot --headless --verbose --export-release "Windows Desktop" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact uses: actions/upload-artifact@v4 with: @@ -48,7 +49,8 @@ jobs: - name: Linux Build run: | mkdir -v -p build/linux - godot --headless --verbose --export-release "Linux/X11" build/linux/$EXPORT_NAME.x86_64 + cd $PROJECT_PATH + godot --headless --verbose --export-release "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64 - name: Upload Artifact uses: actions/upload-artifact@v3 # for some reason v4 fails in the linux export job with: @@ -106,7 +108,8 @@ jobs: - name: Mac Build run: | mkdir -v -p build/mac - godot --headless --verbose --export-release "Mac OSX" build/mac/$EXPORT_NAME.zip + cd $PROJECT_PATH + godot --headless --verbose --export-release "Mac OSX" ../build/mac/$EXPORT_NAME.zip - name: Upload Artifact uses: actions/upload-artifact@v4 with: From 137e122b3a521ca9b6e5c82513b41acb40685189 Mon Sep 17 00:00:00 2001 From: Towfie Fanous Date: Wed, 3 Jan 2024 00:00:05 -0500 Subject: [PATCH 6/7] change mac export preset to proper convention --- .github/workflows/godot-ci.yml | 6 +++--- test-project/export_presets.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml index 2fc8c3b..7f42960 100644 --- a/.github/workflows/godot-ci.yml +++ b/.github/workflows/godot-ci.yml @@ -103,13 +103,13 @@ jobs: lfs: true - name: Setup run: | - mkdir -v -p ~/.local/share/godot/export-templates - mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export-templates/${GODOT_VERSION}.stable + mkdir -v -p ~/.local/share/godot/export_templates + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - name: Mac Build run: | mkdir -v -p build/mac cd $PROJECT_PATH - godot --headless --verbose --export-release "Mac OSX" ../build/mac/$EXPORT_NAME.zip + godot --headless --verbose --export-release "mac" ../build/mac/$EXPORT_NAME.zip - name: Upload Artifact uses: actions/upload-artifact@v4 with: diff --git a/test-project/export_presets.cfg b/test-project/export_presets.cfg index 1b4a352..7195077 100644 --- a/test-project/export_presets.cfg +++ b/test-project/export_presets.cfg @@ -113,7 +113,7 @@ binary_format/64_bits=true [preset.2] -name="macOS" +name="mac" platform="macOS" runnable=true dedicated_server=false From 99743b36bd563654c3dfd94baf8a3fc05a6d52cf Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 10 Feb 2024 19:48:31 +0100 Subject: [PATCH 7/7] Rebase on master --- .github/workflows/godot-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml index 7f42960..fabd3f0 100644 --- a/.github/workflows/godot-ci.yml +++ b/.github/workflows/godot-ci.yml @@ -20,7 +20,7 @@ jobs: - name: Setup run: | mkdir -v -p ~/.local/share/godot/export_templates - mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - name: Windows Build run: | mkdir -v -p build/windows @@ -45,7 +45,7 @@ jobs: - name: Setup run: | mkdir -v -p ~/.local/share/godot/export_templates - mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - name: Linux Build run: | mkdir -v -p build/linux @@ -70,8 +70,8 @@ jobs: # lfs: true # - name: Setup # run: | - # mkdir -v -p ~/.local/share/godot/templates - # mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable + # mkdir -v -p ~/.local/share/godot/export_templates + # mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable # - name: Web Build # run: | # mkdir -v -p build/web @@ -104,7 +104,7 @@ jobs: - name: Setup run: | mkdir -v -p ~/.local/share/godot/export_templates - mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable + mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable - name: Mac Build run: | mkdir -v -p build/mac