Release

Or no? :)

build/android/Makefile

@@ -105,7 +105,7 @@ CURL_DIR = $(ANDR_ROOT)/deps/curl
 CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
 CURL_TIMESTAMP = $(CURL_DIR)/timestamp
 CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
-CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2
+CURL_URL_HTTP = http://dl.uxnr.de/mirror/curl/curl-${CURL_VERSION}.tar.bz2
 
 GMP_VERSION = 6.1.0
 GMP_DIR = $(ANDR_ROOT)/deps/gmp
@@ -406,8 +406,8 @@ iconv_download :
 		rm libiconv-${ICONV_VERSION}.tar.gz;                               \
 		mv libiconv-${ICONV_VERSION} libiconv;                             \
 		cd libiconv;                                                       \
-		patch -p1 < ${ANDR_ROOT}/patches/libiconv_android.patch;                   \
-		patch -p1 < ${ANDR_ROOT}/patches/libiconv_stdio.patch;                     \
+		patch -p1 < ${ANDR_ROOT}/patches/libiconv_android.patch;           \
+		patch -p1 < ${ANDR_ROOT}/patches/libiconv_stdio.patch;             \
 	fi
 
 iconv : $(ICONV_LIB)

build/android/patches/irrlicht-back_button.patch

@@ -1,14 +1,6 @@
---- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 20:56:21.289559503 +0200
-+++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig	2014-06-03 20:57:39.281556749 +0200
-@@ -423,6 +423,7 @@
- 			}
- 			
- 			device->postEventFromUser(event);
-+			status = 1;
- 		}
- 		break;
- 		default:
-@@ -479,7 +480,7 @@
+--- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig	2016-05-02 04:32:21.281252634 +0300
++++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2016-05-02 04:37:58.295589904 +0300
+@@ -543,7 +543,7 @@
      KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT
      KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT
      KeyMap[3] = KEY_HOME; // AKEYCODE_HOME

builtin/settingtypes.txt

@@ -406,6 +406,10 @@ pause_fps_max (FPS in pause menu) int 20
 #    Min = 20
 viewing_range (Viewing range) int 100
 
+#    Far view distance in nodes.
+#    Only for Android.
+viewing_range_secondary (Initial secondary viewing range) int 150
+
 #    Width component of the initial window size.
 screenW (Screen width) int 800
 

src/game.cpp

@@ -3077,27 +3077,25 @@ void Game::decreaseViewRange(float *statustext_time)
 
 void Game::toggleFullViewRange(float *statustext_time)
 {
-	static const wchar_t *msg[] = {
-		L"Disabled full viewing range",
-		L"Enabled full viewing range"
-	};
-
 #ifdef __ANDROID__
 	static s16 other_range = g_settings->getS16("viewing_range_secondary");
-	// Switch to secondary vrange
 	s16 range_new = other_range;
 	other_range = g_settings->getS16("viewing_range");
 
 	g_settings->set("viewing_range", itos(range_new));
-	statustext = utf8_to_wide("Viewing range changed to "
-			+ itos(range_new));
+
+	//statustext = utf8_to_wide("Viewing range changed to "
+	//		+ itos(range_new));
 #else
+	static const wchar_t *msg[] = {
+		L"Disabled full viewing range",
+		L"Enabled full viewing range"
+	};
 	draw_control->range_all = !draw_control->range_all;
 	infostream << msg[draw_control->range_all] << std::endl;
 	statustext = msg[draw_control->range_all];
 	*statustext_time = 0;
 #endif
-
 }
 
 

src/hud.cpp

@@ -450,7 +450,7 @@ void Hud::drawHotbar(u16 playeritem) {
 
 	s32 hotbar_itemcount = player->hud_hotbar_itemcount;
 	s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2);
-	v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 2.7);
+	v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 2.4);
 
 	if ( (float) width / (float) porting::getWindowSize().X <=
 			g_settings->getFloat("hud_hotbar_max_width")) {
@@ -581,7 +581,7 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset)
 
 	m_halo_boxes.push_back(halo_box);
 	m_selection_mesh = convertNodeboxesToMesh(
-		m_halo_boxes, texture_uv, 0.3);
+		m_halo_boxes, texture_uv, 0.25);
 }
 
 void Hud::resizeHotbar() {