iOS 1.0.23: improvements for new iPhones and iPads.

build/iOS/MultiCraft/MultiCraft/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.20</string>
+	<string>1.1.23</string>
 	<key>CFBundleVersion</key>
-	<string>33</string>
+	<string>37</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

build/iOS/Podfile

@@ -4,12 +4,12 @@ platform :ios, '8.0'
 target 'MultiCraft' do
 	source 'https://github.com/appodeal/CocoaPods.git'
 	source 'https://github.com/CocoaPods/Specs.git'
-	
-  pod 'SSZipArchive'
-  pod 'SDVersion'
 
-  pod 'Appodeal/Core', '2.4.5.1-Beta'
-  pod 'Appodeal/Interstitial', '2.4.5.1-Beta'
-  pod 'Appodeal/Video', '2.4.5.1-Beta'
+  pod 'SSZipArchive'
+  pod 'SDVersion', :git => 'https://github.com/skitudeiosdevelopers/SDVersion'
+
+  pod 'Appodeal/Core', '2.4.8.1-Beta'
+  pod 'Appodeal/Interstitial', '2.4.8.1-Beta'
+  pod 'Appodeal/Video', '2.4.8.1-Beta'
   pod 'PersonalizedAdConsent', :git => 'https://github.com/MultiCraftProject/googleads-consent-sdk-ios'
 end

build/iOS/deps/irrlicht.sh

@@ -3,7 +3,8 @@
 . sdk.sh
 
 [ ! -d irrlicht-src ] && \
-	svn co -r 5622 svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
+	#svn co -r 5641 svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
+	svn co svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
 
 cd irrlicht-src/
 
@@ -26,6 +27,5 @@ cd ../..
 mkdir -p ../irrlicht
 cp lib/iOS/libIrrlicht.a ../irrlicht/
 cp -r include ../irrlicht/include
-cp -r media ../irrlicht/media
 
 echo "Irrlicht build successful"

build/iOS/deps/libcurl.sh

@@ -13,8 +13,11 @@ fi
 cd libcurl-src
 
 CC=$IOS_CC CFLAGS=$IOS_FLAGS \
-./configure --host=arm-apple-darwin --prefix=/ \
-	--disable-shared --enable-static \
+./configure --host=arm-apple-darwin --prefix=/ --disable-shared --enable-static \
+	--disable-debug  --disable-dependency-tracking -disable-ftp 									\
+	--disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict 	\
+	--disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp 	\
+	--disable-gopher --disable-sspi --disable-manual --disable-zlib --without-zlib \
 	--with-darwinssl
 make -j$(sysctl -n hw.ncpu)
 

build/iOS/deps/sdk.sh

@@ -7,4 +7,4 @@ osver=8.0
 export IOS_COMPILER=$(xcrun --sdk $sdk --find clang)
 export IOS_CC=$IOS_COMPILER
 export IOS_CXX=$IOS_COMPILER
-export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -flto -Ofast"
+export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -fvisibility=hidden -flto -Ofast"

build/iOS/patches/irrlicht-hideindicator.patch

@@ -11,8 +11,8 @@
 +@end
 +
 +@implementation IrrUIViewController
-+- (BOOL)prefersHomeIndicatorAutoHidden {
-+	return YES;
++- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures {
++	return UIRectEdgeAll;
 +}
 +@end
  

src/defaultsettings.cpp

@@ -365,8 +365,11 @@ void set_default_settings(Settings *settings)
 
 	settings->setDefault("high_precision_fpu", "true");
 	settings->setDefault("enable_console", "false");
-	settings->setDefault("mainmenu_last_selected_world", "1");
 
+	settings->setDefault("mainmenu_last_selected_world", "1");
+	settings->setDefault("inventory_image_hack", "false");
+
+	// Mobile Platform
 #if defined(__ANDROID__) || defined(__IOS__)
 	settings->setDefault("screen_w", "0");
 	settings->setDefault("screen_h", "0");
@@ -378,7 +381,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("touchscreen_threshold", "20");
 	settings->setDefault("fixed_virtual_joystick", "true");
 	settings->setDefault("doubletap_jump", "true");
-	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "5");
 	settings->setDefault("abm_interval", "2.0");
 	settings->setDefault("client_unload_unused_data_timeout", "60");
