From 6d9056c74c9237ffd3e48a3309ad6c90f7002590 Mon Sep 17 00:00:00 2001
From: Mars873 <mars873@gmail.com>
Date: Tue, 14 Mar 2017 23:46:04 +0200
Subject: [PATCH 01/14] update translation (#132)

---
 res/values-ua/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml
index 107d96f9..53b10d48 100644
--- a/res/values-ua/strings.xml
+++ b/res/values-ua/strings.xml
@@ -2,15 +2,15 @@
 <resources>
 	<string name="launch_button">Запустити Xash3D</string>
 	<string name="cmd_args_text">Аргументи командного рядка(тільки для експертів)</string>
-	<string name="use_controls">Включити екранне управління</string>
-	<string name="use_volume">Використовувати кнопки гучності</string>
-	<string name="text_res_path">Директорія ресурсів гри</string>
-	<string name="touch_set">Налаштування управління</string>
+	<string name="use_controls">Увімкнути наекранне керування</string>
+	<string name="use_volume">Використовувати клавіші гучності</string>
+	<string name="text_res_path">Каталог ресурсів гри</string>
+	<string name="touch_set">Налаштування керування</string>
 	<string name="text_shortcut">Ярлик Xash3D</string>
 	<string name="text_shortcut_test">Ярлик Xash3D_test</string>
 	<string name="shortcut_button_save">Зберегти ярлик</string>
-	<string name="gamedir">Каталог мода</string>
-	<string name="pkgname">Пакет мода (тільки для експертів)</string>
+	<string name="gamedir">Каталог модифікації</string>
+	<string name="pkgname">Пакет модифікації(тільки для експертів)</string>
 	<string name="shortcut_name">Назва ярлика</string>
 	<string name="about_copyright">FWGS не пов\'язаний з Valve або з будь-якими з їх партнерів. Всі авторські права належать їх відповідним власникам.</string>
 	<string name="about_authors">Порт на Android здійснений командою FWGS:\n
@@ -21,11 +21,11 @@
 Особливі подяки:\n
 &#8226; Дяде Мише за Xash3D\n
 &#8226; Valve за Half-Life\n</string>
-	<string name="about_links">Слідуйте за нами в:\n
+	<string name="about_links">Слідкуйте за нами в:\n
 	&#8226; <a href="https://vk.com/xashdroid">VK</a>\n
 	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>\n
 	&#8226; <a href="https://github.com/FWGS">GitHub</a></string>
-	<string name="about_button">О Xash3D Android</string>
-	<string name="create_shortcut_button">Створити ярлик мода</string>
-	<string name="select_folder">(вибрати)</string>
+	<string name="about_button">Про Xash3D Android</string>
+	<string name="create_shortcut_button">Створити ярлик модифікації</string>
+	<string name="select_folder">(обрати)</string>
 </resources>

From 5368a7f56b03835854eb6900e0a21a3510f5af53 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 24 Mar 2017 22:03:00 +0000
Subject: [PATCH 02/14] Xash3D background service (prevend unload)

---
 AndroidManifest.xml                    |  5 +-
 build-test.sh                          |  2 +-
 jni/src/Xash3D/xash3d                  |  2 +-
 res/layout/notify.xml                  | 69 ++++++++----------
 src/in/celest/xash3d/XashActivity.java | 34 +++++----
 src/in/celest/xash3d/XashService.java  | 99 ++++++++++++++++++++++++++
 test/AndroidManifest.xml               |  7 +-
 unused/notify.xml                      | 43 +++++++++++
 8 files changed, 203 insertions(+), 58 deletions(-)
 create mode 100644 src/in/celest/xash3d/XashService.java
 create mode 100644 unused/notify.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index db506a1e..250816c5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,13 +66,16 @@
 		<activity android:name="in.celest.xash3d.XashActivity"
 			android:screenOrientation="sensorLandscape"
 			android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-			android:label="@string/app_name">
+			android:label="@string/app_name"
+			android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="in.celest.xash3d.START" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity> 
 		<activity android:name="in.celest.xash3d.FPicker"></activity>
+		<service android:name="in.celest.xash3d.XashService" android:stopWithTask="false" />
+		<receiver android:name="in.celest.xash3d.XashService$exitButtonListener" />
 		<receiver android:name="in.celest.xash3d.InstallReceiver">
 			<intent-filter android:priority="100">
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/build-test.sh b/build-test.sh
index c1254617..2977982a 100644
--- a/build-test.sh
+++ b/build-test.sh
@@ -1,4 +1,4 @@
-ANDROID_JAR=../android-13.jar
+ANDROID_JAR=../android-14_.jar
 AAPT=./../aapt
 DX=./../dx
 APKBUILDER=./../apkbuilder
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 472f483e..8dcecbaa 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 472f483e21b042a3fa04f2e559acf7c71c0c0325
+Subproject commit 8dcecbaac9204a87200f2ce7e95c2b8f23a7a616
diff --git a/res/layout/notify.xml b/res/layout/notify.xml
index 069cfa69..10087aa9 100644
--- a/res/layout/notify.xml
+++ b/res/layout/notify.xml
@@ -1,43 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
+      <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:padding="5dp">
+        android:layout_width="fill_parent"
+        android:layout_height="65sp"
+        android:orientation="horizontal" >
 
-    <ImageView android:id="@+id/status_icon"
-        android:layout_width="wrap_content" 
-        android:layout_height="fill_parent"
-        android:layout_alignParentLeft="true" 
-        android:layout_marginRight="10dp"/>
+        <ImageView
+          android:id="@+id/status_image"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:src="@drawable/ic_launcher"
+          android:layout_weight="00"
+          android:layout_gravity="center_vertical" />
 
- 
-
-    <RelativeLayout android:layout_width="fill_parent"
-        android:layout_height="fill_parent" 
-        android:layout_toRightOf="@id/status_icon">
-
- 
-
-        <TextView android:id="@+id/status_text" 
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" 
-            android:layout_alignParentTop="true" />
-
-        <ProgressBar android:id="@+id/status_progress"
-            android:layout_width="fill_parent" 
-            android:layout_height="wrap_content"
-            android:layout_below="@id/status_text"
-            android:indeterminate="false" 
-            android:indeterminateOnly="false"
-            style="?android:attr/progressBarStyleHorizontal"  />
-
- 
-
- 
-
-    </RelativeLayout>
-
- 
-
-</RelativeLayout>
+        <TextView
+          android:id="@+id/status_text"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignParentTop="true"
+          android:layout_marginLeft="10dip"
+          android:singleLine="true"
+          android:layout_weight="90"
+          android:text="Xash3D"
+          android:layout_gravity="center_vertical" />
+         <Button
+    android:id="@+id/status_exit_button"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="Exit"
+    android:layout_weight="0"
+    android:layout_alignParentLeft="true"
+    android:layout_gravity="center_vertical" />
+      </LinearLayout>
\ No newline at end of file
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 4b7f45cb..523a037f 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -155,15 +155,6 @@ public class XashActivity extends Activity {
 				setFolderAsk( false ); // don't ask on next run
 				Log.v(TAG, "Got new basedir from FPicker: " + newBaseDir );
 			}
-			else if( requestCode == OPEN_DOCUMENT_TREE_RESULT )
-			{
-				Uri uri = resultData.getData();
-				if( uri != null )
-				{
-					getContentResolver().takePersistableUriPermission(uri,
-                        Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION );
-				}
-			}
 		}
 	}
 	
