diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd index 16920c76..caa81590 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd @@ -1,7 +1,6 @@ # A simple dialog manager for Escoria tool extends EditorPlugin -class_name RTMISimpleDialogPlugin const MANAGER_CLASS="res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd" diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd index 698b9533..c8f57537 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd @@ -47,7 +47,7 @@ onready var is_paused: bool = true # Build up the UI func _ready(): _text_time_per_character = ProjectSettings.get_setting( - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS ) if _text_time_per_character < 0: @@ -55,15 +55,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS, - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS, + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE ] ) - _text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + _text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE _fast_text_time_per_character = ProjectSettings.get_setting( - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST ) if _fast_text_time_per_character < 0: @@ -71,15 +71,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST, - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST, + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE ] ) - _fast_text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + _fast_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE _reading_speed_in_wpm = ProjectSettings.get_setting( - RTMISimpleDialogPlugin.READING_SPEED_IN_WPM + RTMISimpleDialogSettings.READING_SPEED_IN_WPM ) if _reading_speed_in_wpm <= 0: @@ -87,12 +87,12 @@ func _ready(): self, "%s setting must be a positive number. Will use default value of %s." % [ - RTMISimpleDialogPlugin.READING_SPEED_IN_WPM, - RTMISimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE + RTMISimpleDialogSettings.READING_SPEED_IN_WPM, + RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE ] ) - _reading_speed_in_wpm = RTMISimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE + _reading_speed_in_wpm = RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE _word_regex.compile("\\S+") @@ -208,7 +208,7 @@ func _get_number_of_words() -> int: # Ending the dialog func _on_dialog_finished(): # Only trigger to clear the text if we aren't limiting the clearing trigger to a click. - if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogPlugin.CLEAR_TEXT_BY_CLICK_ONLY): + if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY): emit_signal("say_finished") queue_free() @@ -225,5 +225,3 @@ func _on_resumed(): if not tween.is_active(): is_paused = false tween.resume_all() - - diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd index 8c79eb7e..453b24e7 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd @@ -59,7 +59,7 @@ func _ready(): ] ) - _text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + _text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE _fast_text_time_per_character = ProjectSettings.get_setting( RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST @@ -75,7 +75,7 @@ func _ready(): ] ) - _fast_text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + _fast_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE _reading_speed_in_wpm = ProjectSettings.get_setting( RTMISimpleDialogSettings.READING_SPEED_IN_WPM diff --git a/export_presets.cfg b/export_presets.cfg index 1cd3396a..df8ca401 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -33,6 +33,7 @@ codesign/description="" codesign/custom_options=PoolStringArray( ) application/modify_resources=true application/icon="" +application/icon_interpolation=4 application/file_version="" application/product_version="" application/company_name="" @@ -76,6 +77,7 @@ codesign/description="" codesign/custom_options=PoolStringArray( ) application/modify_resources=true application/icon="" +application/icon_interpolation=4 application/file_version="" application/product_version="" application/company_name="" @@ -93,7 +95,7 @@ custom_features="" export_filter="all_resources" include_filter="*.esc, *.csv" exclude_filter="" -export_path="../Escoria-export-test.x86_64" +export_path="../gymkhana.x86_64" script_export_mode=1 script_encryption_key="" @@ -101,7 +103,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" -binary_format/64_bits=true +binary_format/architecture="x86_64" binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true @@ -178,6 +180,7 @@ application/signature="" application/short_version="1.0" application/version="1.0" application/copyright="" +application/icon_interpolation=4 capabilities/access_wifi=false capabilities/push_notifications=false user_data/accessible_from_files_app=false @@ -185,6 +188,153 @@ user_data/accessible_from_itunes_sharing=false privacy/camera_usage_description="" privacy/microphone_usage_description="" privacy/photolibrary_usage_description="" +privacy/file_timestamp_access_reasons=3 +privacy/system_boot_time_access_reasons=1 +privacy/disk_space_access_reasons=3 +privacy/active_keyboard_access_reasons=0 +privacy/user_defaults_access_reasons=0 +privacy/tracking_enabled=false +privacy/tracking_domains=PoolStringArray( ) +privacy/collected_data/name/collected=false +privacy/collected_data/name/linked_to_user=false +privacy/collected_data/name/used_for_tracking=false +privacy/collected_data/name/collection_purposes=0 +privacy/collected_data/email_address/collected=false +privacy/collected_data/email_address/linked_to_user=false +privacy/collected_data/email_address/used_for_tracking=false +privacy/collected_data/email_address/collection_purposes=0 +privacy/collected_data/phone_number/collected=false +privacy/collected_data/phone_number/linked_to_user=false +privacy/collected_data/phone_number/used_for_tracking=false +privacy/collected_data/phone_number/collection_purposes=0 +privacy/collected_data/physical_address/collected=false +privacy/collected_data/physical_address/linked_to_user=false +privacy/collected_data/physical_address/used_for_tracking=false +privacy/collected_data/physical_address/collection_purposes=0 +privacy/collected_data/other_contact_info/collected=false +privacy/collected_data/other_contact_info/linked_to_user=false +privacy/collected_data/other_contact_info/used_for_tracking=false +privacy/collected_data/other_contact_info/collection_purposes=0 +privacy/collected_data/health/collected=false +privacy/collected_data/health/linked_to_user=false +privacy/collected_data/health/used_for_tracking=false +privacy/collected_data/health/collection_purposes=0 +privacy/collected_data/fitness/collected=false +privacy/collected_data/fitness/linked_to_user=false +privacy/collected_data/fitness/used_for_tracking=false +privacy/collected_data/fitness/collection_purposes=0 +privacy/collected_data/payment_info/collected=false +privacy/collected_data/payment_info/linked_to_user=false +privacy/collected_data/payment_info/used_for_tracking=false +privacy/collected_data/payment_info/collection_purposes=0 +privacy/collected_data/credit_info/collected=false +privacy/collected_data/credit_info/linked_to_user=false +privacy/collected_data/credit_info/used_for_tracking=false +privacy/collected_data/credit_info/collection_purposes=0 +privacy/collected_data/other_financial_info/collected=false +privacy/collected_data/other_financial_info/linked_to_user=false +privacy/collected_data/other_financial_info/used_for_tracking=false +privacy/collected_data/other_financial_info/collection_purposes=0 +privacy/collected_data/precise_location/collected=false +privacy/collected_data/precise_location/linked_to_user=false +privacy/collected_data/precise_location/used_for_tracking=false +privacy/collected_data/precise_location/collection_purposes=0 +privacy/collected_data/coarse_location/collected=false +privacy/collected_data/coarse_location/linked_to_user=false +privacy/collected_data/coarse_location/used_for_tracking=false +privacy/collected_data/coarse_location/collection_purposes=0 +privacy/collected_data/sensitive_info/collected=false +privacy/collected_data/sensitive_info/linked_to_user=false +privacy/collected_data/sensitive_info/used_for_tracking=false +privacy/collected_data/sensitive_info/collection_purposes=0 +privacy/collected_data/contacts/collected=false +privacy/collected_data/contacts/linked_to_user=false +privacy/collected_data/contacts/used_for_tracking=false +privacy/collected_data/contacts/collection_purposes=0 +privacy/collected_data/emails_or_text_messages/collected=false +privacy/collected_data/emails_or_text_messages/linked_to_user=false +privacy/collected_data/emails_or_text_messages/used_for_tracking=false +privacy/collected_data/emails_or_text_messages/collection_purposes=0 +privacy/collected_data/photos_or_videos/collected=false +privacy/collected_data/photos_or_videos/linked_to_user=false +privacy/collected_data/photos_or_videos/used_for_tracking=false +privacy/collected_data/photos_or_videos/collection_purposes=0 +privacy/collected_data/audio_data/collected=false +privacy/collected_data/audio_data/linked_to_user=false +privacy/collected_data/audio_data/used_for_tracking=false +privacy/collected_data/audio_data/collection_purposes=0 +privacy/collected_data/gameplay_content/collected=false +privacy/collected_data/gameplay_content/linked_to_user=false +privacy/collected_data/gameplay_content/used_for_tracking=false +privacy/collected_data/gameplay_content/collection_purposes=0 +privacy/collected_data/customer_support/collected=false +privacy/collected_data/customer_support/linked_to_user=false +privacy/collected_data/customer_support/used_for_tracking=false +privacy/collected_data/customer_support/collection_purposes=0 +privacy/collected_data/other_user_content/collected=false +privacy/collected_data/other_user_content/linked_to_user=false +privacy/collected_data/other_user_content/used_for_tracking=false +privacy/collected_data/other_user_content/collection_purposes=0 +privacy/collected_data/browsing_history/collected=false +privacy/collected_data/browsing_history/linked_to_user=false +privacy/collected_data/browsing_history/used_for_tracking=false +privacy/collected_data/browsing_history/collection_purposes=0 +privacy/collected_data/search_hhistory/collected=false +privacy/collected_data/search_hhistory/linked_to_user=false +privacy/collected_data/search_hhistory/used_for_tracking=false +privacy/collected_data/search_hhistory/collection_purposes=0 +privacy/collected_data/user_id/collected=false +privacy/collected_data/user_id/linked_to_user=false +privacy/collected_data/user_id/used_for_tracking=false +privacy/collected_data/user_id/collection_purposes=0 +privacy/collected_data/device_id/collected=false +privacy/collected_data/device_id/linked_to_user=false +privacy/collected_data/device_id/used_for_tracking=false +privacy/collected_data/device_id/collection_purposes=0 +privacy/collected_data/purchase_history/collected=false +privacy/collected_data/purchase_history/linked_to_user=false +privacy/collected_data/purchase_history/used_for_tracking=false +privacy/collected_data/purchase_history/collection_purposes=0 +privacy/collected_data/product_interaction/collected=false +privacy/collected_data/product_interaction/linked_to_user=false +privacy/collected_data/product_interaction/used_for_tracking=false +privacy/collected_data/product_interaction/collection_purposes=0 +privacy/collected_data/advertising_data/collected=false +privacy/collected_data/advertising_data/linked_to_user=false +privacy/collected_data/advertising_data/used_for_tracking=false +privacy/collected_data/advertising_data/collection_purposes=0 +privacy/collected_data/other_usage_data/collected=false +privacy/collected_data/other_usage_data/linked_to_user=false +privacy/collected_data/other_usage_data/used_for_tracking=false +privacy/collected_data/other_usage_data/collection_purposes=0 +privacy/collected_data/crash_data/collected=false +privacy/collected_data/crash_data/linked_to_user=false +privacy/collected_data/crash_data/used_for_tracking=false +privacy/collected_data/crash_data/collection_purposes=0 +privacy/collected_data/performance_data/collected=false +privacy/collected_data/performance_data/linked_to_user=false +privacy/collected_data/performance_data/used_for_tracking=false +privacy/collected_data/performance_data/collection_purposes=0 +privacy/collected_data/other_diagnostic_data/collected=false +privacy/collected_data/other_diagnostic_data/linked_to_user=false +privacy/collected_data/other_diagnostic_data/used_for_tracking=false +privacy/collected_data/other_diagnostic_data/collection_purposes=0 +privacy/collected_data/environment_scanning/collected=false +privacy/collected_data/environment_scanning/linked_to_user=false +privacy/collected_data/environment_scanning/used_for_tracking=false +privacy/collected_data/environment_scanning/collection_purposes=0 +privacy/collected_data/hands/collected=false +privacy/collected_data/hands/linked_to_user=false +privacy/collected_data/hands/used_for_tracking=false +privacy/collected_data/hands/collection_purposes=0 +privacy/collected_data/head/collected=false +privacy/collected_data/head/linked_to_user=false +privacy/collected_data/head/used_for_tracking=false +privacy/collected_data/head/collection_purposes=0 +privacy/collected_data/other_data_types/collected=false +privacy/collected_data/other_data_types/linked_to_user=false +privacy/collected_data/other_data_types/used_for_tracking=false +privacy/collected_data/other_data_types/collection_purposes=0 icons/iphone_120x120="" icons/iphone_180x180="" icons/ipad_76x76="" @@ -193,23 +343,11 @@ icons/ipad_167x167="" icons/app_store_1024x1024="" icons/spotlight_40x40="" 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 ) -landscape_launch_screens/iphone_2436x1125="" -landscape_launch_screens/iphone_2208x1242="" -landscape_launch_screens/ipad_1024x768="" -landscape_launch_screens/ipad_2048x1536="" -portrait_launch_screens/iphone_640x960="" -portrait_launch_screens/iphone_640x1136="" -portrait_launch_screens/iphone_750x1334="" -portrait_launch_screens/iphone_1125x2436="" -portrait_launch_screens/ipad_768x1024="" -portrait_launch_screens/ipad_1536x2048="" -portrait_launch_screens/iphone_1242x2208="" [preset.5] @@ -226,34 +364,33 @@ script_encryption_key="" [preset.5.options] +export/distribution_type=1 custom_template/debug="" custom_template/release="" application/name="Escoria Demo Game" -application/info="Made with Godot Engine" application/icon="res://game/appicons/appstore.png" +application/icon_interpolation=4 application/identifier="" application/signature="" application/app_category="Games" application/short_version="1.0" application/version="1.0" application/copyright="" +application/min_macos_version="10.12" display/high_res=false -privacy/microphone_usage_description="" -privacy/camera_usage_description="" -privacy/location_usage_description="" -privacy/address_book_usage_description="" -privacy/calendar_usage_description="" -privacy/photos_library_usage_description="" -privacy/desktop_folder_usage_description="" -privacy/documents_folder_usage_description="" -privacy/downloads_folder_usage_description="" -privacy/network_volumes_usage_description="" -privacy/removable_volumes_usage_description="" -codesign/enable=true +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/timestamp=true -codesign/hardened_runtime=true -codesign/replace_existing_signature=true +codesign/certificate_file="" +codesign/certificate_password="" +codesign/provisioning_profile="" codesign/entitlements/custom_file="" codesign/entitlements/allow_jit_code_execution=false codesign/entitlements/allow_unsigned_executable_memory=false @@ -276,11 +413,25 @@ 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/custom_options=PoolStringArray( ) -notarization/enable=false +notarization/notarization=0 notarization/apple_id_name="" notarization/apple_id_password="" -notarization/apple_team_id="" +notarization/api_uuid="" +notarization/api_key="" +notarization/api_key_id="" +privacy/microphone_usage_description="" +privacy/camera_usage_description="" +privacy/location_usage_description="" +privacy/address_book_usage_description="" +privacy/calendar_usage_description="" +privacy/photos_library_usage_description="" +privacy/desktop_folder_usage_description="" +privacy/documents_folder_usage_description="" +privacy/downloads_folder_usage_description="" +privacy/network_volumes_usage_description="" +privacy/removable_volumes_usage_description="" texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false @@ -425,6 +576,7 @@ permissions/mount_format_filesystems=false permissions/mount_unmount_filesystems=false permissions/nfc=false permissions/persistent_activity=false +permissions/post_notifications=false permissions/process_outgoing_calls=false permissions/read_calendar=false permissions/read_call_log=false diff --git a/project.godot b/project.godot index 182dc149..ea1e9f45 100644 --- a/project.godot +++ b/project.godot @@ -579,11 +579,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/commands/queue_resource.gd" }, { -"base": "EditorPlugin", -"class": "RTMISimpleDialogPlugin", -"language": "GDScript", -"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd" -}, { "base": "Resource", "class": "RTMISimpleDialogSettings", "language": "GDScript", @@ -904,7 +899,6 @@ _global_script_class_icons={ "PrintCommand": "", "QueueEventCommand": "", "QueueResourceCommand": "", -"RTMISimpleDialogPlugin": "", "RTMISimpleDialogSettings": "", "RTMIUiSettings": "", "RandGlobalCommand": "",