@@ -386,6 +388,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("mapgens_available", "v6, v7p, flat");
 #endif
 
+	// Android Settings
 #ifdef __ANDROID__
 	settings->setDefault("viewing_range", "35");
 	settings->setDefault("pause_fps_max", "5");
@@ -399,7 +402,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("client_mapblock_limit", "250");
 	settings->setDefault("enable_3d_clouds", "false");
 	settings->setDefault("cloud_radius", "6");
-	settings->setDefault("inventory_image_hack", "false");
+	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	// set font_path
 	settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
 	settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
@@ -432,7 +435,11 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("language", lang);
 #endif
 
+	// iOS Settings
 #ifdef __IOS__
+	settings->setDefault("mg_name", "v7p");
+	settings->setDefault("emergequeue_limit_diskonly", "16");
+	settings->setDefault("emergequeue_limit_generate", "16");
 	// set font_path
 	settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "retrovillenc.ttf"));
 	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "retrovillenc.ttf"));
@@ -443,7 +450,7 @@ void set_default_settings(Settings *settings)
 		settings->setDefault("hud_scaling", "0.5");
 		settings->setDefault("gui_scaling", "1.0");
 	} else if ([SDVersion deviceSize] == Screen4inch) {
-	// 4" (iPhone 5)
+		// 4" (iPhone 5)
 		settings->setDefault("hud_scaling", "0.5");
 		settings->setDefault("gui_scaling", "1.1");
 		settings->setDefault("mouse_sensitivity", "0.23");
@@ -457,45 +464,49 @@ void set_default_settings(Settings *settings)
 		settings->setDefault("hud_scaling", "0.7");
 		settings->setDefault("gui_scaling", "1.2");
 		settings->setDefault("mouse_sensitivity", "0.3");
-	} else if ([SDVersion deviceSize] == Screen5Dot8inch) {
-		// 5.8" (iPhone X)
+	} else if (([SDVersion deviceSize] == Screen5Dot8inch) || ([SDVersion deviceSize] == Screen6Dot1inch) || ([SDVersion deviceSize] == Screen6Dot5inch)) {
+		// 5.8+" (iPhone X-series)
 		settings->setDefault("hud_scaling", "0.8");
 		settings->setDefault("gui_scaling", "1.2");
-		settings->setDefault("mouse_sensitivity", "0.3");
-		settings->setDefault("hud_move_upwards", "15");
+		settings->setDefault("mouse_sensitivity", "0.35");
 	} else {
 		// iPad
 		settings->setDefault("hud_scaling", "0.8");
 		settings->setDefault("gui_scaling", "1.1");
 	}
 
