iOS: 1.0.13 release

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;
 		};

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"
   }
-}
+}

build/iOS/MultiCraft/MultiCraft/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.13</string>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>24</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

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

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

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

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

builtin/mainmenu/dlg_delete_world.lua

@@ -17,39 +17,36 @@
 
 
 local function delete_world_formspec(dialogdata)
-
 	local retval =
-		"size[11.5,2,false]" ..
+		"size[10,2.5,false]" ..
-		"label[2,0;" ..
+		"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[0.5,1.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" ..
-		"button[6,1.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]"
+		"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

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

po/ru/MultiCraft.po

@@ -898,7 +898,7 @@ msgstr "Информация о игре:"
 
 #: src/game.cpp
 msgid "Game paused"
-msgstr "Игра приостановлена"
+msgstr "Пауза"
 
 #: src/game.cpp
 msgid "Hosting server"

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("hud_scaling", "0.5");
-		settings->setDefault("gui_scaling", "0.9");
+		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");
 	};