diff options
author | Scarabeaver <kopakoraello@googlemail.com> | 2022-07-17 17:29:23 +0200 |
---|---|---|
committer | Scarabeaver <kopakoraello@googlemail.com> | 2022-07-17 17:29:23 +0200 |
commit | 8f12028fdb872682e55e191bd8dec6e355b355d1 (patch) | |
tree | 5425a9a000017f826872c8aceb40fd3a5ecd454c | |
parent | 0f7183100f80a335d508437da22bef79d4cf457d (diff) | |
parent | 96548ad6cc383b5e4cf58f7edf01f7a4e43fe798 (diff) | |
download | 2022-8f12028fdb872682e55e191bd8dec6e355b355d1.tar.gz 2022-8f12028fdb872682e55e191bd8dec6e355b355d1.tar.bz2 2022-8f12028fdb872682e55e191bd8dec6e355b355d1.zip |
Merge branch 'main' of https://codeberg.org/code-your-friends/gmtk2022
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | bin/x86_64-unknown-linux-gnu/libcode_with_your_friends2022.so | bin | 0 -> 30387968 bytes | |||
-rw-r--r-- | godot/assets/Images/Logo.png | 3 | ||||
-rw-r--r-- | godot/assets/Images/Logo.png.import | 3 | ||||
-rw-r--r-- | godot/assets/fonts/format.tres | 2 | ||||
-rw-r--r-- | godot/assets/fonts/theme_bigtext.tres | 50 | ||||
-rw-r--r-- | godot/export_presets.cfg | 608 | ||||
-rw-r--r-- | godot/scenes/Die.gd | 2 | ||||
-rw-r--r-- | godot/scenes/Menu.tscn | 65 | ||||
-rw-r--r-- | godot/scenes/objects/Scoreboard.tscn | 50 |
10 files changed, 466 insertions, 318 deletions
@@ -35,3 +35,4 @@ rust/debug/ target/ tramp make.bat +bin/
\ No newline at end of file diff --git a/bin/x86_64-unknown-linux-gnu/libcode_with_your_friends2022.so b/bin/x86_64-unknown-linux-gnu/libcode_with_your_friends2022.so Binary files differnew file mode 100644 index 0000000..962bdb5 --- /dev/null +++ b/bin/x86_64-unknown-linux-gnu/libcode_with_your_friends2022.so diff --git a/godot/assets/Images/Logo.png b/godot/assets/Images/Logo.png new file mode 100644 index 0000000..41cfad8 --- /dev/null +++ b/godot/assets/Images/Logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f38326a545048004f34c9a60483031d9d4b18a09dd039b78c2b893e014b44a7f +size 62018 diff --git a/godot/assets/Images/Logo.png.import b/godot/assets/Images/Logo.png.import new file mode 100644 index 0000000..0fd7065 --- /dev/null +++ b/godot/assets/Images/Logo.png.import @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b99417ad2f4c367cdfe743ef6eb25ef42f3e79f0cab0e60868d196f19de3f7e +size 688 diff --git a/godot/assets/fonts/format.tres b/godot/assets/fonts/format.tres index 7fca71e..5897187 100644 --- a/godot/assets/fonts/format.tres +++ b/godot/assets/fonts/format.tres @@ -3,5 +3,5 @@ [ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1] [resource] -size = 89 +size = 55 font_data = ExtResource( 1 ) diff --git a/godot/assets/fonts/theme_bigtext.tres b/godot/assets/fonts/theme_bigtext.tres new file mode 100644 index 0000000..c2206b6 --- /dev/null +++ b/godot/assets/fonts/theme_bigtext.tres @@ -0,0 +1,50 @@ +[gd_resource type="Theme" load_steps=10 format=2] + +[ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=1] + +[sub_resource type="DynamicFont" id=1] +size = 55 +extra_spacing_bottom = -15 +font_data = ExtResource( 1 ) + +[sub_resource type="StyleBoxFlat" id=2] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.4, 0.337255, 0.313726, 0.32549 ) + +[sub_resource type="StyleBoxFlat" id=3] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.176471, 0.14902, 0.141176, 1 ) + +[sub_resource type="StyleBoxFlat" id=4] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.4, 0.337255, 0.313726, 1 ) + +[sub_resource type="StyleBoxFlat" id=5] +content_margin_top = 20.0 +content_margin_bottom = 20.0 +bg_color = Color( 0.290196, 0.247059, 0.231373, 1 ) + +[sub_resource type="StyleBoxFlat" id=6] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.176471, 0.14902, 0.141176, 1 ) + +[sub_resource type="DynamicFont" id=8] +size = 86 +font_data = ExtResource( 1 ) + +[sub_resource type="StyleBoxFlat" id=7] +bg_color = Color( 0.160784, 0.133333, 0.133333, 1 ) + +[resource] +Button/fonts/font = SubResource( 1 ) +Button/styles/disabled = SubResource( 2 ) +Button/styles/focus = SubResource( 3 ) +Button/styles/hover = SubResource( 4 ) +Button/styles/normal = SubResource( 5 ) +Button/styles/pressed = SubResource( 6 ) +Label/fonts/font = SubResource( 8 ) +Panel/styles/panel = SubResource( 7 ) diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg index 127b781..c491e1b 100644 --- a/godot/export_presets.cfg +++ b/godot/export_presets.cfg @@ -8,47 +8,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/aarch64-linux-android/code-with-your-friends2022.debug.aarch64-linux-android.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.0.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=false +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=false +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=false -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 @@ -206,47 +214,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/aarch64-linux-android/code-with-your-friends2022.release.aarch64-linux-android.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.1.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=false +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=false +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=false -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 @@ -404,47 +420,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/armv7-linux-androideabi/code-with-your-friends2022.debug.armv7-linux-androideabi.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.2.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=true +architectures/arm64-v8a=false +architectures/x86=false +architectures/x86_64=false +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=true -architectures/arm64-v8a=false -architectures/x86=false -architectures/x86_64=false permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -602,47 +626,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/armv7-linux-androideabi/code-with-your-friends2022.release.armv7-linux-androideabi.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.3.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=true +architectures/arm64-v8a=false +architectures/x86=false +architectures/x86_64=false +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=true -architectures/arm64-v8a=false -architectures/x86=false -architectures/x86_64=false permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -800,47 +832,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-linux-android/code-with-your-friends2022.debug.i686-linux-android.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.4.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=false +architectures/arm64-v8a=false +architectures/x86=true +architectures/x86_64=false +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=false -architectures/arm64-v8a=false -architectures/x86=true -architectures/x86_64=false permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -998,47 +1038,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-linux-android/code-with-your-friends2022.release.i686-linux-android.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.5.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=false +architectures/arm64-v8a=false +architectures/x86=true +architectures/x86_64=false +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=false -architectures/arm64-v8a=false -architectures/x86=true -architectures/x86_64=false permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -1196,47 +1244,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-linux-android/code-with-your-friends2022.debug.x86_64-linux-android.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.6.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=false +architectures/arm64-v8a=false +architectures/x86=false +architectures/x86_64=true +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=false -architectures/arm64-v8a=false -architectures/x86=false -architectures/x86_64=true permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -1394,47 +1450,55 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-linux-android/code-with-your-friends2022.release.x86_64-linux-android.apk" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.7.options] -graphics/32_bits_framebuffer=true +custom_template/debug="" +custom_template/release="" +custom_template/use_custom_build=false +custom_template/export_format=0 +architectures/armeabi-v7a=false +architectures/arm64-v8a=false +architectures/x86=false +architectures/x86_64=true +keystore/debug="../code-with-your-friends2022.debug.keystore" +keystore/debug_user="androiddebugkey" +keystore/debug_password="android" +keystore/release="../code-with-your-friends2022.release.keystore" +keystore/release_user="code-with-your-friends2022" +keystore/release_password="" one_click_deploy/clear_previous_install=true -custom_package/debug="" -custom_package/release="" -command_line/extra_args="" version/code=1 version/name="1.0" +version/min_sdk=19 +version/target_sdk=30 package/unique_name="org.godotengine.code_with_your_friends2022" package/name="code-with-your-friends2022" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/32_bits_framebuffer=true +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 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/xxxhdpi_192x192="" -launcher_icons/xxhdpi_144x144="" -launcher_icons/xhdpi_96x96="" -launcher_icons/hdpi_72x72="" -launcher_icons/mdpi_48x48="" -keystore/debug="../code-with-your-friends2022.debug.keystore" -keystore/debug_user="androiddebugkey" -keystore/debug_password="android" -keystore/release="../code-with-your-friends2022.release.keystore" -keystore/release_user="code-with-your-friends2022" -keystore/release_password="" +user_data_backup/allow=false +command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" apk_expansion/public_key="" -architectures/armeabi-v7a=false -architectures/arm64-v8a=false -architectures/x86=false -architectures/x86_64=true permissions/custom_permissions=PoolStringArray( ) permissions/access_checkin_properties=false permissions/access_coarse_location=false @@ -1592,20 +1656,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-unknown-linux-gnu/code-with-your-friends2022.debug.i686-unknown-linux-gnu" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.8.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -custom_template/release="" -custom_template/debug="" [preset.9] @@ -1617,20 +1681,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-unknown-linux-gnu/code-with-your-friends2022.release.i686-unknown-linux-gnu" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.9.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -custom_template/release="" -custom_template/debug="" [preset.10] @@ -1642,20 +1706,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-unknown-linux-gnu/code-with-your-friends2022.debug.x86_64-unknown-linux-gnu" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.10.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" [preset.11] @@ -1666,21 +1730,21 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" -export_path="../bin/x86_64-unknown-linux-gnu/code-with-your-friends2022.release.x86_64-unknown-linux-gnu" -patch_list=PoolStringArray( ) +export_path="../bin/x86_64-unknown-linux-gnu/code-with-your-friends2022.release.x86_64-unknown-linux-gnu.x86_64" script_export_mode=1 script_encryption_key="" [preset.11.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" [preset.12] @@ -1692,7 +1756,6 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-apple-darwin/code-with-your-friends2022.debug.x86_64-apple-darwin.dmg" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" @@ -1705,6 +1768,7 @@ application/info="Made with Godot Engine" application/icon="" application/identifier="org.godotengine.code_with_your_friends2022" application/signature="" +application/app_category="Games" application/short_version="1.0" application/version="1.0" application/copyright="" @@ -1725,7 +1789,6 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-apple-darwin/code-with-your-friends2022.release.x86_64-apple-darwin.dmg" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" @@ -1738,6 +1801,7 @@ application/info="Made with Godot Engine" application/icon="" application/identifier="org.godotengine.code_with_your_friends2022" application/signature="" +application/app_category="Games" application/short_version="1.0" application/version="1.0" application/copyright="" @@ -1758,7 +1822,6 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/aarch64-apple-ios/code-with-your-friends2022.debug.aarch64-apple-ios" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" @@ -1766,6 +1829,8 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" +architectures/armv7=false +architectures/arm64=true application/app_store_team_id="change-me" application/provisioning_profile_uuid_debug="" application/code_sign_identity_debug="iPhone Developer" @@ -1773,6 +1838,7 @@ application/export_method_debug=1 application/provisioning_profile_uuid_release="" application/code_sign_identity_release="" application/export_method_release=0 +application/targeted_device_family=2 application/name="code-with-your-friends2022" application/info="Made with Godot Engine" application/identifier="org.godotengine.code-with-your-friends2022" @@ -1780,21 +1846,14 @@ application/signature="" application/short_version="1.0" application/version="1.0" application/copyright="" -capabilities/arkit=false -capabilities/camera=false capabilities/access_wifi=false -capabilities/game_center=true -capabilities/in_app_purchases=false capabilities/push_notifications=false user_data/accessible_from_files_app=false user_data/accessible_from_itunes_sharing=false privacy/camera_usage_description="" privacy/microphone_usage_description="" privacy/photolibrary_usage_description="" -orientation/portrait=true -orientation/landscape_left=true -orientation/landscape_right=true -orientation/portrait_upside_down=true +icons/generate_missing=false required_icons/iphone_120x120="res://assets/godot-ferris-120x120.png" required_icons/ipad_76x76="res://assets/godot-ferris-76x76.png" required_icons/app_store_1024x1024="res://assets/godot-ferris-1024x1024.png" @@ -1803,6 +1862,13 @@ optional_icons/ipad_152x152="" optional_icons/ipad_167x167="" optional_icons/spotlight_40x40="" optional_icons/spotlight_80x80="" +storyboard/use_launch_screen_storyboard=false +storyboard/image_scale_mode=0 +storyboard/custom_image@2x="" +storyboard/custom_image@3x="" +storyboard/use_custom_bg_color=false +storyboard/custom_bg_color=Color( 0, 0, 0, 1 ) +launch_screens/generate_missing=false landscape_launch_screens/iphone_2436x1125="" landscape_launch_screens/iphone_2208x1242="" landscape_launch_screens/ipad_1024x768="" @@ -1814,8 +1880,6 @@ portrait_launch_screens/iphone_1125x2436="" portrait_launch_screens/ipad_768x1024="" portrait_launch_screens/ipad_1536x2048="" portrait_launch_screens/iphone_1242x2208="" -architectures/armv7=false -architectures/arm64=true [preset.15] @@ -1827,7 +1891,6 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/aarch64-apple-ios/code-with-your-friends2022.release.aarch64-apple-ios" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" @@ -1835,6 +1898,8 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" +architectures/armv7=false +architectures/arm64=true application/app_store_team_id="change-me" application/provisioning_profile_uuid_debug="" application/code_sign_identity_debug="iPhone Developer" @@ -1842,6 +1907,7 @@ application/export_method_debug=1 application/provisioning_profile_uuid_release="" application/code_sign_identity_release="" application/export_method_release=0 +application/targeted_device_family=2 application/name="code-with-your-friends2022" application/info="Made with Godot Engine" application/identifier="org.godotengine.code-with-your-friends2022" @@ -1849,21 +1915,14 @@ application/signature="" application/short_version="1.0" application/version="1.0" application/copyright="" -capabilities/arkit=false -capabilities/camera=false capabilities/access_wifi=false -capabilities/game_center=true -capabilities/in_app_purchases=false capabilities/push_notifications=false user_data/accessible_from_files_app=false user_data/accessible_from_itunes_sharing=false privacy/camera_usage_description="" privacy/microphone_usage_description="" privacy/photolibrary_usage_description="" -orientation/portrait=true -orientation/landscape_left=true -orientation/landscape_right=true -orientation/portrait_upside_down=true +icons/generate_missing=false required_icons/iphone_120x120="res://assets/godot-ferris-120x120.png" required_icons/ipad_76x76="res://assets/godot-ferris-76x76.png" required_icons/app_store_1024x1024="res://assets/godot-ferris-1024x1024.png" @@ -1872,6 +1931,13 @@ optional_icons/ipad_152x152="" optional_icons/ipad_167x167="" optional_icons/spotlight_40x40="" optional_icons/spotlight_80x80="" +storyboard/use_launch_screen_storyboard=false +storyboard/image_scale_mode=0 +storyboard/custom_image@2x="" +storyboard/custom_image@3x="" +storyboard/use_custom_bg_color=false +storyboard/custom_bg_color=Color( 0, 0, 0, 1 ) +launch_screens/generate_missing=false landscape_launch_screens/iphone_2436x1125="" landscape_launch_screens/iphone_2208x1242="" landscape_launch_screens/ipad_1024x768="" @@ -1883,8 +1949,6 @@ portrait_launch_screens/iphone_1125x2436="" portrait_launch_screens/ipad_768x1024="" portrait_launch_screens/ipad_1536x2048="" portrait_launch_screens/iphone_1242x2208="" -architectures/armv7=false -architectures/arm64=true [preset.16] @@ -1896,21 +1960,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-pc-windows-gnu/code-with-your-friends2022.debug.i686-pc-windows-gnu.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.16.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -1938,21 +2001,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-pc-windows-gnu/code-with-your-friends2022.release.i686-pc-windows-gnu.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.17.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -1980,21 +2042,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-pc-windows-gnu/code-with-your-friends2022.debug.x86_64-pc-windows-gnu.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.18.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -2022,21 +2083,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-pc-windows-gnu/code-with-your-friends2022.release.x86_64-pc-windows-gnu.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.19.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -2064,21 +2124,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-pc-windows-msvc/code-with-your-friends2022.debug.i686-pc-windows-msvc.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.20.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -2106,21 +2165,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/i686-pc-windows-msvc/code-with-your-friends2022.release.i686-pc-windows-msvc.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.21.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -2148,21 +2206,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-pc-windows-msvc/code-with-your-friends2022.debug.x86_64-pc-windows-msvc.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.22.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -2190,21 +2247,20 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/x86_64-pc-windows-msvc/code-with-your-friends2022.release.x86_64-pc-windows-msvc.exe" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.23.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -2232,18 +2288,30 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/wasm32-unknown-emscripten/code-with-your-friends2022.debug.wasm32-unknown-emscripten.html" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.24.options] +custom_template/debug="" +custom_template/release="" +variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false +html/export_icon=true html/custom_html_shell="" html/head_include="" -custom_template/release="" -custom_template/debug="" +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color( 0, 0, 0, 1 ) [preset.25] @@ -2255,17 +2323,27 @@ export_filter="all_resources" include_filter="" exclude_filter="*.gdignore" export_path="../bin/wasm32-unknown-emscripten/code-with-your-friends2022.release.wasm32-unknown-emscripten.html" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.25.options] +custom_template/debug="" +custom_template/release="" +variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false +html/export_icon=true html/custom_html_shell="" html/head_include="" -custom_template/release="" -custom_template/debug="" - - +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color( 0, 0, 0, 1 ) diff --git a/godot/scenes/Die.gd b/godot/scenes/Die.gd index dcf165c..f09a8b0 100644 --- a/godot/scenes/Die.gd +++ b/godot/scenes/Die.gd @@ -133,7 +133,7 @@ func _physics_process(delta): dice_is_moving = true $PowerUI3D/SpriteCircles.hide() - if after_stroke && dice_still_timing == true && (OS.get_ticks_msec() - dice_is_still_since) > 200: + if after_stroke && dice_still_timing == true && (OS.get_ticks_msec() - dice_is_still_since) > 500: print("stop timing while not morbin") dice_is_moving = false after_stroke = false diff --git a/godot/scenes/Menu.tscn b/godot/scenes/Menu.tscn index e77a18d..32fd74a 100644 --- a/godot/scenes/Menu.tscn +++ b/godot/scenes/Menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://assets/theme.tres" type="Theme" id=1] [ext_resource path="res://scenes/Menu.gd" type="Script" id=2] @@ -9,6 +9,7 @@ [ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=7] [ext_resource path="res://assets/fonts/theme_smalltext.tres" type="Theme" id=8] [ext_resource path="res://assets/fonts/theme_middletext.tres" type="Theme" id=9] +[ext_resource path="res://assets/fonts/theme_bigtext.tres" type="Theme" id=10] [sub_resource type="DynamicFont" id=1] size = 55 @@ -40,6 +41,23 @@ content_margin_top = 10.0 content_margin_bottom = 10.0 bg_color = Color( 0.176471, 0.14902, 0.141176, 1 ) +[sub_resource type="DynamicFont" id=11] +size = 137 +font_data = ExtResource( 7 ) + +[sub_resource type="StyleBoxFlat" id=7] +bg_color = Color( 0.160784, 0.133333, 0.133333, 1 ) + +[sub_resource type="Theme" id=12] +Button/fonts/font = SubResource( 1 ) +Button/styles/disabled = SubResource( 2 ) +Button/styles/focus = SubResource( 3 ) +Button/styles/hover = SubResource( 4 ) +Button/styles/normal = SubResource( 5 ) +Button/styles/pressed = SubResource( 6 ) +Label/fonts/font = SubResource( 11 ) +Panel/styles/panel = SubResource( 7 ) + [sub_resource type="DynamicFontData" id=8] font_path = "res://assets/fonts/Roboto-Medium.ttf" @@ -47,9 +65,6 @@ font_path = "res://assets/fonts/Roboto-Medium.ttf" size = 23 font_data = SubResource( 8 ) -[sub_resource type="StyleBoxFlat" id=7] -bg_color = Color( 0.160784, 0.133333, 0.133333, 1 ) - [sub_resource type="Theme" id=10] Button/fonts/font = SubResource( 1 ) Button/styles/disabled = SubResource( 2 ) @@ -96,11 +111,11 @@ focus_neighbour_bottom = NodePath("../StartButton") text = "Quit" [node name="Label" type="Label" parent="."] -margin_left = 584.0 +margin_left = 2.0 margin_top = 28.0 -margin_right = 1304.0 -margin_bottom = 156.0 -theme = ExtResource( 1 ) +margin_right = 1917.0 +margin_bottom = 166.0 +theme = SubResource( 12 ) text = "Golf with your Dice" align = 1 valign = 1 @@ -168,24 +183,17 @@ https://freesound.org/s/586538/ In Game: \"Background Music\" by Migfus20 https://freesound.org/s/586838/" -[node name="Label2" type="Label" parent="."] -anchor_left = 0.05 -anchor_top = 0.2 -anchor_right = 0.3 -anchor_bottom = 0.2 -margin_bottom = 51.0 -theme = ExtResource( 9 ) -text = "HOW TO PLAY" -align = 1 - [node name="VBoxContainer2" type="VBoxContainer" parent="."] anchor_left = 0.05 anchor_top = 0.25 anchor_right = 0.3 anchor_bottom = 0.7 +margin_top = 89.0 +margin_right = 108.0 +margin_bottom = 78.0 [node name="Control" type="Control" parent="VBoxContainer2"] -margin_right = 480.0 +margin_right = 588.0 margin_bottom = 80.0 rect_min_size = Vector2( 480, 80 ) @@ -206,7 +214,7 @@ valign = 1 [node name="Control2" type="Control" parent="VBoxContainer2"] margin_top = 84.0 -margin_right = 480.0 +margin_right = 588.0 margin_bottom = 164.0 rect_min_size = Vector2( 480, 80 ) @@ -229,7 +237,7 @@ autowrap = true [node name="Control3" type="Control" parent="VBoxContainer2"] margin_top = 168.0 -margin_right = 480.0 +margin_right = 588.0 margin_bottom = 248.0 rect_min_size = Vector2( 480, 80 ) @@ -252,13 +260,13 @@ autowrap = true [node name="Control4" type="Control" parent="VBoxContainer2"] margin_top = 252.0 -margin_right = 480.0 +margin_right = 588.0 margin_bottom = 277.0 rect_min_size = Vector2( 480, 25 ) [node name="Control5" type="Control" parent="VBoxContainer2"] margin_top = 281.0 -margin_right = 480.0 +margin_right = 588.0 margin_bottom = 361.0 rect_min_size = Vector2( 480, 80 ) @@ -283,7 +291,7 @@ autowrap = true [node name="Control6" type="Control" parent="VBoxContainer2"] margin_top = 365.0 -margin_right = 480.0 +margin_right = 588.0 margin_bottom = 445.0 rect_min_size = Vector2( 480, 80 ) @@ -313,8 +321,11 @@ anchor_left = 0.05 anchor_top = 0.2 anchor_right = 0.3 anchor_bottom = 0.2 -margin_bottom = 51.0 -theme = ExtResource( 1 ) +margin_left = 109.0 +margin_top = 44.0 +margin_right = 268.0 +margin_bottom = 138.0 +theme = ExtResource( 10 ) text = "HOW TO PLAY" align = 1 @@ -323,6 +334,8 @@ anchor_left = 0.05 anchor_top = 0.25 anchor_right = 0.3 anchor_bottom = 0.7 +margin_top = 42.0 +margin_bottom = 54.0 [connection signal="pressed" from="VBoxContainer/StartButton" to="." method="_on_StartButton_pressed"] [connection signal="pressed" from="VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"] diff --git a/godot/scenes/objects/Scoreboard.tscn b/godot/scenes/objects/Scoreboard.tscn index 070065a..9016072 100644 --- a/godot/scenes/objects/Scoreboard.tscn +++ b/godot/scenes/objects/Scoreboard.tscn @@ -27,7 +27,7 @@ columns = 5 [node name="LabelHeader" type="Label" parent="Panel/GridContainer"] margin_right = 322.0 -margin_bottom = 51.0 +margin_bottom = 56.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -40,7 +40,7 @@ autowrap = true [node name="Label" type="Label" parent="Panel/GridContainer"] margin_left = 326.0 margin_right = 648.0 -margin_bottom = 51.0 +margin_bottom = 56.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -53,7 +53,7 @@ autowrap = true [node name="Label2" type="Label" parent="Panel/GridContainer"] margin_left = 652.0 margin_right = 974.0 -margin_bottom = 51.0 +margin_bottom = 56.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -66,7 +66,7 @@ autowrap = true [node name="Label3" type="Label" parent="Panel/GridContainer"] margin_left = 978.0 margin_right = 1300.0 -margin_bottom = 51.0 +margin_bottom = 56.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -79,7 +79,7 @@ autowrap = true [node name="Label4" type="Label" parent="Panel/GridContainer"] margin_left = 1304.0 margin_right = 1626.0 -margin_bottom = 51.0 +margin_bottom = 56.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -90,9 +90,9 @@ valign = 3 autowrap = true [node name="LabelHeader2" type="Label" parent="Panel/GridContainer"] -margin_top = 55.0 +margin_top = 60.0 margin_right = 322.0 -margin_bottom = 106.0 +margin_bottom = 116.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -104,9 +104,9 @@ autowrap = true [node name="Par0" type="Label" parent="Panel/GridContainer"] margin_left = 326.0 -margin_top = 55.0 +margin_top = 60.0 margin_right = 648.0 -margin_bottom = 106.0 +margin_bottom = 116.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -118,9 +118,9 @@ autowrap = true [node name="Par1" type="Label" parent="Panel/GridContainer"] margin_left = 652.0 -margin_top = 55.0 +margin_top = 60.0 margin_right = 974.0 -margin_bottom = 106.0 +margin_bottom = 116.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -132,9 +132,9 @@ autowrap = true [node name="Par2" type="Label" parent="Panel/GridContainer"] margin_left = 978.0 -margin_top = 55.0 +margin_top = 60.0 margin_right = 1300.0 -margin_bottom = 106.0 +margin_bottom = 116.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -146,9 +146,9 @@ autowrap = true [node name="ParSum" type="Label" parent="Panel/GridContainer"] margin_left = 1304.0 -margin_top = 55.0 +margin_top = 60.0 margin_right = 1626.0 -margin_bottom = 106.0 +margin_bottom = 116.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -159,9 +159,9 @@ valign = 3 autowrap = true [node name="LabelHeader3" type="Label" parent="Panel/GridContainer"] -margin_top = 110.0 +margin_top = 120.0 margin_right = 322.0 -margin_bottom = 161.0 +margin_bottom = 176.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -173,9 +173,9 @@ autowrap = true [node name="Player0" type="Label" parent="Panel/GridContainer"] margin_left = 326.0 -margin_top = 110.0 +margin_top = 120.0 margin_right = 648.0 -margin_bottom = 161.0 +margin_bottom = 176.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -187,9 +187,9 @@ autowrap = true [node name="Player1" type="Label" parent="Panel/GridContainer"] margin_left = 652.0 -margin_top = 110.0 +margin_top = 120.0 margin_right = 974.0 -margin_bottom = 161.0 +margin_bottom = 176.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -201,9 +201,9 @@ autowrap = true [node name="Player2" type="Label" parent="Panel/GridContainer"] margin_left = 978.0 -margin_top = 110.0 +margin_top = 120.0 margin_right = 1300.0 -margin_bottom = 161.0 +margin_bottom = 176.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 @@ -215,9 +215,9 @@ autowrap = true [node name="PlayerSum" type="Label" parent="Panel/GridContainer"] margin_left = 1304.0 -margin_top = 110.0 +margin_top = 120.0 margin_right = 1626.0 -margin_bottom = 161.0 +margin_bottom = 176.0 size_flags_horizontal = 3 size_flags_vertical = 1 size_flags_stretch_ratio = 20.0 |