Release 1.1.5, iOS: 1.1.15...

Mobile: fix pause and death menu
iOS: touchtarget enabled by default

build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		4B35A9F11EEE014F00274961 /* l_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9EF1EEE014F00274961 /* l_storage.cpp */; };
 		4B35A9F41EEE017000274961 /* scripting_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F21EEE017000274961 /* scripting_client.cpp */; };
 		4B35A9F71EEE018D00274961 /* scripting_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F51EEE018D00274961 /* scripting_server.cpp */; };
+		849C4F86209656D3005EB041 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 849C4F85209656D2005EB041 /* ru.lproj */; };
 		EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */; };
 		F810D7052080E48100D109B8 /* en.lproj in Resources */ = {isa = PBXBuildFile; fileRef = F810D7042080E48000D109B8 /* en.lproj */; };
 		F81F6BE51DDC7D99000B9E21 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F81F6BE41DDC7D99000B9E21 /* libintl.a */; };
@@ -291,8 +292,7 @@
 		4B35A9F31EEE017000274961 /* scripting_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_client.h; path = ../../../../src/script/scripting_client.h; sourceTree = "<group>"; };
 		4B35A9F51EEE018D00274961 /* scripting_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scripting_server.cpp; path = ../../../../src/script/scripting_server.cpp; sourceTree = "<group>"; };
 		4B35A9F61EEE018D00274961 /* scripting_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_server.h; path = ../../../../src/script/scripting_server.h; sourceTree = "<group>"; };
-		4B735DD21E92C8DB00307C15 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = "<group>"; };
+		849C4F85209656D2005EB041 /* ru.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ru.lproj; sourceTree = "<group>"; };
-		4B735DD31E92C8DB00307C15 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F810D7042080E48000D109B8 /* en.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = en.lproj; sourceTree = "<group>"; };
 		F81F6BE41DDC7D99000B9E21 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = ../deps/intl/libintl.a; sourceTree = "<group>"; };
@@ -791,6 +791,7 @@
 		F8E6C4DB1DCA3B7900F64426 /* MultiCraft */ = {
 			isa = PBXGroup;
 			children = (
+				849C4F85209656D2005EB041 /* ru.lproj */,
 				F810D7042080E48000D109B8 /* en.lproj */,
 				F8E6C4E51DCA3B7900F64426 /* Main.storyboard */,
 				F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */,
@@ -1374,7 +1375,6 @@
 				F8E6C4D51DCA3B7900F64426 /* Sources */,
 				F8E6C4D61DCA3B7900F64426 /* Frameworks */,
 				F8E6C4D71DCA3B7900F64426 /* Resources */,
-				60A64D029DD264DB6DB451E1 /* [CP] Embed Pods Frameworks */,
 				E156912616D2E9233FC1C9F4 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
@@ -1428,6 +1428,7 @@
 				F8E6C4EC1DCA3B7900F64426 /* LaunchScreen.storyboard in Resources */,
 				F8E6C4E91DCA3B7900F64426 /* Assets.xcassets in Resources */,
 				F8E6C7E11DCA4EB300F64426 /* assets.zip in Resources */,
+				849C4F86209656D3005EB041 /* ru.lproj in Resources */,
 				F8E6C4E71DCA3B7900F64426 /* Main.storyboard in Resources */,
 				F8E6C7E31DCA511700F64426 /* worlds.zip in Resources */,
 				F856B5C31F55F7EE00FE9494 /* bg.png in Resources */,
@@ -1437,21 +1438,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		60A64D029DD264DB6DB451E1 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		C73312165F97B96FC254B124 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1753,7 +1739,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				F8E6C4E61DCA3B7900F64426 /* Base */,
-				4B735DD21E92C8DB00307C15 /* ru */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -1762,7 +1747,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				F8E6C4EB1DCA3B7900F64426 /* Base */,
-				4B735DD31E92C8DB00307C15 /* ru */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -1876,11 +1860,13 @@
 			baseConfigurationReference = 32528F14AAB9EA0E9CAB8526 /* Pods-MultiCraft.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_USE_OPTIMIZATION_PROFILE = NO;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				DEVELOPMENT_TEAM = R3RLJ9TW52;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
+					"NDEBUG=0",
 					__IOS__,
 					"RUN_IN_PLACE=0",
 					"USE_GETTEXT=1",
@@ -1923,8 +1909,16 @@
 					"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
 					"-flto",
 					"-fvisibility=hidden",
+					"-fdata-sections",
+					"-ffunction-sections",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-flto",
+					"-fvisibility=hidden",
+					"-fdata-sections",
+					"-ffunction-sections",
 				);
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-L${SRCROOT}/../deps/irrlicht",
@@ -1935,6 +1929,7 @@
 					"-L${SRCROOT}/../deps/luajit/lib",
 					"-L${SRCROOT}/../deps/intl",
 					"-L${SRCROOT}/../deps/libcurl/lib",
+					"-Wl,-dead_strip",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1947,6 +1942,7 @@
 			baseConfigurationReference = 1E76DCA01B51A98F0CA4C480 /* Pods-MultiCraft.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_USE_OPTIMIZATION_PROFILE = NO;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				DEVELOPMENT_TEAM = R3RLJ9TW52;
 				ENABLE_BITCODE = NO;
@@ -1995,8 +1991,16 @@
 					"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
 					"-flto",
 					"-fvisibility=hidden",
+					"-fdata-sections",
+					"-ffunction-sections",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-flto",
+					"-fvisibility=hidden",
+					"-fdata-sections",
+					"-ffunction-sections",
 				);
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-L${SRCROOT}/../deps/irrlicht",
@@ -2007,6 +2011,7 @@
 					"-L${SRCROOT}/../deps/luajit/lib",
 					"-L${SRCROOT}/../deps/intl",
 					"-L${SRCROOT}/../deps/libcurl/lib",
+					"-Wl,-dead_strip",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft;
 				PRODUCT_NAME = "$(TARGET_NAME)";

build/iOS/MultiCraft/MultiCraft/Base.lproj/Main.storyboard

@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>

build/iOS/MultiCraft/MultiCraft/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.14</string>
+	<string>1.1.15</string>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>26</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

build/iOS/MultiCraft/MultiCraft/ru.lproj/LaunchScreen.strings

@@ -1 +0,0 @@
-

build/iOS/MultiCraft/MultiCraft/ru.lproj/Main.strings

@@ -1 +0,0 @@
-

build/iOS/appicon.sh

@@ -2,6 +2,7 @@
 
 # Generates different AppIcon images with correct dimensions
 # (brew package: imagemagick)
+# (install: brew install imagemagick)
 SIZES="76 120 152 167 180"
 SRCFILE=icon.png
 DSTDIR=MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset

src/config.h

@@ -28,8 +28,8 @@
     #define STATIC_SHAREDIR ""
     #define VERSION_MAJOR 1
     #define VERSION_MINOR 1
-    #define VERSION_PATCH 4
+    #define VERSION_PATCH 5
-    #define VERSION_STRING "1.1.4"
+    #define VERSION_STRING "1.1.5"
     #ifdef NDEBUG
         #define BUILD_TYPE "Release"
     #else

src/defaultsettings.cpp

@@ -442,7 +442,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("viewing_range", "50");
 	settings->setDefault("selectionbox_width", "3");
 	settings->setDefault("smooth_lighting", "true");
-	settings->setDefault("touchtarget", "false");
+	settings->setDefault("touchtarget", "true");
 	settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "retrovillenc.ttf"));
 	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "retrovillenc.ttf"));
 
@@ -485,7 +485,7 @@ void set_default_settings(Settings *settings)
 		settings->setDefault("hud_scaling", "0.7");
 		settings->setDefault("gui_scaling", "1.3");
 		settings->setDefault("mouse_sensitivity", "0.3");
-		settings->setDefault("hud_move_upwards", "20");
+		settings->setDefault("hud_move_upwards", "15");
 	};
 
 	// Auto-detect language on iOS

src/game.cpp

@@ -4707,7 +4707,7 @@ void Game::showPauseMenu()
 #ifdef __ANDROID__
 	float ypos = simple_singleplayer_mode ? 0.5f : 0.1f;
 #elif __IOS__
-	float ypos = 1.0;
+	float ypos = 1.5;
 #else
 	float ypos = simple_singleplayer_mode ? 0.7f : 0.1f;
 #endif
@@ -4715,29 +4715,29 @@ void Game::showPauseMenu()
 
 	os << FORMSPEC_VERSION_STRING  << SIZE_TAG
 		<< "bgcolor[#00000060;true]"
-		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
+		<< "button_exit[3.5," << (ypos++) << ";4,0.5;btn_continue;"
 		<< strgettext("Continue") << "]";
 	
-#if !defined(__ANDROID__) && !defined(__IOS__)
 	if (!simple_singleplayer_mode) {
-		os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;"
+#if !defined(__ANDROID__) && !defined(__IOS__)
+	os		<< "button_exit[3.5," << (ypos++) << ";4,0.5;btn_change_password;"
 		<< strgettext("Change Password") << "]";
-	} else {
-		os << "field[4.5,0;3,1.0;;" << strgettext("Game paused") << ";]";
-	}
 #endif
+	} else {
+	os		<< "field[5.1,0;4,1.0;;" << strgettext("Pause") << ";]";
+	}
 
 #if !defined(__ANDROID__) && !defined(__IOS__)
-	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;"
+	os		<< "button_exit[3.5," << (ypos++) << ";4,0.5;btn_sound;"
 		<< strgettext("Sound Volume") << "]";
-	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
+	os		<< "button_exit[3.5," << (ypos++) << ";4,0.5;btn_key_config;"
 		<< strgettext("Change Keys")  << "]";
 #endif
-	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
+	os		<< "button_exit[3.5," << (ypos++) << ";4,0.5;btn_exit_menu;"
 		<< strgettext("Save and Exit") << "]"
 #ifndef __IOS__
 ; // LoL
-	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
+	os		<< "button_exit[3.5," << (ypos++) << ";4,0.5;btn_exit_os;"
 		<< strgettext("Close game")   << "]"
 #endif
 /*		<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]
@@ -4797,8 +4797,8 @@ void Game::showDeathScreen()
 		std::string(FORMSPEC_VERSION_STRING) +
 		SIZE_TAG
 		"bgcolor[#320000b4;true]"
-		"label[4.85,1.35;" + gettext("You died.") + "]"
+		"label[4.4,1.35;" + gettext("You died.") + "]"
-		"button_exit[4,3;3,0.5;btn_respawn;" + gettext("Respawn") + "]"
+		"button_exit[3.5,3;4,0.5;btn_respawn;" + gettext("Respawn") + "]"
 		;
 
 	/* Create menu */