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 00000000..5de7062b Binary files /dev/null and b/addons/escoria-ui-simplemouse/cursors/cursor_dialog.png differ 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