@@ -235,34 +226,41 @@ public class XashActivity extends Activity {
 	@Override
 	protected void onResume() {
 		Log.v(TAG, "onResume()");
+
+		if( mEngineReady )
+			nativeOnResume();
+
 		super.onResume();
 	}
 	
 	@Override
 	protected void onStop() {
 		Log.v(TAG, "onStop()");
-		
+		/*
 		if( mEngineReady )
 		{
+			nativeSetPause(0);
 			// let engine properly exit, instead of killing it's thread
 			nativeOnStop();
 		
 			// wait for engine
 			mSurface.engineThreadWait();
 		}
-		
+*/
 		super.onStop();
 	}
 	
 	@Override
 	protected void onDestroy() {
-		Log.v(TAG, "onStop()");
+		Log.v(TAG, "onDestroy()");
 		
 		if( mEngineReady )
 		{
+			nativeUnPause();
 			// let engine a chance to properly exit
 			nativeOnDestroy();
-		
+			
+			//mSurface.engineThreadWait();
 			// wait until Xash will exit
 			mSurface.engineThreadJoin();
 		}
@@ -274,6 +272,9 @@ public class XashActivity extends Activity {
 	@Override
 	public void onWindowFocusChanged(boolean hasFocus) 
 	{
+
+		if( mEngineReady )
+			nativeOnFocusChange();
 		super.onWindowFocusChanged(hasFocus);
 
 		if( mImmersiveMode != null )
@@ -418,6 +419,8 @@ public class XashActivity extends Activity {
 		mVibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
 		mHasVibrator = ( mVibrator != null ) && ( mVibrator.hasVibrator() );
 
+		startService(new Intent(getBaseContext(), XashService.class));
+
 		mEngineReady = true;
 	}
 	
@@ -469,8 +472,10 @@ public class XashActivity extends Activity {
 	public static native void nativeString( String text );
 	public static native void nativeSetPause(int pause);
 	public static native void nativeOnDestroy();
-	public static native void nativeOnStop();
+	public static native void nativeOnResume();
+	public static native void nativeOnFocusChange();
 	public static native void nativeOnPause();
+	public static native void nativeUnPause();
 	public static native void nativeHat(int id, byte hat, byte keycode, boolean down);
 	public static native void nativeAxis(int id, byte axis, short value);
 	public static native void nativeJoyButton(int id, byte button, boolean down);
@@ -765,6 +770,7 @@ public class XashActivity extends Activity {
 
 }
 
+
 /**
  Simple nativeInit() runnable
  */
diff --git a/src/in/celest/xash3d/XashService.java b/src/in/celest/xash3d/XashService.java
new file mode 100644
index 00000000..71ef5f21
--- /dev/null
+++ b/src/in/celest/xash3d/XashService.java
@@ -0,0 +1,99 @@
+package in.celest.xash3d;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.opengles.GL10;
+import javax.microedition.khronos.egl.*;
+
+import android.app.*;
+import android.content.*;
+import android.view.*;
+import android.os.*;
+import android.util.*;
+import android.graphics.*;
+import android.text.method.*;
+import android.text.*;
+import android.media.*;
+import android.hardware.*;
+import android.content.*;
+import android.widget.*;
+import android.content.pm.*;
+import android.net.Uri;
+import android.provider.*;
+import android.database.*;
+
+import android.view.inputmethod.*;
+
+import java.lang.*;
+import java.util.List;
+import java.security.MessageDigest;
+
+import in.celest.xash3d.hl.R;
+import in.celest.xash3d.hl.BuildConfig;
+import in.celest.xash3d.XashConfig;
+import in.celest.xash3d.JoystickHandler;
+import in.celest.xash3d.CertCheck;
+
+
+public class XashService  extends Service {
+
+	@Override
+	public IBinder onBind(Intent intent) {
+		return null;
+	}
+	public static class exitButtonListener extends BroadcastReceiver {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			XashActivity.nativeUnPause();
+			XashActivity.nativeOnDestroy();
+		}
+	}
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		Log.d("XashService", "Service Started");
+		Intent intent_ = new Intent(this, XashActivity.class);
+		intent_.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+		final PendingIntent pendingIntent = PendingIntent.getActivity(
+			getApplicationContext(), 0, intent_, 0);
+		Notification notification = new Notification(R.drawable.ic_launcher,
+										"Xash3D", System.currentTimeMillis());
+		notification.contentView = new RemoteViews(getApplicationContext()
+												   .getPackageName(),  R.layout.notify);
+		notification.contentIntent = pendingIntent;
+				notification.flags = notification.flags
+			| Notification.FLAG_ONGOING_EVENT | Notification.FLAG_FOREGROUND_SERVICE;
+
+
+		notification.contentView.setTextViewText(R.id.status_text, "Xash3D");
+	Intent exitIntent = new Intent(this, exitButtonListener.class);
+	PendingIntent pendingExitIntent = PendingIntent.getBroadcast(this, 0,
+			exitIntent, 0);
+
+		notification.contentView.setOnClickPendingIntent(R.id.status_exit_button, pendingExitIntent);
+		startForeground(100, notification);
+		return START_NOT_STICKY;
+	}
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		Log.d("XashService", "Service Destroyed");
+	}
+
+	@Override
+	public void onCreate()
+	{
+
+	}
+
+	@Override
+	public void onTaskRemoved(Intent rootIntent) {
+		Log.e("XashService", "OnTaskRemoved");
+		XashActivity.nativeUnPause();
+		XashActivity.nativeOnDestroy();
+		stopSelf();
+	}
+
+};
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index d8538b29..0e171509 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -77,13 +77,16 @@
 		android:screenOrientation="sensorLandscape"
 		android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
 		android:windowSoftInputMode="adjustResize"
-		android:label="@string/app_name">
+		android:label="@string/app_name"
+		android:launchMode="singleTask">
                <intent-filter>
                         <action android:name="in.celest.xash3d.START" />
                         <category android:name="android.intent.category.DEFAULT" />
                 </intent-filter>
 	</activity>
-		<receiver android:name="in.celest.xash3d.InstallReceiver">
+	<service android:name="in.celest.xash3d.XashService" android:stopWithTask="false"/>
+	<receiver android:name="in.celest.xash3d.XashService$exitButtonListener" />
+	<receiver android:name="in.celest.xash3d.InstallReceiver">
 			<intent-filter android:priority="100">
 				<category android:name="android.intent.category.DEFAULT" />
 				<action android:name="android.intent.action.PACKAGE_ADDED"  />
diff --git a/unused/notify.xml b/unused/notify.xml
new file mode 100644
index 00000000..069cfa69
--- /dev/null
+++ b/unused/notify.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent" 
+    android:layout_height="fill_parent"
+    android:padding="5dp">
+
+    <ImageView android:id="@+id/status_icon"
+        android:layout_width="wrap_content" 
+        android:layout_height="fill_parent"
+        android:layout_alignParentLeft="true" 
+        android:layout_marginRight="10dp"/>
+
+ 
+
+    <RelativeLayout android:layout_width="fill_parent"
+        android:layout_height="fill_parent" 
+        android:layout_toRightOf="@id/status_icon">
+
+ 
+
+        <TextView android:id="@+id/status_text" 
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" 
+            android:layout_alignParentTop="true" />
+
+        <ProgressBar android:id="@+id/status_progress"
+            android:layout_width="fill_parent" 
+            android:layout_height="wrap_content"
+            android:layout_below="@id/status_text"
+            android:indeterminate="false" 
+            android:indeterminateOnly="false"
+            style="?android:attr/progressBarStyleHorizontal"  />
+
+ 
+
+ 
+
+    </RelativeLayout>
+
+ 
+
+</RelativeLayout>

From aaba1b6db99b0f2225f13797ecee35a92c61169a Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 24 Mar 2017 22:28:49 +0000
Subject: [PATCH 03/14] Update deploy script

---
 .travis.yml      |  2 +-
 travis-deploy.sh | 34 +++++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d0b47db..9638b330 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,4 +47,4 @@ script:
 
 after_script:
   - sh travis-upload.sh *.apk
-  - sh travis-deploy.sh *.apk
+  - sh travis-deploy.sh android-optimized *.apk
diff --git a/travis-deploy.sh b/travis-deploy.sh
index 02f725e2..d25eb197 100644
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -3,16 +3,36 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
  echo "Travis should not deploy from pull requests"
  exit 0
 else
+ SOURCE_NAME=$1
+ shift
  mkdir xash3d-travis
  cp -a $* xash3d-travis/
  cd xash3d-travis
  git init
- git config user.name mittorn
- git config user.email mittorn@sibmail.com
- git remote add travis-deploy-public https://mittorn:${GH_TOKEN}@github.com/mittorn/xash3d-travis.git
+ git config user.name FWGS-deployer
+ git config user.email FWGS-deployer@users.noreply.github.com
+ git remote add travis-deploy-public https://FWGS-deployer:${GH_TOKEN}@github.com/FWGS/xash3d-deploy.git
+ echo \# $TRAVIS_BRANCH branch autobuilds from $SOURCE_NAME >> README.md
+ echo >> README.md
+ echo Short changelog: >> README.md
+ echo \`\`\` >> README.md
+ (cd ..;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt`.. )| cut -d ' ' -f 1-3,5-100 >> README.md
+ echo \`\`\` >> README.md
+ echo >> README.md
+ echo [code on github]\(https://github.com/FWGS/xash3d-android-project/tree/$TRAVIS_COMMIT\) >> README.md
+ echo >> README.md
+ echo [full changelog for this build]\(https://github.com/FWGS/xash3d-android-project/commits/$TRAVIS_COMMIT\) >> README.md
+ echo >> README.md
+ for arg in $*; do
+  echo \* [$arg]\(https://github.com/FWGS/xash3d-deploy/blob/$SOURCE_NAME-$TRAVIS_BRANCH/$arg\?raw\=true\) >> README.md
+  echo >> README.md
+ done
+ echo $TRAVIS_COMMIT > commit.txt
  git add .
- git commit -m "Laterst travis android optimized deploy $TRAVIS_COMMIT"
- git checkout -b android-optimized-$TRAVIS_BRANCH
- git push --force travis-deploy-public android-optimized-$TRAVIS_BRANCH
+ git commit -m "Laterst travis deploy $TRAVIS_COMMIT"
+ git checkout -b $SOURCE_NAME-$TRAVIS_BRANCH
+ git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH
+ git checkout -b $SOURCE_NAME-latest
+ git push -q --force travis-deploy-public $SOURCE_NAME-latest
 fi
-exit 0
\ No newline at end of file
+exit 0

From fa43690519818c6d957d60c89fc6ddc481ab77fd Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 25 Mar 2017 20:58:20 +0000
Subject: [PATCH 04/14] Update deploy script again

---
 travis-deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis-deploy.sh b/travis-deploy.sh
index d25eb197..75633c3a 100644
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -31,8 +31,8 @@ else
  git add .
  git commit -m "Laterst travis deploy $TRAVIS_COMMIT"
  git checkout -b $SOURCE_NAME-$TRAVIS_BRANCH
- git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH
+ git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH > /dev/null 2>/dev/null
  git checkout -b $SOURCE_NAME-latest
- git push -q --force travis-deploy-public $SOURCE_NAME-latest
+ git push -q --force travis-deploy-public $SOURCE_NAME-latest > /dev/null 2>/dev/null
 fi
 exit 0

From b3777bd7c058782cc79771a3c1e163135412c7c7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 26 Mar 2017 22:11:27 +0000
Subject: [PATCH 05/14] Fix compatibility problems, add setTitle, setIcon

---
 AndroidManifest.xml                       |   2 +-
 jni/src/Xash3D/xash3d                     |   2 +-
 res/layout/notify.xml                     |  12 +-
 res/layout/notify_21.xml                  |  36 +++++
 src/in/celest/xash3d/JoystickHandler.java | 157 ------------------
 src/in/celest/xash3d/XashActivity.java    | 189 +++++++++++++++++++++-
 src/in/celest/xash3d/XashService.java     |  30 +++-
 test/AndroidManifest.xml                  |   4 +-
 8 files changed, 254 insertions(+), 178 deletions(-)
 create mode 100644 res/layout/notify_21.xml
 delete mode 100644 src/in/celest/xash3d/JoystickHandler.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 250816c5..5a1a2985 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,7 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="in.celest.xash3d.hl"
 	android:versionCode="531"
-	android:versionName="0.18.1"
+	android:versionName="0.19"
 	android:installLocation="auto">
 
 	<application android:label="@string/app_name"
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 8dcecbaa..d5db3fd8 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 8dcecbaac9204a87200f2ce7e95c2b8f23a7a616
+Subproject commit d5db3fd807075e21ea19bd99cf338fd829a1f921
diff --git a/res/layout/notify.xml b/res/layout/notify.xml
index 10087aa9..58336b04 100644
--- a/res/layout/notify.xml
+++ b/res/layout/notify.xml
@@ -3,12 +3,12 @@
 
         android:layout_width="fill_parent"
         android:layout_height="65sp"
-        android:orientation="horizontal" >
+		android:orientation="horizontal">
 
         <ImageView
           android:id="@+id/status_image"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
+		  android:layout_width="32sp"
+		  android:layout_height="32sp"
           android:src="@drawable/ic_launcher"
           android:layout_weight="00"
           android:layout_gravity="center_vertical" />
@@ -22,7 +22,7 @@
           android:singleLine="true"
           android:layout_weight="90"
           android:text="Xash3D"
-          android:layout_gravity="center_vertical" />
+		  android:layout_gravity="center_vertical"/>
          <Button
     android:id="@+id/status_exit_button"
     android:layout_width="wrap_content"
@@ -30,5 +30,5 @@
     android:text="Exit"
     android:layout_weight="0"
     android:layout_alignParentLeft="true"
-    android:layout_gravity="center_vertical" />
-      </LinearLayout>
\ No newline at end of file
+	android:layout_gravity="center_vertical" />
+      </LinearLayout>
diff --git a/res/layout/notify_21.xml b/res/layout/notify_21.xml
new file mode 100644
index 00000000..a57efb9b
--- /dev/null
+++ b/res/layout/notify_21.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+	  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+		android:layout_width="fill_parent"
+		android:layout_height="65sp"
+		android:orientation="horizontal"
+		android:background="#FFFFFF">
+
+		<ImageView
+		  android:id="@+id/status_image_21"
+		  android:src="@drawable/ic_launcher"
+		  android:layout_weight="00"
+		  android:layout_gravity="center_vertical"
+		  android:layout_width="32sp"
+		  android:layout_height="32sp"/>
+
+		<TextView
+		  android:id="@+id/status_text_21"
+		  android:layout_width="wrap_content"
+		  android:layout_height="wrap_content"
+		  android:layout_alignParentTop="true"
+		  android:layout_marginLeft="10dip"
+		  android:singleLine="true"
+		  android:layout_weight="90"
+		  android:text="Xash3D"
+		  android:layout_gravity="center_vertical"
+		  android:textColor="#000000"/>
+		 <Button
+	android:id="@+id/status_exit_button_21"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="Exit"
+	android:layout_weight="0"
+	android:layout_alignParentLeft="true"
+	android:layout_gravity="center_vertical" />
+	  </LinearLayout>
diff --git a/src/in/celest/xash3d/JoystickHandler.java b/src/in/celest/xash3d/JoystickHandler.java
deleted file mode 100644
index 3b205750..00000000
--- a/src/in/celest/xash3d/JoystickHandler.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package in.celest.xash3d;
-
-import android.app.*;
-import android.content.*;
-import android.view.*;
-import android.os.*;
-import android.util.*;
-import android.graphics.*;
-import android.text.method.*;
-import android.text.*;
-import android.media.*;
-import android.hardware.*;
-import android.content.*;
-import android.widget.*;
-import android.content.pm.*;
-
-import java.lang.*;
-import java.util.List;
-
-import in.celest.xash3d.hl.BuildConfig;
-import in.celest.xash3d.XashConfig;
-import in.celest.xash3d.XashActivity;
-
-
-class JoystickHandler
-{
-	public int getSource(KeyEvent event)
-	{
-		return InputDevice.SOURCE_UNKNOWN;
-	}
-	public int getSource(MotionEvent event)
-	{
-		return InputDevice.SOURCE_UNKNOWN;
-	}
-	public boolean handleAxis(MotionEvent event)
-	{
-		return false;
-	}
-	public boolean isGamepadButton(int keyCode)
-	{
-		return false;
-	}
-	public String keyCodeToString(int keyCode)
-	{
-		return String.valueOf(keyCode);
-	}
-	public void init()
-	{
-	}
-}
-
-class JoystickHandler_v12 extends JoystickHandler
-{
-	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
-	
-	@Override
-	public void init()
-	{
-		XashActivity.mSurface.setOnGenericMotionListener(new MotionListener());
-	}
-	
-	@Override
-	public int getSource(KeyEvent event) 
-	{
-		return event.getSource();
-	}
-	
-	@Override
-	public int getSource(MotionEvent event)
-	{
-		return event.getSource();
-	}
-	
-	@Override
-	public boolean handleAxis( MotionEvent event )
-	{		
-		// how event can be from null device, Android?
-		final InputDevice device = event.getDevice();
-		if( device == null )
-			return false;
-		
-		// maybe I need to cache this...
-		for( InputDevice.MotionRange range: device.getMotionRanges() )
-		{
-			// normalize in -1.0..1.0 (copied from SDL2)
-			final float cur = ( event.getAxisValue( range.getAxis(), event.getActionIndex() ) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
-			final float dead = range.getFlat(); // get axis dead zone
-			switch( range.getAxis() )
-			{
-			// typical axes
-			// move
-			case MotionEvent.AXIS_X:   
-				prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE,  prevSide, dead); 
-				break;
-			case MotionEvent.AXIS_Y: 
-				prevFwd  = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD,   prevFwd,  dead); 
-				break;
-			
-			// rotate. Invert, so by default this works as it's should
-			case MotionEvent.AXIS_Z: 
-				prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); 
-				break;
-			case MotionEvent.AXIS_RZ: 
-				prevYaw  = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW,   prevYaw,  dead); 
-				break;
-			
-			// trigger
-			case MotionEvent.AXIS_RTRIGGER:	
-				prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT,   dead); 
-				break;
-			case MotionEvent.AXIS_LTRIGGER:	
-				prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT,   dead); 
-				break;
-			
-			// hats
-			case MotionEvent.AXIS_HAT_X: 
-				prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX); 
-				break;
-			case MotionEvent.AXIS_HAT_Y: 
-				prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY); 
-				break;
-			}
-		}
-
-		return true;
-	}
-	
-	@Override
-	public boolean isGamepadButton(int keyCode)
-	{
-		return KeyEvent.isGamepadButton(keyCode);
-	}
-	
-	@Override
-	public String keyCodeToString(int keyCode)
-	{
-		return KeyEvent.keyCodeToString(keyCode);
-	}
-
-	class MotionListener implements View.OnGenericMotionListener
-	{
-		@Override
-		public boolean onGenericMotion(View view, MotionEvent event)
-		{
-			final int source = XashActivity.handler.getSource(event);
-			final int axisDevices = InputDevice.SOURCE_CLASS_JOYSTICK | InputDevice.SOURCE_GAMEPAD;
-			if( (source & axisDevices) != 0 )
-				return XashActivity.handler.handleAxis( event );
-			// TODO: Add it someday
-			// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
-			//	return XashActivity.handleBall( event );
-			//return super.onGenericMotion( view, event );
-			return false;
-		}
-	}
-}
- 
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 523a037f..2725037d 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -53,8 +53,9 @@ public class XashActivity extends Activity {
 	public static ImmersiveMode mImmersiveMode;
 	public static boolean keyboardVisible = false;
 	public static boolean mEngineReady = false;
-	
-	private static Vibrator mVibrator;
+	public static boolean mEnginePaused = false;
+	public static Vibrator mVibrator;
+
 	private static boolean mHasVibrator;
 	private int mReturingWithResultCode = 0;
 	
@@ -88,7 +89,6 @@ public class XashActivity extends Activity {
 		System.loadLibrary("xash");
 	}
 
-	
 	// Setup
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -230,6 +230,8 @@ public class XashActivity extends Activity {
 		if( mEngineReady )
 			nativeOnResume();
 
+		mEnginePaused = false;
+
 		super.onResume();
 	}
 	
@@ -417,9 +419,13 @@ public class XashActivity extends Activity {
 		mDecorView = getWindow().getDecorView();
 		
 		mVibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
-		mHasVibrator = ( mVibrator != null ) && ( mVibrator.hasVibrator() );
 
-		startService(new Intent(getBaseContext(), XashService.class));
+		mHasVibrator = ( mVibrator != null );
+		if( sdk >= 11 )
+			mHasVibrator = ( mVibrator != null ) && ( handler.hasVibrator() );
+
+		if( sdk >= 5 )
+			startService(new Intent(getBaseContext(), XashService.class));
 
 		mEngineReady = true;
 	}
@@ -768,6 +774,37 @@ public class XashActivity extends Activity {
 		mSingleton.runOnUiThread(new ShowTextInputTask(show));
 	}
 
+	public static void setIcon(String path)
+	{
+		Log.v(TAG,"setIcon("+path+")");
+		if( sdk < 5 )
+			return;
+		try{
+			BitmapFactory.Options o = new BitmapFactory.Options();
+			o.inJustDecodeBounds = true;
+			Bitmap icon = BitmapFactory.decodeFile(path,o);
+			if( icon.getWidth() < 16 )
+				return;
+			XashService.notification.contentView.setImageViewUri (XashService.status_image, Uri.parse("file://"+path));
+			((NotificationManager) mSingleton.getApplicationContext()
+							.getSystemService(Context.NOTIFICATION_SERVICE)).notify(100,XashService.notification);
+			}
+		catch( Exception e)
+		{
+		}
+	}
+
+	public static void setTitle(String title)
+	{
+		Log.v(TAG,"setTitle("+title+")");
+		if( sdk < 5 )
+			return;
+		XashService.notification.contentView.setTextViewText(XashService.status_text, title);
+		((NotificationManager) mSingleton.getApplicationContext()
+						.getSystemService(Context.NOTIFICATION_SERVICE)).notify(100,XashService.notification);
+
+	}
+
 }
 
 
@@ -827,6 +864,7 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
 		if( mEGL == null )
 			return;
 		XashActivity.nativeSetPause(0);
+		XashActivity.mEnginePaused = false;
 	}
 
 	// Called when we lose the surface
@@ -1300,3 +1338,144 @@ class ImmersiveMode_v19 extends ImmersiveMode
 
 	}
 }
+
+class JoystickHandler
+{
+	public int getSource(KeyEvent event)
+	{
+		return InputDevice.SOURCE_UNKNOWN;
+	}
+	public int getSource(MotionEvent event)
+	{
+		return InputDevice.SOURCE_UNKNOWN;
+	}
+	public boolean handleAxis(MotionEvent event)
+	{
+		return false;
+	}
+	public boolean isGamepadButton(int keyCode)
+	{
+		return false;
+	}
+	public String keyCodeToString(int keyCode)
+	{
+		return String.valueOf(keyCode);
+	}
+	public void init()
+	{
+	}
+	public boolean hasVibrator()
+	{
+		return true;
+	}
+}
+
+class JoystickHandler_v12 extends JoystickHandler
+{
+	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
+
+	@Override
+	public void init()
+	{
+		XashActivity.mSurface.setOnGenericMotionListener(new MotionListener());
+	}
+
+	@Override
+	public int getSource(KeyEvent event)
+	{
+		return event.getSource();
+	}
+
+	@Override
+	public int getSource(MotionEvent event)
+	{
+		return event.getSource();
+	}
+
+	@Override
+	public boolean handleAxis( MotionEvent event )
+	{
+		// how event can be from null device, Android?
+		final InputDevice device = event.getDevice();
+		if( device == null )
+			return false;
+
+		// maybe I need to cache this...
+		for( InputDevice.MotionRange range: device.getMotionRanges() )
+		{
+			// normalize in -1.0..1.0 (copied from SDL2)
+			final float cur = ( event.getAxisValue( range.getAxis(), event.getActionIndex() ) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
+			final float dead = range.getFlat(); // get axis dead zone
+			switch( range.getAxis() )
+			{
+			// typical axes
+			// move
+			case MotionEvent.AXIS_X:
+				prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE,  prevSide, dead);
+				break;
+			case MotionEvent.AXIS_Y:
+				prevFwd  = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD,   prevFwd,  dead);
+				break;
+
+			// rotate. Invert, so by default this works as it's should
+			case MotionEvent.AXIS_Z:
+				prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead);
+				break;
+			case MotionEvent.AXIS_RZ:
+				prevYaw  = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW,   prevYaw,  dead);
+				break;
+
+			// trigger
+			case MotionEvent.AXIS_RTRIGGER:
+				prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT,   dead);
+				break;
+			case MotionEvent.AXIS_LTRIGGER:
+				prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT,   dead);
+				break;
+
+			// hats
+			case MotionEvent.AXIS_HAT_X:
+				prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX);
+				break;
+			case MotionEvent.AXIS_HAT_Y:
+				prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY);
+				break;
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean isGamepadButton(int keyCode)
+	{
+		return KeyEvent.isGamepadButton(keyCode);
+	}
+
+	@Override
+	public String keyCodeToString(int keyCode)
+	{
+		return KeyEvent.keyCodeToString(keyCode);
+	}
+
+	class MotionListener implements View.OnGenericMotionListener
+	{
+		@Override
+		public boolean onGenericMotion(View view, MotionEvent event)
+		{
+			final int source = XashActivity.handler.getSource(event);
+			final int axisDevices = InputDevice.SOURCE_CLASS_JOYSTICK | InputDevice.SOURCE_GAMEPAD;
+			if( (source & axisDevices) != 0 )
+				return XashActivity.handler.handleAxis( event );
+			// TODO: Add it someday
+			// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
+			//	return XashActivity.handleBall( event );
+			//return super.onGenericMotion( view, event );
+			return false;
+		}
+	}
+	public boolean hasVibrator()
+	{
+		return XashActivity.mVibrator.hasVibrator();
+	}
+}
diff --git a/src/in/celest/xash3d/XashService.java b/src/in/celest/xash3d/XashService.java
index 71ef5f21..ced402e6 100644
--- a/src/in/celest/xash3d/XashService.java
+++ b/src/in/celest/xash3d/XashService.java
@@ -37,6 +37,9 @@ import in.celest.xash3d.CertCheck;
 
 
 public class XashService  extends Service {
+	public static Notification notification;
+	public static int status_image = R.id.status_image;
+	public static int status_text = R.id.status_text;
 
 	@Override
 	public IBinder onBind(Intent intent) {
@@ -52,26 +55,37 @@ public class XashService  extends Service {
 
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
+
+		int status_exit_button = R.id.status_exit_button;
+		int notify = R.layout.notify;
+		if( XashActivity.sdk >= 21 )
+		{
+			status_image = R.id.status_image_21;
+			status_text = R.id.status_text_21;
+			status_exit_button = R.id.status_exit_button_21;
+			notify = R.layout.notify_21;
+		}
 		Log.d("XashService", "Service Started");
 		Intent intent_ = new Intent(this, XashActivity.class);
 		intent_.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 		final PendingIntent pendingIntent = PendingIntent.getActivity(
 			getApplicationContext(), 0, intent_, 0);
-		Notification notification = new Notification(R.drawable.ic_launcher,
+		notification = new Notification(R.drawable.ic_launcher,
 										"Xash3D", System.currentTimeMillis());
+
 		notification.contentView = new RemoteViews(getApplicationContext()
-												   .getPackageName(),  R.layout.notify);
+												   .getPackageName(),  notify);
 		notification.contentIntent = pendingIntent;
 				notification.flags = notification.flags
 			| Notification.FLAG_ONGOING_EVENT | Notification.FLAG_FOREGROUND_SERVICE;
 
 
-		notification.contentView.setTextViewText(R.id.status_text, "Xash3D");
+		notification.contentView.setTextViewText(status_text, "Xash3D Engine");
 	Intent exitIntent = new Intent(this, exitButtonListener.class);
 	PendingIntent pendingExitIntent = PendingIntent.getBroadcast(this, 0,
 			exitIntent, 0);
 
-		notification.contentView.setOnClickPendingIntent(R.id.status_exit_button, pendingExitIntent);
+		notification.contentView.setOnClickPendingIntent(status_exit_button, pendingExitIntent);
 		startForeground(100, notification);
 		return START_NOT_STICKY;
 	}
@@ -91,8 +105,12 @@ public class XashService  extends Service {
 	@Override
 	public void onTaskRemoved(Intent rootIntent) {
 		Log.e("XashService", "OnTaskRemoved");
-		XashActivity.nativeUnPause();
-		XashActivity.nativeOnDestroy();
+		if( XashActivity.mEngineReady )
+		{
+			XashActivity.mEngineReady = false;
+			XashActivity.nativeUnPause();
+			XashActivity.nativeOnDestroy();
+		}
 		stopSelf();
 	}
 
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 0e171509..158465c1 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -5,8 +5,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="in.celest.xash3d.hl.test"
       android:versionCode="1"
-      android:versionName="0.18.1-beta"
-      android:installLocation="auto">
+	  android:versionName="0.19"
+	  android:installLocation="auto">
 
     <!-- Create a Java class extending SDLActivity and place it in a
          directory under src matching the package, e.g.

From 9613276658c5a0379a323721978dd3bf644a0631 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 28 Mar 2017 22:47:19 +0000
Subject: [PATCH 06/14] Disable gnustl_static when not needed

---
 jni/Application.mk    | 3 +--
 jni/src/Xash3D/xash3d | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 7138c14c..0adb14a7 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -10,8 +10,6 @@ else
 APP_PLATFORM := android-9
 endif
 
-APP_STL := gnustl_static
-
 # if non-zero, works only if single ABI selected
 XASH_THREAD_NUM ?= 0
 
@@ -41,6 +39,7 @@ APP_ABI := x86 armeabi armeabi-v7a-hard
 
 APP_MODULES := xash menu client server NanoGL gpgs_support
 ifeq ($(GOOGLE_PLAY_BUILD),1)
+	APP_STL := gnustl_static
 	APP_MODULES += libgpg-1
 	CFLAGS_OPT += -DGOOGLE_PLAY_BUILD
 endif
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index d5db3fd8..4baf8e58 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit d5db3fd807075e21ea19bd99cf338fd829a1f921
+Subproject commit 4baf8e58a95255bda04ef6e03ec1d01665e80c4a

From a4745e06fcefbe8cd1feee1742a9e6914bdbb771 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 28 Mar 2017 23:32:39 +0000
Subject: [PATCH 07/14] Android id support

---
 jni/src/Xash3D/xash3d                  |  2 +-
 src/in/celest/xash3d/XashActivity.java | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 4baf8e58..579bc578 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 4baf8e58a95255bda04ef6e03ec1d01665e80c4a
+Subproject commit 579bc57809441c9e939c65f6233bf51b883f043e
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 2725037d..af700197 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -34,6 +34,7 @@ import in.celest.xash3d.hl.BuildConfig;
 import in.celest.xash3d.XashConfig;
 import in.celest.xash3d.JoystickHandler;
 import in.celest.xash3d.CertCheck;
+import android.provider.Settings.Secure;
 
 /**
  Xash Activity
@@ -805,6 +806,26 @@ public class XashActivity extends Activity {
 
 	}
 
+	public static String getAndroidID()
+	{
+		String str = Secure.getString( mSingleton.getContentResolver(), Secure.ANDROID_ID );
+		if( str == null )
+			return "";
+		return str;
+	}
+
+	public static String loadID()
+	{
+		return mPref.getString("xash_id", "");
+	}
+
+	public static void saveID(String id)
+	{
+		SharedPreferences.Editor editor = mPref.edit();
+
+		editor.putString( "xash_id", id );
+		editor.commit();
+	}
 }
 
 

From 99454bac95fe67892d936ec8089284f2e719a4b9 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Wed, 29 Mar 2017 20:01:18 +0000
Subject: [PATCH 08/14] Update projects

---
 jni/src/Xash3D/xash3d | 2 +-
 jni/src/hlsdk-xash3d  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 579bc578..c11e4073 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 579bc57809441c9e939c65f6233bf51b883f043e
+Subproject commit c11e4073ee9485719cf3efba9669871a66e62b51
diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d
index 21317e7d..e099224b 160000
--- a/jni/src/hlsdk-xash3d
+++ b/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit 21317e7da39a8c74b3690ccb4713e6e6d2ed2556
+Subproject commit e099224bc5948dd604632f1602017b99cb29cc90

From fbcf7758bf085624a2bdf0d60030a8420e24a31c Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 30 Mar 2017 00:25:51 +0000
Subject: [PATCH 09/14] Mouse support (nvidia extension)

---
 jni/src/Xash3D/xash3d                  |  2 +-
 src/in/celest/xash3d/XashActivity.java | 76 ++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index c11e4073..768ccae7 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit c11e4073ee9485719cf3efba9669871a66e62b51
+Subproject commit 768ccae780dc4b51ed7492e2041a6b8762920ac7
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index af700197..07999e9a 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -26,6 +26,7 @@ import android.database.*;
 import android.view.inputmethod.*;
 
 import java.lang.*;
+import java.lang.reflect.*;
 import java.util.List;
 import java.security.MessageDigest;
 
@@ -487,6 +488,7 @@ public class XashActivity extends Activity {
 	public static native void nativeAxis(int id, byte axis, short value);
 	public static native void nativeJoyButton(int id, byte button, boolean down);
 	public static native int  nativeTestWritePermission( String path );
+	public static native void nativeMouseMove( float x, float y );
 	
 	// for future expansion
 	public static native void nativeBall(int id, byte ball, short xrel, short yrel);
@@ -826,6 +828,11 @@ public class XashActivity extends Activity {
 		editor.putString( "xash_id", id );
 		editor.commit();
 	}
+
+	public static void showMouse( int show )
+	{
+		handler.showMouse( show != 0 );
+	}
 }
 
 
@@ -1389,16 +1396,71 @@ class JoystickHandler
 	{
 		return true;
 	}
+	public void showMouse( boolean show )
+	{
+	}
+}
+
+class Wrap_NVMouseExtensions{
+   private static Object inputManager;
+   private static Method mInputManager_setCursorVisibility;
+   private static int nMotionEvent_AXIS_RELATIVE_X = 0;
+   private static int nMotionEvent_AXIS_RELATIVE_Y = 0;
+
+
+   //**************************************************************************
+   static {
+	  try { mInputManager_setCursorVisibility =
+			Class.forName("android.hardware.input.InputManager").getMethod("setCursorVisibility", boolean.class);
+			inputManager = XashActivity.mSingleton.getSystemService("input");
+	  }
+	  catch (Exception ex) { }
+
+
+
+
+	  /* DO THE SAME FOR RELATIVEY */
+   }
+   //**************************************************************************
+   public static void checkAvailable() throws Exception {
+	 Field fieldMotionEvent_AXIS_RELATIVE_X = MotionEvent.class.getField("AXIS_RELATIVE_X");
+	 nMotionEvent_AXIS_RELATIVE_X = (Integer)fieldMotionEvent_AXIS_RELATIVE_X.get(null);
+	Field fieldMotionEvent_AXIS_RELATIVE_Y = MotionEvent.class.getField("AXIS_RELATIVE_Y");
+	nMotionEvent_AXIS_RELATIVE_Y = (Integer)fieldMotionEvent_AXIS_RELATIVE_Y.get(null);
+
+	};
+
+   //**************************************************************************
+   public static void setCursorVisibility(boolean fVisibility) {
+	  try { mInputManager_setCursorVisibility.invoke(inputManager, fVisibility); }
+	  catch (Exception e)
+	{
+	}
+   }
+
+   //**************************************************************************
+   public static int getAxisRelativeX() { return nMotionEvent_AXIS_RELATIVE_X; };
+   public static int getAxisRelativeY() { return nMotionEvent_AXIS_RELATIVE_Y; };
 }
 
 class JoystickHandler_v12 extends JoystickHandler
 {
 	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
 
+	public static boolean mNVMouseExtensions = false;
+
+	static {
+	   try { Wrap_NVMouseExtensions.checkAvailable();
+			 mNVMouseExtensions = true;
+	   }
+	   catch (Throwable t) { mNVMouseExtensions = false; }
+	}
+
 	@Override
 	public void init()
 	{
 		XashActivity.mSurface.setOnGenericMotionListener(new MotionListener());
+		Log.d(XashActivity.TAG, "mNVMouseExtensions = " + mNVMouseExtensions );
 	}
 
 	@Override
@@ -1488,6 +1550,15 @@ class JoystickHandler_v12 extends JoystickHandler
 			final int axisDevices = InputDevice.SOURCE_CLASS_JOYSTICK | InputDevice.SOURCE_GAMEPAD;
 			if( (source & axisDevices) != 0 )
 				return XashActivity.handler.handleAxis( event );
+			if( (source & InputDevice.SOURCE_MOUSE) != 0 && mNVMouseExtensions )
+			{
+				float x = event.getAxisValue(Wrap_NVMouseExtensions.getAxisRelativeX(), 0);
+				float y = event.getAxisValue(Wrap_NVMouseExtensions.getAxisRelativeY(), 0);
+
+				XashActivity.nativeMouseMove( x, y );
+				Log.v("XashInput", "MouseMove: " +x + " " + y );
+				return true;
+			}
 			// TODO: Add it someday
 			// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
 			//	return XashActivity.handleBall( event );
@@ -1499,4 +1570,9 @@ class JoystickHandler_v12 extends JoystickHandler
 	{
 		return XashActivity.mVibrator.hasVibrator();
 	}
+	public void showMouse( boolean show )
+	{
+		if( mNVMouseExtensions )
+			Wrap_NVMouseExtensions.setCursorVisibility( show );
+	}
 }

From f51e6ab1e2d6512364aef0b20e774231046e2115 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 30 Mar 2017 19:58:11 +0000
Subject: [PATCH 10/14] Proper mouse handling on nvidia devices

---
 jni/src/Xash3D/xash3d                  |  2 +-
 src/in/celest/xash3d/XashActivity.java | 70 ++++++++++++++++++++++----
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 768ccae7..7eeb1baa 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 768ccae780dc4b51ed7492e2041a6b8762920ac7
+Subproject commit 7eeb1baab6b4b5c5d86eb9594bbfab92d8219c17
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 07999e9a..010cafb6 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -57,6 +57,7 @@ public class XashActivity extends Activity {
 	public static boolean mEngineReady = false;
 	public static boolean mEnginePaused = false;
 	public static Vibrator mVibrator;
+	public static boolean fMouseShown = true;
 
 	private static boolean mHasVibrator;
 	private int mReturingWithResultCode = 0;
@@ -831,6 +832,7 @@ public class XashActivity extends Activity {
 
 	public static void showMouse( int show )
 	{
+		fMouseShown = show != 0;
 		handler.showMouse( show != 0 );
 	}
 }
@@ -1229,6 +1231,8 @@ class EngineTouchListener_v1 implements View.OnTouchListener{
 }
 
 class EngineTouchListener_v5 implements View.OnTouchListener{
+	float lx=0, ly=0;
+	boolean secondarypressed = false;
 	// Touch events
 	public boolean onTouch(View v, MotionEvent event)
 	{
@@ -1239,8 +1243,19 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 		int mouseButton;
 		int i = -1;
 		float x,y;
+
 			switch(action) {
 				case MotionEvent.ACTION_MOVE:
+					if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 )
+					{
+						x = event.getX();
+						y = event.getY();
+
+						XashActivity.nativeMouseMove(x - lx, y -ly);
+						lx = x;
+						ly = y;
+						return;
+					}
 					for (i = 0; i < pointerCount; i++) {
 						pointerFingerId = event.getPointerId(i);
 						x = event.getX(i);
@@ -1248,13 +1263,32 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 						XashActivity.nativeTouch(pointerFingerId, 2, x, y);
 					}
 					break;
-
-				case MotionEvent.ACTION_UP:
-				case MotionEvent.ACTION_DOWN:
-					// Primary pointer up/down, the index is always zero
-					i = 0;
 				case MotionEvent.ACTION_POINTER_UP:
 				case MotionEvent.ACTION_POINTER_DOWN:
+				case MotionEvent.ACTION_UP:
+				case MotionEvent.ACTION_DOWN:
+					 if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 )
+					 {
+						lx = event.getX();
+						ly = event.getY();
+						boolean down = action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN;
+						if( down && (event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0 )
+						{
+							XashActivity.nativeKey( 1,-243 );
+							secondarypressed = true;
+							return true;
+						}
+						else if( !down && secondarypressed  && (event.getButtonState() & MotionEvent.BUTTON_SECONDARY) == 0 )
+						{
+							secondarypressed = false;
+							XashActivity.nativeKey( 0,-243 );
+							return true;
+						}
+						XashActivity.nativeKey( down?1:0,-241 );
+						return true;
+					}
+					i = 0;
+
 					// Non primary pointer up/down
 					if (i == -1) {
 						i = event.getActionIndex();
@@ -1404,8 +1438,8 @@ class JoystickHandler
 class Wrap_NVMouseExtensions{
    private static Object inputManager;
    private static Method mInputManager_setCursorVisibility;
-   private static int nMotionEvent_AXIS_RELATIVE_X = 0;
-   private static int nMotionEvent_AXIS_RELATIVE_Y = 0;
+   public static int nMotionEvent_AXIS_RELATIVE_X = 0;
+   public static int nMotionEvent_AXIS_RELATIVE_Y = 0;
 
 
    //**************************************************************************
@@ -1548,17 +1582,35 @@ class JoystickHandler_v12 extends JoystickHandler
 		{
 			final int source = XashActivity.handler.getSource(event);
 			final int axisDevices = InputDevice.SOURCE_CLASS_JOYSTICK | InputDevice.SOURCE_GAMEPAD;
-			if( (source & axisDevices) != 0 )
-				return XashActivity.handler.handleAxis( event );
+
 			if( (source & InputDevice.SOURCE_MOUSE) != 0 && mNVMouseExtensions )
 			{
 				float x = event.getAxisValue(Wrap_NVMouseExtensions.getAxisRelativeX(), 0);
 				float y = event.getAxisValue(Wrap_NVMouseExtensions.getAxisRelativeY(), 0);
+				switch (event.getAction()) {
+				  case MotionEvent.ACTION_SCROLL:
+					if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0.0f)
+					{
+					  XashActivity.nativeKey(1,-239);
+					  XashActivity.nativeKey(0,-239);
+					  return true;
+					}
+					else
+					  {
+						XashActivity.nativeKey(1,-240);
+						XashActivity.nativeKey(0,-240);
+					  }
+					return true;
+				}
 
 				XashActivity.nativeMouseMove( x, y );
 				Log.v("XashInput", "MouseMove: " +x + " " + y );
 				return true;
 			}
+
+			if( (source & axisDevices) != 0 )
+				return XashActivity.handler.handleAxis( event );
+
 			// TODO: Add it someday
 			// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
 			//	return XashActivity.handleBall( event );

From 236586eed5a277ebf29d00244b7c2c2d04c1f4ac Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 30 Mar 2017 21:39:08 +0000
Subject: [PATCH 11/14] Fix build

---
 jni/src/Xash3D/xash3d                  | 2 +-
 src/in/celest/xash3d/XashActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 7eeb1baa..74189412 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 7eeb1baab6b4b5c5d86eb9594bbfab92d8219c17
+Subproject commit 74189412984298bbbb56b6912c108345ef05dc60
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 010cafb6..3f92d729 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -1254,7 +1254,7 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 						XashActivity.nativeMouseMove(x - lx, y -ly);
 						lx = x;
 						ly = y;
-						return;
+						return true;
 					}
 					for (i = 0; i < pointerCount; i++) {
 						pointerFingerId = event.getPointerId(i);

From 58cd129055380dc59060a27dbc30ccbcaab5f784 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 30 Mar 2017 23:14:56 +0000
Subject: [PATCH 12/14] Update engine

---
 jni/src/Xash3D/xash3d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 74189412..00801a7d 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 74189412984298bbbb56b6912c108345ef05dc60
+Subproject commit 00801a7d1b918ff1829e1392c77da6d2fa012ebb

From 8fcb6ca12812c5030db40be2de549a49113e246b Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 30 Mar 2017 23:32:27 +0000
Subject: [PATCH 13/14] Fix compatibility again

---
 src/in/celest/xash3d/XashActivity.java | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 3f92d729..ece432cf 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -403,10 +403,12 @@ public class XashActivity extends Activity {
 		SurfaceHolder holder = mSurface.getHolder();
 		holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 
-				if( sdk < 12 ) 
-			handler = new JoystickHandler();
-		else 
+		if( sdk >= 14 )
+			handler = new JoystickHandler_v14();
+		else if( sdk >= 12 )
 			handler = new JoystickHandler_v12();
+		else 
+			handler = new JoystickHandler();
 		handler.init();
 		
 		mPixelFormat = mPref.getInt("pixelformat", 0);
@@ -1272,13 +1274,14 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 						lx = event.getX();
 						ly = event.getY();
 						boolean down = action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN;
-						if( down && (event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0 )
+						int buttonState = XashActivity.handler.getButtonState( event );
+						if( down && (buttonState & MotionEvent.BUTTON_SECONDARY) != 0 )
 						{
 							XashActivity.nativeKey( 1,-243 );
 							secondarypressed = true;
 							return true;
 						}
-						else if( !down && secondarypressed  && (event.getButtonState() & MotionEvent.BUTTON_SECONDARY) == 0 )
+						else if( !down && secondarypressed  && (buttonState & MotionEvent.BUTTON_SECONDARY) == 0 )
 						{
 							secondarypressed = false;
 							XashActivity.nativeKey( 0,-243 );
@@ -1433,6 +1436,10 @@ class JoystickHandler
 	public void showMouse( boolean show )
 	{
 	}
+	public int getButtonState( MotionEvent event)
+	{
+		return 0;
+	}
 }
 
 class Wrap_NVMouseExtensions{
@@ -1628,3 +1635,11 @@ class JoystickHandler_v12 extends JoystickHandler
 			Wrap_NVMouseExtensions.setCursorVisibility( show );
 	}
 }
+
+class JoystickHandler_v14 extends JoystickHandler_v12
+{
+	public int getButtonState( MotionEvent event )
+	{
+		return event.getButtonState();
+	}
+};

From 17ce2695130443682ef862c3970c728b15c7b189 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 31 Mar 2017 18:34:08 +0000
Subject: [PATCH 14/14] Restore pointer action checks

---
 jni/src/Xash3D/xash3d                  | 2 +-
 src/in/celest/xash3d/XashActivity.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 00801a7d..5c455714 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 00801a7d1b918ff1829e1392c77da6d2fa012ebb
+Subproject commit 5c455714a5bc60f4fa05a826e7d2f8e18e403f2d
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index ece432cf..f2fc398c 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -1265,8 +1265,6 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 						XashActivity.nativeTouch(pointerFingerId, 2, x, y);
 					}
 					break;
-				case MotionEvent.ACTION_POINTER_UP:
-				case MotionEvent.ACTION_POINTER_DOWN:
 				case MotionEvent.ACTION_UP:
 				case MotionEvent.ACTION_DOWN:
 					 if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 )
@@ -1292,6 +1290,9 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 					}
 					i = 0;
 
+				case MotionEvent.ACTION_POINTER_UP:
+				case MotionEvent.ACTION_POINTER_DOWN:
+
 					// Non primary pointer up/down
 					if (i == -1) {
 						i = event.getActionIndex();