From 527fe84d3cb9c90fd27ac03ce2857acef3e422b5 Mon Sep 17 00:00:00 2001 From: Julian Murgia Date: Thu, 23 Sep 2021 12:39:24 +0200 Subject: [PATCH] Changed dialog cursor (#398) - some modifications in android exports presets - commented out jump command in worker.esc as not implemented --- README.md | 6 + .../cursors/cursor_dialog.png | Bin 0 -> 6078 bytes .../cursors/originals/pointers4.svg | 1824 +++++++++++++++++ .../verbs_mouseicons.tscn | 5 +- export_presets.cfg | 37 +- game/rooms/room06/esc/worker.esc | 2 +- 6 files changed, 1838 insertions(+), 36 deletions(-) create mode 100644 addons/escoria-ui-simplemouse/cursors/cursor_dialog.png create mode 100644 addons/escoria-ui-simplemouse/cursors/originals/pointers4.svg diff --git a/README.md b/README.md index 28ec9494..f2746aa6 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,12 @@ Licence: CC-BY * “Mystical Ocean Puzzle Game” (Licence CC-BY 4.0) by Eric Matyas www.soundimage.org + +### Cursors +* Pointers part 4 by "yd" + Licence: CC0 Licence + https://opengameart.org/content/pointers-part-4x + edited by Julian Murgia ### Font diff --git a/addons/escoria-ui-simplemouse/cursors/cursor_dialog.png b/addons/escoria-ui-simplemouse/cursors/cursor_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..5de7062b1aedf38e12a965775e1abedd995600cd GIT binary patch literal 6078 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 literal 0 HcmV?d00001 diff --git a/addons/escoria-ui-simplemouse/cursors/originals/pointers4.svg b/addons/escoria-ui-simplemouse/cursors/originals/pointers4.svg new file mode 100644 index 00000000..62ad3205 --- /dev/null +++ b/addons/escoria-ui-simplemouse/cursors/originals/pointers4.svg @@ -0,0 +1,1824 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/escoria-ui-simplemouse/verbs_mouseicons.tscn b/addons/escoria-ui-simplemouse/verbs_mouseicons.tscn index 2b59d218..9934476f 100644 --- a/addons/escoria-ui-simplemouse/verbs_mouseicons.tscn +++ b/addons/escoria-ui-simplemouse/verbs_mouseicons.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://addons/escoria-ui-simplemouse/verbs_mouseicons.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-simplemouse/cursors/cursor_examine.png" type="Texture" id=2] [ext_resource path="res://addons/escoria-ui-simplemouse/cursors/cursor_tool.png" type="Texture" id=3] -[ext_resource path="res://addons/escoria-ui-simplemouse/cursors/cursor_pen.png" type="Texture" id=4] +[ext_resource path="res://addons/escoria-ui-simplemouse/cursors/cursor_dialog.png" type="Texture" id=4] [ext_resource path="res://addons/escoria-ui-simplemouse/cursors/cursor_foot.png" type="Texture" id=5] [ext_resource path="res://addons/escoria-ui-simplemouse/cursors/cursor_hand.png" type="Texture" id=6] @@ -76,6 +76,9 @@ margin_top = 524.76 margin_right = 546.519 margin_bottom = 524.76 mouse_filter = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="tool" type="TextureRect" parent="mouse_position"] margin_left = 46.4475 diff --git a/export_presets.cfg b/export_presets.cfg index 6ee9a851..d85372a0 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -48,7 +48,7 @@ custom_features="" export_filter="all_resources" include_filter="*.esc" exclude_filter="" -export_path="bin/win64/Escoria-reloaded-x64.exe" +export_path="bin/win64/Escoria-x64.exe" script_export_mode=1 script_encryption_key="" @@ -170,10 +170,6 @@ user_data/accessible_from_itunes_sharing=false privacy/camera_usage_description="" privacy/microphone_usage_description="" privacy/photolibrary_usage_description="" -orientation/portrait=false -orientation/landscape_left=true -orientation/landscape_right=true -orientation/portrait_upside_down=false required_icons/iphone_120x120="res://game/appicons/Assets.xcassets/AppIcon.appiconset/120.png" required_icons/ipad_76x76="res://game/appicons/Assets.xcassets/AppIcon.appiconset/76.png" required_icons/app_store_1024x1024="res://game/appicons/Assets.xcassets/AppIcon.appiconset/1024.png" @@ -228,33 +224,6 @@ application/copyright="" display/high_res=false privacy/camera_usage_description="" privacy/microphone_usage_description="" -codesign/enable=true -codesign/identity="" -codesign/timestamp=true -codesign/hardened_runtime=true -codesign/replace_existing_signature=true -codesign/entitlements/custom_file="" -codesign/entitlements/allow_jit_code_execution=false -codesign/entitlements/allow_unsigned_executable_memory=false -codesign/entitlements/allow_dyld_environment_variables=false -codesign/entitlements/disable_library_validation=false -codesign/entitlements/audio_input=false -codesign/entitlements/camera=false -codesign/entitlements/location=false -codesign/entitlements/address_book=false -codesign/entitlements/calendars=false -codesign/entitlements/photos_library=false -codesign/entitlements/apple_events=false -codesign/entitlements/app_sandbox/enabled=false -codesign/entitlements/app_sandbox/network_server=false -codesign/entitlements/app_sandbox/network_client=false -codesign/entitlements/app_sandbox/device_usb=false -codesign/entitlements/app_sandbox/device_bluetooth=false -codesign/entitlements/app_sandbox/files_downloads=0 -codesign/entitlements/app_sandbox/files_pictures=0 -codesign/entitlements/app_sandbox/files_music=0 -codesign/entitlements/app_sandbox/files_movies=0 -codesign/custom_options=PoolStringArray( ) texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false @@ -268,7 +237,7 @@ custom_features="" export_filter="all_resources" include_filter="*.esc" exclude_filter="" -export_path="../../../../Documents/godot_render/escoria/Escoria.apk" +export_path="bin/android/Escoria.apk" script_export_mode=1 script_encryption_key="" @@ -282,7 +251,7 @@ architectures/armeabi-v7a=true architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false -keystore/debug="" +keystore/debug="/opt/Programming/android-sdk/debug.keystore" keystore/debug_user="" keystore/debug_password="" keystore/release="" diff --git a/game/rooms/room06/esc/worker.esc b/game/rooms/room06/esc/worker.esc index 11cc0dc4..ddd0ccfb 100644 --- a/game/rooms/room06/esc/worker.esc +++ b/game/rooms/room06/esc/worker.esc @@ -35,7 +35,7 @@ say player "I don't think he'd like that." ! #################################################################################################### :use r5_filled_sheet -jump give r5_filled_sheet +#jump give r5_filled_sheet #################################################################################################### :give r5_filled_sheet