Merge commit '854d9e3'

CMakeLists.txt

@@ -14,12 +14,13 @@ set(PROJECT_NAME_CAPITALIZED "freeminer")
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 13)
-set(VERSION_TWEAK 7)
+set(VERSION_PATCH 14)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
+set(VERSION_TWEAK 8)
+
 # Change to false for releases
-set(DEVELOPMENT_BUILD TRUE)
+set(DEVELOPMENT_BUILD FALSE)
 
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}")
 if(VERSION_EXTRA)

build/android/build.gradle

@@ -14,7 +14,7 @@ android {
 	buildToolsVersion "23.0.3"
 
 	defaultConfig {
-		versionCode 13
+		versionCode 14
 		versionName "${System.env.VERSION_STR}.${versionCode}"
 		minSdkVersion 9
 		targetSdkVersion 9

build/android/patches/irrlicht-back_button.patch

@@ -1,14 +1,15 @@
---- 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 @@
+--- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig	2015-08-29 15:43:09.000000000 +0300
++++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2016-05-13 21:36:22.880388505 +0300
+@@ -486,7 +486,7 @@
+ 				event.KeyInput.Char = 0;
  			}
- 			
- 			device->postEventFromUser(event);
-+			status = 1;
+ 
+-			device->postEventFromUser(event);
++			status = device->postEventFromUser(event);
  		}
  		break;
  		default:
-@@ -479,7 +480,7 @@
+@@ -543,7 +543,7 @@
      KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT
      KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT
      KeyMap[3] = KEY_HOME; // AKEYCODE_HOME

build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java

@@ -19,6 +19,10 @@ public class MtNativeActivity extends NativeActivity {
 	public void onDestroy() {
 		super.onDestroy();
 	}
+	
+	@Override
+	public void onBackPressed() {
+	}
 
 
 	public void copyAssets() {

builtin/mainmenu/tab_settings.lua

@@ -203,7 +203,11 @@ local function formspec(tabview, name, tabdata)
 		"checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";"
 				.. dump(core.setting_getbool("enable_shaders")) .. "]"
 
-	if PLATFORM ~= "Android" then
+	if PLATFORM == "Android" then
+		tab_string = tab_string ..
+			"button[8,4.75;3.75,0.5;btn_reset_singleplayer;"
+			.. fgettext("Reset singleplayer world") .. "]"
+	else
 		tab_string = tab_string ..
 			"button[8,4.75;3.75,0.5;btn_change_keys;"
 			.. fgettext("Change keys") .. "]"

doc/lua_api.txt

@@ -1,4 +1,4 @@
-Minetest Lua Modding API Reference 0.4.13
+Minetest Lua Modding API Reference 0.4.14
 =========================================
 * More information at <http://www.minetest.net/>
 * Developer Wiki: <http://dev.minetest.net/>

doc/menu_lua_api.txt

@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 0.4.13
+Minetest Lua Mainmenu API Reference 0.4.14
 ========================================
 
 Introduction