+	// Move the HUD up for the iPhone X-series and new iPad Pro
+	if (([SDVersion deviceVersion] == iPhoneX) || ([SDVersion deviceVersion] == iPhoneXS) || ([SDVersion deviceVersion] == iPhoneXSMax) || ([SDVersion deviceVersion] == iPhoneXR) || ([SDVersion deviceVersion] ==  iPadPro11Inch) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch3Gen)) {
+		settings->setDefault("hud_move_upwards", "10");
+	}
+
 	// set the optimal settings depending on the model
 	if (([SDVersion deviceVersion] == iPhone4S) || ([SDVersion deviceVersion] == iPhone5) || ([SDVersion deviceVersion] == iPhone5S) || ([SDVersion deviceVersion] == iPhone6) || ([SDVersion deviceVersion] == iPhone6Plus) || ([SDVersion deviceVersion] == iPodTouch5Gen) || ([SDVersion deviceVersion] == iPad2) || ([SDVersion deviceVersion] == iPad3) || ([SDVersion deviceVersion] == iPadMini) || ([SDVersion deviceVersion] == iPadMini2)) {
-			// minimal settings
-			settings->setDefault("smooth_lighting", "false");
-			settings->setDefault("viewing_range", "25");
-			settings->setDefault("enable_3d_clouds", "false");
-			settings->setDefault("cloud_radius", "6");
-			settings->setDefault("pause_fps_max", "5");
-			settings->setDefault("chunksize", "3");
-			settings->setDefault("client_mapblock_limit", "250");
-			settings->setDefault("active_block_range", "1");
-			settings->setDefault("max_block_generate_distance", "2");
+		// minimal settings
+		settings->setDefault("smooth_lighting", "false");
+		settings->setDefault("viewing_range", "25");
+		settings->setDefault("enable_3d_clouds", "false");
+		settings->setDefault("cloud_radius", "6");
+		settings->setDefault("pause_fps_max", "5");
+		settings->setDefault("chunksize", "3");
+		settings->setDefault("client_mapblock_limit", "250");
+		settings->setDefault("active_block_range", "1");
+		settings->setDefault("max_block_generate_distance", "2");
 	} else if (([SDVersion deviceVersion] == iPhone6S) || ([SDVersion deviceVersion] == iPhone6SPlus) || ([SDVersion deviceVersion] == iPhoneSE) || ([SDVersion deviceVersion] == iPhone7) || ([SDVersion deviceVersion] == iPhone7Plus) || ([SDVersion deviceVersion] == iPodTouch6Gen) || ([SDVersion deviceVersion] == iPad4) || ([SDVersion deviceVersion] == iPadMini3) || ([SDVersion deviceVersion] == iPadMini4) || ([SDVersion deviceVersion] == iPadAir))  {
-			// medium settings
-			settings->setDefault("viewing_range", "50");
-			settings->setDefault("chunksize", "3");
-			settings->setDefault("cloud_radius", "6");
-			settings->setDefault("client_mapblock_limit", "500");
-			settings->setDefault("active_block_range", "1");
-			settings->setDefault("max_block_generate_distance", "3");
+		// medium settings
+		settings->setDefault("viewing_range", "50");
+		settings->setDefault("chunksize", "3");
+		settings->setDefault("cloud_radius", "6");
+		settings->setDefault("client_mapblock_limit", "500");
+		settings->setDefault("active_block_range", "1");
+		settings->setDefault("max_block_generate_distance", "3");
 	} else {
-/*} else if (([SDVersion deviceVersion] == iPhone8) || ([SDVersion deviceVersion] == iPhone8Plus) || ([SDVersion deviceVersion] == iPhoneX) || ([SDVersion deviceVersion] == iPadPro9Dot7Inch) || ()([SDVersion deviceVersion] == iPadPro12Dot9Inch) || ([SDVersion deviceVersion] == iPadPro10Dot5Inch) || ([SDVersion deviceVersion] == iPadAir2) || ([SDVersion deviceVersion] == iPad5)|| ([SDVersion deviceVersion] == iPad6)) {*/
-			// high settings
-			settings->setDefault("viewing_range", "75");
-			settings->setDefault("client_mapblock_limit", "1000");
-			settings->setDefault("active_block_range", "2");
-			settings->setDefault("max_block_generate_distance", "5");
+	/*} else if (([SDVersion deviceVersion] == iPhone8) || ([SDVersion deviceVersion] == iPhone8Plus) || ([SDVersion deviceVersion] == iPhoneX) || ([SDVersion deviceVersion] == iPadPro9Dot7Inch) || ()([SDVersion deviceVersion] == iPadPro12Dot9Inch) || ([SDVersion deviceVersion] == iPadPro10Dot5Inch) || ([SDVersion deviceVersion] == iPadAir2) || ([SDVersion deviceVersion] == iPad5)|| ([SDVersion deviceVersion] == iPad6)) {*/
+		// high settings
+		settings->setDefault("viewing_range", "75");
+		settings->setDefault("client_mapblock_limit", "1000");
+		settings->setDefault("active_block_range", "2");
+		settings->setDefault("max_block_generate_distance", "5");
 	}
 
 	// Auto-detect language on iOS