diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 720eb841e..f9c8d15c8 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1499,7 +1499,29 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Appodeal.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/StartApp.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TapjoyResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdBrowserController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MRAID.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1912,6 +1934,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1983,6 +2006,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png index 19a6fcc0a..8925f2114 100644 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png index 0e95b709b..0493949a3 100644 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png index bb0a9eb50..6018e31fc 100644 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png index f11f22b4d..698d36bfb 100644 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png index a493bdf55..735e05d29 100644 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg new file mode 100644 index 000000000..99e36f5a1 Binary files /dev/null and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json index db8908038..6cc1e14c2 100644 --- a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -91,9 +91,9 @@ "scale" : "2x" }, { - "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "MultiCraft_newicon_IOS_1024.jpg", + "size" : "1024x1024", + "filename" : "AppStore.jpg", "scale" : "1x" } ], @@ -101,4 +101,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/MultiCraft_newicon_IOS_1024.jpg b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/MultiCraft_newicon_IOS_1024.jpg deleted file mode 100644 index e16091ac7..000000000 Binary files a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/MultiCraft_newicon_IOS_1024.jpg and /dev/null differ diff --git a/build/iOS/MultiCraft/MultiCraft/Info.plist b/build/iOS/MultiCraft/MultiCraft/Info.plist index b6d3e24d7..f320b08af 100644 --- a/build/iOS/MultiCraft/MultiCraft/Info.plist +++ b/build/iOS/MultiCraft/MultiCraft/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.0.13 CFBundleVersion - 23 + 24 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/build/iOS/deps/freetype.sh b/build/iOS/deps/freetype.sh index 835793cde..98bfcc88a 100755 --- a/build/iOS/deps/freetype.sh +++ b/build/iOS/deps/freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -FREETYPE_VERSION=2.8.1 +FREETYPE_VERSION=2.9 if [ ! -d freetype-src ]; then wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz diff --git a/build/iOS/deps/libcurl.sh b/build/iOS/deps/libcurl.sh index 20251fae1..093468765 100755 --- a/build/iOS/deps/libcurl.sh +++ b/build/iOS/deps/libcurl.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -CURL_VERSION=7.57.0 +CURL_VERSION=7.58.0 if [ ! -d libcurl-src ]; then wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz diff --git a/build/iOS/deps/libvorbis.sh b/build/iOS/deps/libvorbis.sh index 750cdaf27..ab0ca0f42 100755 --- a/build/iOS/deps/libvorbis.sh +++ b/build/iOS/deps/libvorbis.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -VORBIS_VERSION=1.3.5 +VORBIS_VERSION=1.3.6 if [ ! -d libvorbis-src ]; then wget http://downloads.xiph.org/releases/vorbis/libvorbis-$VORBIS_VERSION.tar.gz diff --git a/build/iOS/icon.png b/build/iOS/icon.png index 505578d6d..93630caf5 100644 Binary files a/build/iOS/icon.png and b/build/iOS/icon.png differ diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 3413b5247..6ddb2b213 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -32,13 +32,13 @@ local function create_world_formspec(dialogdata) mglist = mglist .. v .. "," end mglist = mglist:sub(1, -2) - + local gameid = core.settings:get("menu_last_game") - + local game, gameidx = nil , 0 if gameid ~= nil then game, gameidx = gamemgr.find_by_gameid(gameid) - + if gameidx == nil then gameidx = 0 end @@ -57,10 +57,10 @@ local function create_world_formspec(dialogdata) --"dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" .. "dropdown[600.2,6;6.3;games;" .. gamemgr.gamelist() .. ";1]" .. - + "button[3.25,2.6;2.5,0.5;world_create_confirm;" .. fgettext("Create") .. "]" .. "button[5.75,2.6;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" - + if #gamemgr.games == 0 then retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. fgettext("You have no subgames installed.") .. "]label[2.25,4.4;" .. @@ -141,6 +141,6 @@ function create_create_world_dlg(update_worldlistfilter) create_world_buttonhandler, nil) retval.update_worldlist_filter = update_worldlistfilter - + return retval end diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua index d49d290b2..bb0eac210 100644 --- a/builtin/mainmenu/dlg_delete_world.lua +++ b/builtin/mainmenu/dlg_delete_world.lua @@ -17,39 +17,36 @@ local function delete_world_formspec(dialogdata) - local retval = - "size[11.5,2,false]" .. - "label[2,0;" .. + "size[10,2.5,false]" .. + "label[0.5,0.5;" .. fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" .. - "button[3.5,1.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes") .. "]" .. - "button[6,1.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]" + "button[0.5,1.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" .. + "button[7.0,1.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]" return retval end local function delete_world_buttonhandler(this, fields) if fields["world_delete_confirm"] then - if this.data.delete_index > 0 and - this.data.delete_index <= #menudata.worldlist:get_raw_list() then + this.data.delete_index <= #menudata.worldlist:get_raw_list() then core.delete_world(this.data.delete_index) menudata.worldlist:refresh() end this:delete() return true end - + if fields["world_delete_cancel"] then this:delete() return true end - + return false end -function create_delete_world_dlg(name_to_del,index_to_del) - +function create_delete_world_dlg(name_to_del, index_to_del) assert(name_to_del ~= nil and type(name_to_del) == "string" and name_to_del ~= "") assert(index_to_del ~= nil and type(index_to_del) == "number") @@ -59,6 +56,6 @@ function create_delete_world_dlg(name_to_del,index_to_del) nil) retval.data.delete_name = name_to_del retval.data.delete_index = index_to_del - + return retval end diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index 3bb2aa43d..ee7fc6531 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -31,25 +31,25 @@ local function get_formspec(tabview, name, tabdata) ) retval = retval .. - "image_button[0.45,4.9;2.9,0.8;" .. + "image_button[0,4.8;3.375,0.9;" .. core.formspec_escape(defaulttexturedir .. "multicraft_local_delete_btn.png") .. ";world_delete;;true;false]" .. - "image_button[3.14,4.9;2.9,0.8;" .. + "image_button[3.12,4.8;3.375,0.9;" .. core.formspec_escape(defaulttexturedir .. "multicraft_local_new_btn.png") .. ";world_create;;true;false]" local creative_mode = core.settings:get_bool("creative_mode") retval = retval .. - "image_button[7,1.5;4.5,1.27;" .. + "image_button[6.8,1.5;5,1.3;" .. core.formspec_escape(defaulttexturedir .. "multicraft_local_play_btn.png") .. ";play;;true;false]" .. - "image_button[7.25,3.15;4.05,0.8;" .. + "image_button[7.5,3.15;3.8,0.95;" .. core.formspec_escape(defaulttexturedir .. "multicraft_local_creative_" .. tostring(creative_mode) .. "_btn.png") .. ";cb_creative_mode;;true;false]" .. - "textlist[0,0;6.25,4.63;sp_worlds;" .. + "textlist[0,0;6.24,4.6;sp_worlds;" .. menu_render_worldlist() .. ";" .. index .. ";true]" return retval diff --git a/po/ru/MultiCraft.po b/po/ru/MultiCraft.po index b7fa0f80c..94df38cc5 100644 --- a/po/ru/MultiCraft.po +++ b/po/ru/MultiCraft.po @@ -898,7 +898,7 @@ msgstr "Информация о игре:" #: src/game.cpp msgid "Game paused" -msgstr "Игра приостановлена" +msgstr "Пауза" #: src/game.cpp msgid "Hosting server" diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 08f02748a..4aa4b2e6f 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -450,8 +450,8 @@ void set_default_settings(Settings *settings) settings->setDefault("mouse_sensitivity", "0.2"); // 3.5" (old iPhone's) if ([SDVersion deviceSize] == Screen3Dot5inch) { - settings->setDefault("hud_scaling", "0.4"); - settings->setDefault("gui_scaling", "0.9"); + settings->setDefault("hud_scaling", "0.5"); + settings->setDefault("gui_scaling", "1.0"); settings->setDefault("mouse_sensitivity", "0.2"); settings->setDefault("enable_3d_clouds", "false"); settings->setDefault("smooth_lighting", "false"); @@ -459,9 +459,10 @@ void set_default_settings(Settings *settings) // 4" (iPhone 5) if ([SDVersion deviceSize] == Screen4inch) { settings->setDefault("hud_scaling", "0.5"); - settings->setDefault("gui_scaling", "1.1"); + settings->setDefault("gui_scaling", "1.2"); settings->setDefault("mouse_sensitivity", "0.23"); settings->setDefault("enable_3d_clouds", "false"); + settings->setDefault("smooth_lighting", "false"); }; // 4.7" (iPhone) if ([SDVersion deviceSize] == Screen4Dot7inch) { @@ -478,7 +479,7 @@ void set_default_settings(Settings *settings) // 5.8" (iPhone X) if ([SDVersion deviceSize] == Screen5Dot8inch) { settings->setDefault("hud_scaling", "0.7"); - settings->setDefault("gui_scaling", "1.5"); + settings->setDefault("gui_scaling", "1.4"); settings->setDefault("mouse_sensitivity", "0.3"); }; diff --git a/textures/base/multicraft_local_creative_false_btn.png b/textures/base/multicraft_local_creative_false_btn.png index ce939c248..e9fbb982f 100644 Binary files a/textures/base/multicraft_local_creative_false_btn.png and b/textures/base/multicraft_local_creative_false_btn.png differ diff --git a/textures/base/multicraft_local_creative_true_btn.png b/textures/base/multicraft_local_creative_true_btn.png index ab4046f97..2d9722ea2 100644 Binary files a/textures/base/multicraft_local_creative_true_btn.png and b/textures/base/multicraft_local_creative_true_btn.png differ diff --git a/textures/base/multicraft_local_delete_btn.png b/textures/base/multicraft_local_delete_btn.png index 4576c3ba1..013530f1b 100644 Binary files a/textures/base/multicraft_local_delete_btn.png and b/textures/base/multicraft_local_delete_btn.png differ diff --git a/textures/base/multicraft_local_new_btn.png b/textures/base/multicraft_local_new_btn.png index e0b5fe976..745720590 100644 Binary files a/textures/base/multicraft_local_new_btn.png and b/textures/base/multicraft_local_new_btn.png differ diff --git a/textures/base/multicraft_local_play_btn.png b/textures/base/multicraft_local_play_btn.png index 2d645c797..b55a4b910 100644 Binary files a/textures/base/multicraft_local_play_btn.png and b/textures/base/multicraft_local_play_btn.png differ diff --git a/textures/base/pause_menu_btn.png b/textures/base/pause_menu_btn.png deleted file mode 100644 index bf576b435..000000000 Binary files a/textures/base/pause_menu_btn.png and /dev/null differ diff --git a/textures/base/rangeview_ios.png b/textures/base/rangeview_ios.png index 162c41594..f8f3a2451 100644 Binary files a/textures/base/rangeview_ios.png and b/textures/base/rangeview_ios.png differ diff --git a/textures/base/up_one.png b/textures/base/up_one.png index f68eaf061..fa571d0be 100644 Binary files a/textures/base/up_one.png and b/textures/base/up_one.png differ