From a0b0c6154f815214fd87f93ba4fa176d06bf6be8 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Fri, 29 Apr 2016 21:22:34 +0300
Subject: [PATCH 01/83] First step.Edited layout.

---
 res/layout/activity_launcher.xml | 357 ++++++++++++++++++++++++-------
 1 file changed, 275 insertions(+), 82 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 25f073de..3fc3d774 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -1,94 +1,287 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:paddingLeft="@dimen/activity_horizontal_margin"
-	android:paddingRight="@dimen/activity_horizontal_margin"
-	android:orientation="vertical"
-	tools:context="in.celest.xash3d.LauncherActivity"
-	android:id="@+id/layout_shortcut">
-	<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="match_parent"
-		android:layout_weight="1.0">
-		<LinearLayout
-			xmlns:android="http://schemas.android.com/apk/res/android"
-			xmlns:tools="http://schemas.android.com/tools"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_shortcut"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#252525"
+    android:weightSum="1"
+    tools:context="in.celest.xash3d.LauncherActivity">
 
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:text="@string/cmd_args_text"
-				android:id="@+id/textView_args" />
+    <TextView
+        android:id="@+id/textView_tittle"
+        android:layout_width="fill_parent"
+        android:layout_height="50dp"
+        android:layout_marginBottom="1dp"
+        android:layout_marginLeft="5dp"
+        android:background="#555555"
+        android:layout_marginRight="5dp"
+        android:layout_marginTop="20dp"
+        android:text="@string/launcher_name"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="25sp"
+        android:drawableLeft="@drawable/ic_launcher"
+        android:drawablePadding="10dp"
+        android:singleLine="true"
+        android:gravity="center_vertical" />
 
-			<EditText
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/cmdArgs" />
+    <TabHost
+        android:id="@+id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1.20"
+        android:paddingBottom="10dp"
+        android:paddingLeft="3dp"
+        android:paddingRight="3dp"
+        android:paddingTop="8dp">
 
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:text="@string/text_res_path"
-				android:id="@+id/textView_path" />
-			<EditText
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/cmdPath" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#555555"
+            android:orientation="vertical">
 
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/select_folder"
-				android:id="@+id/button_select"
-				android:onClick="selectFolder" />
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:showDividers="middle"></TabWidget>
 
-			<CheckBox
-				android:layout_height="wrap_content"
-				android:layout_width="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:text="@string/use_volume"
-				android:id="@+id/useVolume"/>
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/scrollView2" >
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                >
 
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/about_button"
-				android:id="@+id/button"
-				android:onClick="aboutXash" />
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/create_shortcut_button"
-				android:id="@+id/button"
-				android:onClick="createShortcut" />
+                <LinearLayout
+                    android:id="@+id/tab1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="25dp"
+                    android:background="#333333"
+                    android:orientation="vertical"
+                    android:text="@string/text_tab1"
+                    android:weightSum="0.6">
 
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="0dp"
-				android:id="@+id/textView7"
-				android:layout_gravity="center_horizontal"
-				android:layout_weight="1"
-				android:clickable="false" />
-		</LinearLayout>
-	</ScrollView>
+                    <TextView
+                        android:id="@+id/textView_path1"
+                        android:layout_width="fill_parent"
+                        android:layout_height="40dp"
+                        android:layout_marginBottom="2dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="#444444"
+                        android:layout_marginRight="10dp"
+                        android:layout_marginTop="10dp"
+                        android:text="@string/text_res_tittle2"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="20sp"
+                        android:gravity="center_vertical|center_horizontal" />
 
-	<Button
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/launch_button"
-		android:id="@+id/button_launch"
-		android:onClick="startXash"
-		android:layout_column="6"
-		android:layout_gravity="right"
-		android:layout_weight="0.0" />
+                    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                        xmlns:tools="http://schemas.android.com/tools"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_marginTop="10dp"
+                        android:background="#444444"
+                        android:orientation="vertical"
+                        android:weightSum="1">
+
+
+                        <ToggleButton
+                            android:id="@+id/useVolume"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="10dp"
+                            android:text="nothing"
+                            android:textOff="@string/no_volume"
+                            android:textOn="@string/use_volume" />
+
+                        <!--<CheckBox-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:layout_width="match_parent"-->
+                        <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
+                        <!--android:text="@string/use_volume"-->
+                        <!--android:id="@+id/useVolume"/>-->
+
+                        <!--<CheckBox-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:layout_width="match_parent"-->
+                        <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
+                        <!--android:text="@string/tracking"-->
+                        <!--android:id="@+id/Tracking"/>-->
+
+
+
+                        <Button
+                            android:id="@+id/button_select"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginRight="10dp"
+                            android:onClick="selectFolder"
+                            android:text="@string/select_folder" />
+
+
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/tab2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginTop="15dp"
+                    android:background="#333333"
+                    android:orientation="vertical"
+                    android:text="@string/text_tab2">
+
+                    <TextView
+                        android:id="@+id/textView_path2"
+                        android:layout_width="fill_parent"
+                        android:layout_height="40dp"
+                        android:layout_marginBottom="2dp"
+                        android:layout_marginLeft="10dp"
+                        android:background="#444444"
+                        android:layout_marginRight="10dp"
+                        android:layout_marginTop="13dp"
+                        android:text="@string/text_res_tittle3"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="20sp"
+                        android:gravity="center_vertical|center_horizontal" />
+
+                    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                        xmlns:tools="http://schemas.android.com/tools"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_marginTop="10dp"
+                        android:background="#444444"
+                        android:orientation="vertical"
+                        android:weightSum="1">
+
+                        <TextView
+                            android:id="@+id/textView_args"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="20dp"
+                            android:text="@string/cmd_args_text"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                        <EditText
+                            android:id="@+id/cmdArgs"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp" />
+
+                        <TextView
+                            android:id="@+id/textView_path"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp"
+                            android:text="@string/text_res_path"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                        <EditText
+                            android:id="@+id/cmdPath"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp" />
+
+
+                        <Button
+                            android:id="@+id/button"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="10dp"
+                            android:onClick="createShortcut"
+                            android:text="@string/create_shortcut_button" />
+
+                        <TextView
+                            android:id="@+id/textView7"
+                            android:layout_marginBottom="10dp"
+                            android:layout_width="fill_parent"
+                            android:layout_height="0dp"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_weight="1"
+                            android:clickable="false" />
+                    </LinearLayout>
+                </LinearLayout>
+
+
+            </FrameLayout>
+
+            </ScrollView>
+        </LinearLayout>
+
+    </TabHost>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="#444444"
+        android:layout_marginBottom="-20dp"
+        android:paddingTop="5dp"
+        android:layout_gravity="bottom"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+
+            android:onClick="aboutXash"
+            android:text="@string/about_button" />
+
+        <Button
+            android:id="@+id/button_launch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="6"
+            android:layout_marginLeft="0dp"
+            android:layout_weight="0.87"
+            android:onClick="startXash"
+            android:text="@string/launch_button" />
+
+    </LinearLayout>
 
 
 </LinearLayout>

From a7993ad1c3c7bfe39b5e60fcb50e009b23e63b9b Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Fri, 29 Apr 2016 21:29:56 +0300
Subject: [PATCH 02/83] Added some java code for tabwork

---
 src/in/celest/xash3d/LauncherActivity.java | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 6d3f98bb..850b9b60 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -23,13 +23,15 @@ import android.os.Environment;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.io.File;
+import android.widget.TabHost;
+import android.widget.ToggleButton;
 
 import in.celest.xash3d.hl.R;
 
 public class LauncherActivity extends Activity {
    // public final static String ARGV = "in.celest.xash3d.MESSAGE";
 	static EditText cmdArgs;
-	static CheckBox useVolume;
+	static ToggleButton useVolume;
 	static EditText resPath;
 	static SharedPreferences mPref;
 	String getDefaultPath()
@@ -43,13 +45,29 @@ public class LauncherActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_launcher);
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+	TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
+
+	tabHost.setup();
+
+	TabHost.TabSpec tabSpec;
+	tabSpec = tabHost.newTabSpec("tabtag1");
+	tabSpec.setIndicator(getString(R.string.text_tab1));
+	tabSpec.setContent(R.id.tab1);
+	tabHost.addTab(tabSpec);
+	
+	tabSpec = tabHost.newTabSpec("tabtag2");
+	tabSpec.setIndicator(getString(R.string.text_tab2));
+	tabSpec.setContent(R.id.tab2);
+	tabHost.addTab(tabSpec);
+	
         Button selectFolder = ( Button ) findViewById( R.id.button_select );
 		if ( Build.VERSION.SDK_INT < 21 )
 			selectFolder.setVisibility( View.GONE );
 		mPref = getSharedPreferences("engine", 0);
 		cmdArgs = (EditText)findViewById(R.id.cmdArgs);
 		cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
-		useVolume = ( CheckBox ) findViewById( R.id.useVolume );
+		useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
 		useVolume.setChecked(mPref.getBoolean("usevolume",true));
 		resPath = ( EditText ) findViewById( R.id.cmdPath );
 		resPath.setText(mPref.getString("basedir", getDefaultPath()));

From 4560bd68a0e76cfd593a7e2483d94397783dc5b5 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Fri, 29 Apr 2016 21:32:26 +0300
Subject: [PATCH 03/83] Strings update

---
 res/values/strings.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ae4746be..34f83e1c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7,8 +7,6 @@
 
     <string name="launch_button">Launch Xash3D!</string>
     <string name="cmd_args_text">Command line arguments(experts only)</string>
-	<string name="use_controls">Enable touch controls</string>
-	<string name="use_volume">Use volume keys</string>
 	<string name="text_res_path">Path to game resources</string>
 	<string name="touch_set">Controls settings</string>
 	<string name="text_shortcut">Xash3D shortcut</string>
@@ -38,4 +36,11 @@ Special thanks to:\n
     <string name="about_button">About Xash3D Android</string>
     <string name="create_shortcut_button">Create mod shortcut</string>
     <string name="select_folder">(select)</string>
+    
+    <string name="text_tab1">Normal</string>
+    <string name="text_tab2">Advanced</string>
+    <string name="text_res_tittle2">Normal settings</string>
+    <string name="text_res_tittle3">Advanced settings</string>
+    <string name="use_volume">Gamepad support off!</string>
+    <string name="no_volume">Gamepad support active!</string>
 </resources>

From 631c9c46c07a37fe2f4a9f78375ee5f1c7b2e79c Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Fri, 29 Apr 2016 21:43:56 +0300
Subject: [PATCH 04/83] Import miss

---
 src/in/celest/xash3d/LauncherActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 850b9b60..884e6b2b 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -8,6 +8,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.content.Intent;
+import android.view.Window;
 import android.widget.EditText;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;

From 806509297622e39cc91abf7f505dbae9a203dd7f Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Fri, 29 Apr 2016 22:01:59 +0300
Subject: [PATCH 05/83] Illegal call fix

---
 src/in/celest/xash3d/LauncherActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 884e6b2b..eb91ab50 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -45,8 +45,9 @@ public class LauncherActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_launcher);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_launcher);
+     
 	TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
 
 	tabHost.setup();

From 45bf7fa4538d13c1c484414e5fb63abc84f7a74a Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 03:13:28 +0300
Subject: [PATCH 06/83] Added folderpicker layout files

---
 res/layout/activity_fpicker.xml | 28 +++++++++++++++++++++++
 res/layout/row.xml              | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 res/layout/activity_fpicker.xml
 create mode 100644 res/layout/row.xml

diff --git a/res/layout/activity_fpicker.xml b/res/layout/activity_fpicker.xml
new file mode 100644
index 00000000..ea67d93b
--- /dev/null
+++ b/res/layout/activity_fpicker.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="in.celest.xash3dVR.FPicker">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/FileView"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_above="@+id/button2" />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/folder"
+        android:id="@+id/button2"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:onClick="onFileClick" />
+</RelativeLayout>
diff --git a/res/layout/row.xml b/res/layout/row.xml
new file mode 100644
index 00000000..ba8d9339
--- /dev/null
+++ b/res/layout/row.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="5dip"
+    android:background="#333333" android:orientation="vertical" android:layout_width="fill_parent">
+    <ImageView
+        android:id="@+id/fd_Icon1"
+        android:layout_width="40dip"
+        android:layout_height="40dip" >
+    </ImageView>
+
+    <TextView android:text="@+id/filename"
+        android:id="@+id/filename"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textStyle="bold"
+        android:layout_toRightOf="@+id/fd_Icon1"
+        android:layout_marginTop="5dip"
+        android:layout_marginLeft="5dip">
+    </TextView>
+    <TextView android:text="@+id/fileitems"
+        android:id="@+id/fileitems"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/fd_Icon1"
+        android:layout_below="@+id/filename"
+        android:layout_marginLeft="10dip">
+
+    </TextView>
+    <TextView android:text="@+id/filedate"
+        android:id="@+id/filedate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/filename"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="5dip">
+    </TextView>
+</RelativeLayout>
\ No newline at end of file

From 726eab44d92a31148c645a5265857d6eff4487fb Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 03:15:27 +0300
Subject: [PATCH 07/83] Fpicker classes

---
 src/in/celest/xash3d/FPicker.java | 194 ++++++++++++++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 src/in/celest/xash3d/FPicker.java

diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
new file mode 100644
index 00000000..e486bd91
--- /dev/null
+++ b/src/in/celest/xash3d/FPicker.java
@@ -0,0 +1,194 @@
+package in.celest.xash3d;
+//Created by Solexid
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Environment;
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.File;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import in.celest.xash3d.hl.R;
+
+public class FPicker extends Activity {
+    private File currentDir;
+    private FileArrayAdapter adapter;
+    static ListView delta;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_fpicker);
+        String path = Environment.getExternalStorageDirectory().toString();
+        currentDir = new File(path);
+
+        fill(currentDir);
+    }
+
+    private void fill(File folder)
+    {
+        File[]dirs = folder.listFiles();
+        this.setTitle("Current Dir: "+folder.getName());
+        List<Item> dir = new ArrayList<Item>();
+
+            for(File ff: dirs)
+            {
+                Date lastModDate = new Date(ff.lastModified());
+                DateFormat formater = DateFormat.getDateTimeInstance();
+                String date_modify = formater.format(lastModDate);
+                if(ff.isDirectory()){
+                boolean isXashDir=false;
+
+                    File[] fbuf = ff.listFiles();
+                    int buf = 0;
+                    if(fbuf != null&&fbuf.length<20){
+                        buf = fbuf.length;
+                        for (File valves: fbuf) {
+                            if (valves.isDirectory()) {
+                                if(valves.getName().contains("valve"))isXashDir=true;
+                            }
+                        }
+                    }
+                    String num_item = String.valueOf(buf);
+                    if(buf == 0) num_item = "Some items";
+                    else num_item +=" items";
+                    if(isXashDir){
+                         dir.add(new Item(ff.getName(),num_item,date_modify,ff.getAbsolutePath(),R.drawable.ic_launcher));
+
+                    }else {
+                        dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.folder));
+                    }}
+            }
+
+        Collections.sort(dir);
+        if(folder.getName().length()>1)
+            dir.add(0,new Item("..","Parent Directory","",folder.getParent(),R.drawable.folder));
+        adapter = new FileArrayAdapter(FPicker.this,R.layout.row,dir);
+        delta = (ListView)findViewById(R.id.FileView);
+        delta.setAdapter(adapter);
+        delta.setOnItemClickListener(new AdapterView.OnItemClickListener( ){
+            @Override
+            public void onItemClick(AdapterView<?> parent , View v, int position, long id) {
+            Item o = adapter.getItem(position);
+             currentDir = new File(o.getPath());
+             fill(currentDir);
+
+        }
+        });
+    }
+    public void onFileClick(View v)
+    {
+        Toast.makeText(this, "Chosen path : " + currentDir, Toast.LENGTH_SHORT).show();
+        Intent intent = new Intent();
+        intent.putExtra("GetPath",currentDir.toString());
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+
+
+}
+class FileArrayAdapter extends ArrayAdapter<Item> {
+
+    private Context c;
+    private int id;
+    private List<Item>items;
+
+    public FileArrayAdapter(Context context, int textViewResourceId,
+                            List<Item> objects) {
+        super(context, textViewResourceId, objects);
+        c = context;
+        id = textViewResourceId;
+        items = objects;
+    }
+    public Item getItem(int i)
+    {
+        return items.get(i);
+    }
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View v = convertView;
+        if (v == null) {
+            LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            v = vi.inflate(id, null);
+        }
+
+
+        final Item finstance = items.get(position);
+        if (finstance != null) {
+            TextView filename = (TextView) v.findViewById(R.id.filename);
+            TextView fileitems = (TextView) v.findViewById(R.id.fileitems);
+            TextView filedate = (TextView) v.findViewById(R.id.filedate);
+            ImageView imageicon = (ImageView) v.findViewById(R.id.fd_Icon1);
+
+
+            Drawable image = c.getResources().getDrawable(finstance.getImage());
+            imageicon.setImageDrawable(image);
+
+            if(filename!=null)
+                filename.setText(finstance.getName());
+            if(fileitems!=null)
+                fileitems.setText(finstance.getData());
+            if(filedate!=null)
+                filedate.setText(finstance.getDate());
+        }
+        return v;
+    }
+}
+class Item implements Comparable<Item>{
+    private String name;
+    private String data;
+    private String date;
+    private String path;
+    private int image;
+
+    public Item(String n,String d, String dt, String p, int img)
+    {
+        name = n;
+        data = d;
+        date = dt;
+        path = p;
+        image = img;
+    }
+    public String getName()
+    {
+        return name;
+    }
+    public String getData()
+    {
+        return data;
+    }
+    public String getDate()
+    {
+        return date;
+    }
+    public String getPath()
+    {
+        return path;
+    }
+    public int getImage() {
+        return image;
+    }
+    public int compareTo(Item o) {
+        if(this.name != null)
+            return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
+        else
+            throw new IllegalArgumentException();
+    }
+}

From 0cffe3afe994fba9de8da9fe5ddba13f63122682 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 03:18:32 +0300
Subject: [PATCH 08/83] Added button to launcher

---
 src/in/celest/xash3d/LauncherActivity.java | 40 +++++++++++++---------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index eb91ab50..f50d7bb8 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -64,15 +64,15 @@ public class LauncherActivity extends Activity {
 	tabHost.addTab(tabSpec);
 	
         Button selectFolder = ( Button ) findViewById( R.id.button_select );
-		if ( Build.VERSION.SDK_INT < 21 )
-			selectFolder.setVisibility( View.GONE );
-		mPref = getSharedPreferences("engine", 0);
-		cmdArgs = (EditText)findViewById(R.id.cmdArgs);
-		cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
-		useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
-		useVolume.setChecked(mPref.getBoolean("usevolume",true));
-		resPath = ( EditText ) findViewById( R.id.cmdPath );
-		resPath.setText(mPref.getString("basedir", getDefaultPath()));
+//		if ( Build.VERSION.SDK_INT < 21 )
+//			selectFolder.setVisibility( View.GONE );
+	mPref = getSharedPreferences("engine", 0);
+	cmdArgs = (EditText)findViewById(R.id.cmdArgs);
+	cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
+	useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
+	useVolume.setChecked(mPref.getBoolean("usevolume",true));
+	resPath = ( EditText ) findViewById( R.id.cmdPath );
+	resPath.setText(mPref.getString("basedir", getDefaultPath()));
 	}
     
     public void startXash(View view)
@@ -106,20 +106,26 @@ public class LauncherActivity extends Activity {
 
 	public void selectFolder(View view)
 	{
-		Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT_TREE");
+		Intent intent = new Intent(this, in.celest.xash3d.FPicker.class);
+		//intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+	//	Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT_TREE");
 		startActivityForResult(intent, 42);
 		resPath.setEnabled(false);
 	}
 
-	public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
+public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
 		if (resultCode == RESULT_OK) {
 try{
-			final List<String> paths = resultData.getData().getPathSegments();
-			String[] parts = paths.get(1).split(":");
-			String storagepath = Environment.getExternalStorageDirectory().getPath() + "/";
-			String path = storagepath + parts[1];
-			if( path != null)
-				resPath.setText( path );
+
+		resPath = ( EditText ) findViewById( R.id.cmdPath );
+		resPath.setText( resultData.getStringExtra("GetPath"));
+
+//	final List<String> paths = resultData.getData().getPathSegments();
+//			String[] parts = paths.get(1).split(":");
+//			String storagepath = Environment.getExternalStorageDirectory().getPath() + "/";
+//			String path = storagepath + parts[1];
+//			if( path != null)
+//				resPath.setText( path );
 			resPath.setEnabled(true);
 		}
 		catch(Exception e)

From 6ebca5c3302cc5fd3fe21c7af2d5df2c7c02419d Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 03:25:20 +0300
Subject: [PATCH 09/83] Fix missing string.

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 34f83e1c..19b742ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,4 +43,5 @@ Special thanks to:\n
     <string name="text_res_tittle3">Advanced settings</string>
     <string name="use_volume">Gamepad support off!</string>
     <string name="no_volume">Gamepad support active!</string>
+    <string name="folder">Set current folder</string>
 </resources>

From 9a98aeb95888ed7114d43839b6d08c191c75d2e7 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 03:37:23 +0300
Subject: [PATCH 10/83] Update activity_fpicker.xml

---
 res/layout/activity_fpicker.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/layout/activity_fpicker.xml b/res/layout/activity_fpicker.xml
index ea67d93b..b97efbde 100644
--- a/res/layout/activity_fpicker.xml
+++ b/res/layout/activity_fpicker.xml
@@ -13,8 +13,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:id="@+id/FileView"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
         android:layout_above="@+id/button2" />
 
     <Button

From 5ef65c1d5becdf071f3902b9eb4a36392efc78d5 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 10:42:14 +0300
Subject: [PATCH 11/83] Update FPicker.java

---
 src/in/celest/xash3d/FPicker.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index e486bd91..aab4dd6e 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Environment;
-import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;

From 4f1bc7d68a795b7937b855712f9f5ce7b8366f91 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 10:43:34 +0300
Subject: [PATCH 12/83] Icon for folder

---
 res/drawable/folder.png | Bin 0 -> 2958 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable/folder.png

diff --git a/res/drawable/folder.png b/res/drawable/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..36703b06d6e2098192d85f05c1989e2428c28b1b
GIT binary patch
literal 2958
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

literal 0
HcmV?d00001


From 19de6ce5ff39033bfdd5b011ae03b2b5f72d2df3 Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 11:02:23 +0300
Subject: [PATCH 13/83] Update AndroidManifest.xml

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 902189a6..871eaa10 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,7 +68,7 @@
 			android:screenOrientation="landscape"
 			android:label="@string/app_name">
 		</activity> 
-		
+		<activity android:name="in.celest.xash3d.FPicker"></activity>
 		<receiver android:name="in.celest.xash3d.InstallReceiver">
 			<intent-filter android:priority="100">
 				<category android:name="android.intent.category.DEFAULT" />

From cc21b87045d31f78efa09d3dad14b1c9028150ae Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 11:05:12 +0300
Subject: [PATCH 14/83] Update project.properties

---
 project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.properties b/project.properties
index c052cd8f..6e18427a 100644
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-13
+target=android-21

From 156171d77afd1997a8c47437fca0799c36eb81fc Mon Sep 17 00:00:00 2001
From: Solexid <solexid@gmail.com>
Date: Sun, 1 May 2016 11:37:36 +0300
Subject: [PATCH 15/83] Update AndroidManifest.xml

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 871eaa10..68975318 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,7 +86,7 @@
 	</application>
 
 	<!-- Some devices with Android 2.2 should support native activity, it was in unstable hidden API -->
-	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="13" />
+	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
 
 	<!-- OpenGL ES 1.1 -->
 	<uses-feature android:glEsVersion="0x00010000" /> 

From 80a1f6c4c8aca8ced90c468c7f3a0f0a5897bb3f Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 1 May 2016 12:53:36 +0000
Subject: [PATCH 16/83] Autodetect legacy/material

---
 src/in/celest/xash3d/FPicker.java          | 3 +++
 src/in/celest/xash3d/LauncherActivity.java | 3 +++
 src/in/celest/xash3d/ShortcutActivity.java | 3 +++
 test/AndroidManifest.xml                   | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index aab4dd6e..0ded80af 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Environment;
 import android.os.Bundle;
+import android.os.Build;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,6 +35,8 @@ public class FPicker extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if ( Build.VERSION.SDK_INT >= 21 )
+            super.setTheme( 0x01030224 );
         setContentView(R.layout.activity_fpicker);
         String path = Environment.getExternalStorageDirectory().toString();
         currentDir = new File(path);
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index f50d7bb8..8db18b09 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -46,6 +46,9 @@ public class LauncherActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        //super.setTheme( 0x01030005 );
+        if ( Build.VERSION.SDK_INT >= 21 )
+		super.setTheme( 0x01030224 );
         setContentView(R.layout.activity_launcher);
      
 	TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 6533c07a..377fbc3b 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -21,6 +21,9 @@ public class ShortcutActivity extends Activity
 	protected void onCreate(Bundle bundle)
 	{
 		super.onCreate(bundle);
+		//material dialog
+		if ( Build.VERSION.SDK_INT >= 21 )
+			super.setTheme( 0x01030225 );
 		setContentView(R.layout.activity_shortcut);
 		Intent intent=getIntent();
 		name = (EditText)findViewById(R.id.shortcut_name);
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 8adec5f6..43af11e4 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -54,6 +54,8 @@
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
+	<activity android:name="in.celest.xash3d.FPicker"></activity>
+
 	<activity android:name="org.libsdl.app.SDLActivity"
 	   android:screenOrientation="sensorLandscape"
 	   android:configChanges="orientation|screenSize"

From bc1d9fed7f643a5b1234b94b555a437643480c36 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 1 May 2016 13:05:28 +0000
Subject: [PATCH 17/83] Fix NullPointerExveption

---
 src/in/celest/xash3d/FPicker.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index 0ded80af..61f011f0 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -47,6 +47,13 @@ public class FPicker extends Activity {
     private void fill(File folder)
     {
         File[]dirs = folder.listFiles();
+        while( dirs == null )
+        {
+            folder = new File(folder.getParent());
+            if( folder == null )
+                return;
+            dirs = folder.listFiles();
+        }
         this.setTitle("Current Dir: "+folder.getName());
         List<Item> dir = new ArrayList<Item>();
 

From 285c11522dad1b646c9ab456bca71e9c453ec603 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 2 May 2016 21:37:39 +0000
Subject: [PATCH 18/83] Update branches

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

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 0bfac664..b0de4002 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 0bfac664a3de49044356a17515cdf8a17f5e2817
+Subproject commit b0de40024992fb7f7ecb40e4bacc5cb7484e06bc
diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d
index 5d96c43c..1706490b 160000
--- a/jni/src/hlsdk-xash3d
+++ b/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit 5d96c43c65f4e26dbcbbcaffeb265a6353a245b4
+Subproject commit 1706490b2078cb45c35d25ebc46b1e96c6abcc38
diff --git a/xash-extras b/xash-extras
index 58d6e0d9..3e0b87b9 160000
--- a/xash-extras
+++ b/xash-extras
@@ -1 +1 @@
-Subproject commit 58d6e0d91034a8b44491c017972b88d7eddaf91f
+Subproject commit 3e0b87b9e2c66ae8d80686f44d540e36f9753b35

From 76cac2a3526ca15cc5209e9be884637186f6dd22 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 3 May 2016 22:24:07 +0000
Subject: [PATCH 19/83] Restore build without sdl (only graphics output
 supported)

---
 AndroidManifest.xml                    |   6 +
 jni/Application.mk                     |   2 +-
 src/in/celest/xash3d/XashActivity.java | 495 +++++++++++++++++++++++++
 test/AndroidManifest.xml               |   9 +-
 4 files changed, 509 insertions(+), 3 deletions(-)
 create mode 100644 src/in/celest/xash3d/XashActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 68975318..457c5100 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,6 +67,12 @@
 		<activity android:name="in.celest.xash3d.XashActivity"
 			android:screenOrientation="landscape"
 			android:label="@string/app_name">
+			<intent-filter>
+
+			<action android:name="in.celest.xash3d.XashActivity"/>
+			<action android:name="android.intent.action.MAIN" />
+			<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
 		</activity> 
 		<activity android:name="in.celest.xash3d.FPicker"></activity>
 		<receiver android:name="in.celest.xash3d.InstallReceiver">
diff --git a/jni/Application.mk b/jni/Application.mk
index 299cb32e..2cac9797 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -3,7 +3,7 @@
 # See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
 #APP_STL := stlport_static 
 
-XASH_SDL ?= 1
+XASH_SDL ?= 0
 
 ifeq ($(XASH_SDL),1)
 APP_PLATFORM := android-12
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
new file mode 100644
index 00000000..9ac647ac
--- /dev/null
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -0,0 +1,495 @@
+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.Log;
+import android.graphics.*;
+import android.text.method.*;
+import android.text.*;
+import android.media.*;
+import android.hardware.*;
+import android.content.*;
+
+import java.lang.*;
+
+/**
+ SDL Activity
+ */
+public class XashActivity extends Activity {
+
+    // Main components
+    protected static XashActivity mSingleton;
+    private static EngineSurface mSurface;
+    private static String mArgv;
+
+    // Audio
+    private static Thread mAudioThread;
+    private static AudioTrack mAudioTrack;
+    // Load the .so
+    static {
+        System.loadLibrary("xash");
+    }
+
+    // Setup
+    protected void onCreate(Bundle savedInstanceState) {
+        //Log.v("SDL", "onCreate()");
+        super.onCreate(savedInstanceState);
+
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+        Intent intent = getIntent();
+      //  mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
+        // Set up the surface
+        mSurface = new EngineSurface(getApplication());
+        setContentView(mSurface);
+        SurfaceHolder holder = mSurface.getHolder();
+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+        setenv( "XASH3D_BASEDIR", "/sdcard/xash", true );
+    }
+
+    // Events
+    protected void onPause() {
+        //Log.v("SDL", "onPause()");
+        super.onPause();
+    }
+
+    protected void onResume() {
+        //Log.v("SDL", "onResume()");
+        super.onResume();
+    }
+
+    // Messages from the SDLMain thread
+    static int COMMAND_CHANGE_TITLE = 1;
+
+    // Handler for the messages
+    Handler commandHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            if (msg.arg1 == COMMAND_CHANGE_TITLE) {
+                setTitle((String)msg.obj);
+            }
+        }
+    };
+
+    // Send a message from the SDLMain thread
+    void sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        commandHandler.sendMessage(msg);
+    }
+    public static String[] getArguments()
+    {
+
+
+        return "-dev 5 -log -noch".split(" ");
+    }
+    // C functions we call
+    public static native int nativeInit(Object arguments);
+    public static native void nativeQuit();
+    public static native void onNativeResize(int x, int y);
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x, 
+                                            float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void nativeRunAudioThread();
+    public static native int setenv(String key, String value, boolean overwrite);
+
+
+    // Java functions called from C
+
+    public static boolean createGLContext() {
+        return mSurface.InitGL();
+    }
+
+    public static void swapBuffers() {
+        mSurface.SwapBuffers();
+    }
+
+    public static void setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    public static Context getContext() {
+        return mSingleton;
+    }
+
+    // Audio
+    private static Object buf;
+
+    public static Object audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
+
+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + ((float)sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+        // Let the user pick a larger buffer if they really want -- but ye
+        // gods they probably shouldn't, the minimums are horrifyingly high
+        // latency already
+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
+
+        mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
+									 channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+
+        audioStartThread();
+
+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + ((float)mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+        if (is16Bit) {
+            buf = new short[desiredFrames * (isStereo ? 2 : 1)];
+        } else {
+            buf = new byte[desiredFrames * (isStereo ? 2 : 1)]; 
+        }
+        return buf;
+    }
+
+    public static void audioStartThread() {
+        mAudioThread = new Thread(new Runnable() {
+				public void run() {
+					mAudioTrack.play();
+					nativeRunAudioThread();
+				}
+			});
+
+        // I'd take REALTIME if I could get it!
+        mAudioThread.setPriority(Thread.MAX_PRIORITY);
+        mAudioThread.start();
+    }
+
+    public static void audioWriteShortBuffer(short[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w("SDL", "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+
+    public static void audioWriteByteBuffer(byte[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w("SDL", "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+
+    public static void audioQuit() {
+        if (mAudioThread != null) {
+            try {
+                mAudioThread.join();
+            } catch(Exception e) {
+                Log.v("SDL", "Problem stopping audio thread: " + e);
+            }
+            mAudioThread = null;
+
+            //Log.v("SDL", "Finished waiting for audio thread");
+        }
+
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+            mAudioTrack = null;
+        }
+    }
+}
+
+/**
+ Simple nativeInit() runnable
+ */
+class XashMain implements Runnable {
+    public void run() {
+        // Runs SDL_main()
+		XashActivity.createGLContext();
+
+        XashActivity.nativeInit(XashActivity.getArguments());
+
+        //Log.v("SDL", "SDL thread terminated");
+    }
+}
+
+
+/**
+ SDLSurface. This is what we draw on, so we need to know when it's created
+ in order to do anything useful. 
+
+ Because of this, that's where we set up the SDL thread
+ */
+class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, 
+View.OnKeyListener, View.OnTouchListener  {
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    private Thread mEngThread;    
+
+    // EGL private objects
+    private EGLContext  mEGLContext;
+    private EGLSurface  mEGLSurface;
+    private EGLDisplay  mEGLDisplay;
+
+    // Sensors
+
+    // Startup    
+    public EngineSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this); 
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this); 
+        setOnTouchListener(this);   
+    }
+
+    // Called when we have a valid drawing surface
+    public void surfaceCreated(SurfaceHolder holder) {
+        //Log.v("SDL", "surfaceCreated()");
+    }
+
+    // Called when we lose the surface
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        //Log.v("SDL", "surfaceDestroyed()");
+
+        // Send a quit message to the application
+        XashActivity.nativeQuit();
+
+        // Now wait for the SDL thread to quit
+        if (mEngThread != null) {
+            try {
+                mEngThread.join();
+            } catch(Exception e) {
+                Log.v("SDL", "Problem stopping thread: " + e);
+            }
+            mEngThread = null;
+
+            //Log.v("SDL", "Finished waiting for SDL thread");
+        }
+    }
+
+    // Called when the surface is resized
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        //Log.v("SDL", "surfaceChanged()");
+/*
+        int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default
+        switch (format) {
+			case PixelFormat.A_8:
+				Log.v("SDL", "pixel format A_8");
+				break;
+			case PixelFormat.LA_88:
+				Log.v("SDL", "pixel format LA_88");
+				break;
+			case PixelFormat.L_8:
+				Log.v("SDL", "pixel format L_8");
+				break;
+			case PixelFormat.RGBA_4444:
+				Log.v("SDL", "pixel format RGBA_4444");
+				sdlFormat = 0x85421002; // SDL_PIXELFORMAT_RGBA4444
+				break;
+			case PixelFormat.RGBA_5551:
+				Log.v("SDL", "pixel format RGBA_5551");
+				sdlFormat = 0x85441002; // SDL_PIXELFORMAT_RGBA5551
+				break;
+			case PixelFormat.RGBA_8888:
+				Log.v("SDL", "pixel format RGBA_8888");
+				sdlFormat = 0x86462004; // SDL_PIXELFORMAT_RGBA8888
+				break;
+			case PixelFormat.RGBX_8888:
+				Log.v("SDL", "pixel format RGBX_8888");
+				sdlFormat = 0x86262004; // SDL_PIXELFORMAT_RGBX8888
+				break;
+			case PixelFormat.RGB_332:
+				Log.v("SDL", "pixel format RGB_332");
+				sdlFormat = 0x84110801; // SDL_PIXELFORMAT_RGB332
+				break;
+			case PixelFormat.RGB_565:
+				Log.v("SDL", "pixel format RGB_565");
+				sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565
+				break;
+			case PixelFormat.RGB_888:
+				Log.v("SDL", "pixel format RGB_888");
+				// Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
+				sdlFormat = 0x86161804; // SDL_PIXELFORMAT_RGB888
+				break;
+			default:
+				Log.v("SDL", "pixel format unknown " + format);
+				break;
+        }*/
+        
+        
+        XashActivity.onNativeResize(width, height);
+        // Now start up the C app thread
+        if (mEngThread == null) {
+			
+            mEngThread = new Thread(new XashMain(), "EngineThread"); 
+            mEngThread.start();       
+        }
+    }
+
+    // unused
+    public void onDraw(Canvas canvas) {}
+
+
+    // EGL functions
+    public boolean InitGL() {
+
+        try {
+            EGL10 egl = (EGL10)EGLContext.getEGL();
+
+            EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+
+            int[] version = new int[2];
+            egl.eglInitialize(dpy, version);
+			
+            int[] configSpec = {
+                EGL10.EGL_DEPTH_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   8,
+                EGL10.EGL_GREEN_SIZE,   8,
+                EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_RENDERABLE_TYPE, 1,
+                EGL10.EGL_NONE
+            };
+            EGLConfig[] configs = new EGLConfig[1];
+            int[] num_config = new int[1];
+            if (!egl.eglChooseConfig(dpy, configSpec, configs, 1, num_config) || num_config[0] == 0) {
+                Log.e("SDL", "No EGL config available");
+                return false;
+            }
+            EGLConfig config = configs[0];
+
+            int EGL_CONTEXT_CLIENT_VERSION=0x3098;
+            int contextAttrs[] = new int[]
+            {
+                EGL_CONTEXT_CLIENT_VERSION, 1,
+                EGL10.EGL_NONE
+            }; 
+            EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
+            if (ctx == EGL10.EGL_NO_CONTEXT) {
+                Log.e("SDL", "Couldn't create context");
+                return false;
+            }
+
+            EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null);
+            if (surface == EGL10.EGL_NO_SURFACE) {
+                Log.e("SDL", "Couldn't create surface");
+                return false;
+            }
+
+            if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) {
+                Log.e("SDL", "Couldn't make context current");
+                return false;
+            }
+
+            mEGLContext = ctx;
+            mEGLDisplay = dpy;
+            mEGLSurface = surface;
+
+        } catch(Exception e) {
+            Log.v("SDL", e + "");
+            for (StackTraceElement s : e.getStackTrace()) {
+                Log.v("SDL", s.toString());
+            }
+        }
+
+        return true;
+    }
+
+    // EGL buffer flip
+    public void SwapBuffers() {
+        try {
+            EGL10 egl = (EGL10)EGLContext.getEGL();
+
+            egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
+
+            // drawing here
+
+            egl.eglWaitGL();
+
+            egl.eglSwapBuffers(mEGLDisplay, mEGLSurface);
+
+
+        } catch(Exception e) {
+            Log.v("SDL", "flipEGL(): " + e);
+            for (StackTraceElement s : e.getStackTrace()) {
+                Log.v("SDL", s.toString());
+            }
+        }
+    }
+
+    // Key events
+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            //Log.v("SDL", "key down: " + keyCode);
+            //XashActivity.controlInterp.onKeyDown(keyCode, event);
+            return true;
+        }
+        else if (event.getAction() == KeyEvent.ACTION_UP) {
+            //Log.v("SDL", "key up: " + keyCode);
+           // XashActivity.controlInterp.onKeyUp(keyCode, event);
+            return true;
+        }
+        return false;
+    }
+
+    // Touch events
+    public boolean onTouch(View v, MotionEvent event) {
+			/*
+			final int touchDevId = event.getDeviceId();
+			final int pointerCount = event.getPointerCount();
+			// touchId, pointerId, action, x, y, pressure
+			int actionPointerIndex = event.getActionIndex();
+			int pointerFingerId = event.getPointerId(actionPointerIndex);
+			int action = event.getActionMasked();
+
+			float x = event.getX(actionPointerIndex);
+			float y = event.getY(actionPointerIndex);
+			float p = event.getPressure(actionPointerIndex);
+
+			if (action == MotionEvent.ACTION_MOVE && pointerCount > 1) {
+                // TODO send motion to every pointer if its position has
+                // changed since prev event.
+                for (int i = 0; i < pointerCount; i++) {
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i);
+                    y = event.getY(i);
+                    p = event.getPressure(i);
+                    XashActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                }
+			} else {
+                XashActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+			}
+        }*/
+        //XashActivity.controlInterp.onTouchEvent(event);
+		return true;
+	} 
+
+}
+
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 43af11e4..456202d2 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -73,10 +73,15 @@
 			<category android:name="android.intent.category.DEFAULT" />
 		</intent-filter>
 	</activity>
-	<!--<activity android:name="in.celest.xash3d.XashActivity"
+	<activity android:name="in.celest.xash3d.XashActivity"
 		android:screenOrientation="landscape"
 		android:label="@string/app_name">
-	</activity> -->
+		<intent-filter>
+			<action android:name="org.libsdl.app.SDLActivity"/>
+			<action android:name="android.intent.action.MAIN" />
+			<category android:name="android.intent.category.LAUNCHER" />
+		</intent-filter>
+	</activity>
 		<receiver android:name="in.celest.xash3d.InstallReceiver">
 			<intent-filter android:priority="100">
 				<category android:name="android.intent.category.DEFAULT" />

From cd81aa82ea9dde22eb077aa738cf1417501b3dc5 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Wed, 4 May 2016 21:02:09 +0000
Subject: [PATCH 20/83] Improve launch, fix touch

---
 src/in/celest/xash3d/XashActivity.java | 93 ++++++++++++++++++--------
 1 file changed, 64 insertions(+), 29 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 9ac647ac..3cb3a1c8 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -28,7 +28,10 @@ public class XashActivity extends Activity {
     // Main components
     protected static XashActivity mSingleton;
     private static EngineSurface mSurface;
-    private static String mArgv;
+    private static String mArgv[];
+
+    	// Preferences
+    public static SharedPreferences mPref = null;
 
     // Audio
     private static Thread mAudioThread;
@@ -52,7 +55,44 @@ public class XashActivity extends Activity {
         setContentView(mSurface);
         SurfaceHolder holder = mSurface.getHolder();
         holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
-        setenv( "XASH3D_BASEDIR", "/sdcard/xash", true );
+		mPref = this.getSharedPreferences("engine", 0);
+		String argv = intent.getStringExtra("argv");
+		if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
+		if(argv == null) argv = "-dev 3 -log";
+		mArgv= argv.split(" ");
+		String gamelibdir = intent.getStringExtra("gamelibdir");
+		if(gamelibdir == null)
+			gamelibdir = getFilesDir().getParentFile().getPath() + "/lib";
+		String gamedir = intent.getStringExtra("gamedir");
+		if(gamedir == null)
+			gamedir = "valve";
+		String basedir = intent.getStringExtra("basedir");
+		if(basedir == null)
+			basedir = mPref.getString("basedir","/sdcard/xash/");
+
+		setenv("XASH3D_BASEDIR", basedir, true);
+		setenv("XASH3D_ENGLIBDIR", getFilesDir().getParentFile().getPath() + "/lib", true);
+		setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
+		setenv("XASH3D_GAMEDIR", gamedir, true);
+
+		//extractPAK(this, false);
+		setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
+		String pakfile = intent.getStringExtra("pakfile");
+		if( pakfile != null && pakfile != "" )
+			setenv("XASH3D_EXTRAS_PAK2", pakfile, true);
+		String[] env = intent.getStringArrayExtra("env");
+		try
+		{
+			if( env != null )
+			for(int i = 0; i+1 < env.length; i+=2)
+			{
+				setenv(env[i],env[i+1], true);
+			}
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
     }
 
     // Events
@@ -89,7 +129,7 @@ public class XashActivity extends Activity {
     {
 
 
-        return "-dev 5 -log -noch".split(" ");
+        return "-dev 5 -log +map crossfire -noch +deathmatch 1 +map crossfire".split(" ");
     }
     // C functions we call
     public static native int nativeInit(Object arguments);
@@ -97,9 +137,9 @@ public class XashActivity extends Activity {
     public static native void onNativeResize(int x, int y);
     public static native void onNativeKeyDown(int keycode);
     public static native void onNativeKeyUp(int keycode);
-    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
-                                            int action, float x, 
-                                            float y, float p);
+    public static native void nativeTouch(int pointerFingerId,
+                                            int action, float x,
+                                            float y);
     public static native void onNativeAccel(float x, float y, float z);
     public static native void nativeRunAudioThread();
     public static native int setenv(String key, String value, boolean overwrite);
@@ -149,7 +189,7 @@ public class XashActivity extends Activity {
         if (is16Bit) {
             buf = new short[desiredFrames * (isStereo ? 2 : 1)];
         } else {
-            buf = new byte[desiredFrames * (isStereo ? 2 : 1)]; 
+            buf = new byte[desiredFrames * (isStereo ? 2 : 1)];
         }
         return buf;
     }
@@ -239,15 +279,15 @@ class XashMain implements Runnable {
 
 /**
  SDLSurface. This is what we draw on, so we need to know when it's created
- in order to do anything useful. 
+ in order to do anything useful.
 
  Because of this, that's where we set up the SDL thread
  */
-class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, 
+class EngineSurface extends SurfaceView implements SurfaceHolder.Callback,
 View.OnKeyListener, View.OnTouchListener  {
 
     // This is what SDL runs in. It invokes SDL_main(), eventually
-    private Thread mEngThread;    
+    private Thread mEngThread;
 
     // EGL private objects
     private EGLContext  mEGLContext;
@@ -256,16 +296,16 @@ View.OnKeyListener, View.OnTouchListener  {
 
     // Sensors
 
-    // Startup    
+    // Startup
     public EngineSurface(Context context) {
         super(context);
-        getHolder().addCallback(this); 
+        getHolder().addCallback(this);
 
         setFocusable(true);
         setFocusableInTouchMode(true);
         requestFocus();
-        setOnKeyListener(this); 
-        setOnTouchListener(this);   
+        setOnKeyListener(this);
+        setOnTouchListener(this);
     }
 
     // Called when we have a valid drawing surface
@@ -342,14 +382,14 @@ View.OnKeyListener, View.OnTouchListener  {
 				Log.v("SDL", "pixel format unknown " + format);
 				break;
         }*/
-        
-        
+
+
         XashActivity.onNativeResize(width, height);
         // Now start up the C app thread
         if (mEngThread == null) {
-			
-            mEngThread = new Thread(new XashMain(), "EngineThread"); 
-            mEngThread.start();       
+
+            mEngThread = new Thread(new XashMain(), "EngineThread");
+            mEngThread.start();
         }
     }
 
@@ -367,7 +407,7 @@ View.OnKeyListener, View.OnTouchListener  {
 
             int[] version = new int[2];
             egl.eglInitialize(dpy, version);
-			
+
             int[] configSpec = {
                 EGL10.EGL_DEPTH_SIZE,   8,
                 EGL10.EGL_RED_SIZE,   8,
@@ -389,7 +429,7 @@ View.OnKeyListener, View.OnTouchListener  {
             {
                 EGL_CONTEXT_CLIENT_VERSION, 1,
                 EGL10.EGL_NONE
-            }; 
+            };
             EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
             if (ctx == EGL10.EGL_NO_CONTEXT) {
                 Log.e("SDL", "Couldn't create context");
@@ -461,7 +501,6 @@ View.OnKeyListener, View.OnTouchListener  {
 
     // Touch events
     public boolean onTouch(View v, MotionEvent event) {
-			/*
 			final int touchDevId = event.getDeviceId();
 			final int pointerCount = event.getPointerCount();
 			// touchId, pointerId, action, x, y, pressure
@@ -471,7 +510,6 @@ View.OnKeyListener, View.OnTouchListener  {
 
 			float x = event.getX(actionPointerIndex);
 			float y = event.getY(actionPointerIndex);
-			float p = event.getPressure(actionPointerIndex);
 
 			if (action == MotionEvent.ACTION_MOVE && pointerCount > 1) {
                 // TODO send motion to every pointer if its position has
@@ -480,16 +518,13 @@ View.OnKeyListener, View.OnTouchListener  {
                     pointerFingerId = event.getPointerId(i);
                     x = event.getX(i);
                     y = event.getY(i);
-                    p = event.getPressure(i);
-                    XashActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    XashActivity.nativeTouch(pointerFingerId, action, x, y);
                 }
 			} else {
-                XashActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                XashActivity.nativeTouch(pointerFingerId, action, x, y);
 			}
-        }*/
-        //XashActivity.controlInterp.onTouchEvent(event);
 		return true;
-	} 
+	}
 
 }
 

From e33ceda57ae72e2a2fb17571613d24bb7a698b12 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Wed, 4 May 2016 21:34:15 +0000
Subject: [PATCH 21/83] Update touch code

---
 src/in/celest/xash3d/XashActivity.java | 58 +++++++++++++++++++-------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 3cb3a1c8..0890c767 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -501,28 +501,54 @@ View.OnKeyListener, View.OnTouchListener  {
 
     // Touch events
     public boolean onTouch(View v, MotionEvent event) {
-			final int touchDevId = event.getDeviceId();
-			final int pointerCount = event.getPointerCount();
-			// touchId, pointerId, action, x, y, pressure
-			int actionPointerIndex = event.getActionIndex();
-			int pointerFingerId = event.getPointerId(actionPointerIndex);
-			int action = event.getActionMasked();
+		/* Ref: http://developer.android.com/training/gestures/multi.html */
 
-			float x = event.getX(actionPointerIndex);
-			float y = event.getY(actionPointerIndex);
+        final int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int mouseButton;
+        int i = -1;
+        float x,y;
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i);
+                        y = event.getY(i);
+                        XashActivity.nativeTouch(pointerFingerId, action, 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:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
 
-			if (action == MotionEvent.ACTION_MOVE && pointerCount > 1) {
-                // TODO send motion to every pointer if its position has
-                // changed since prev event.
-                for (int i = 0; i < pointerCount; i++) {
                     pointerFingerId = event.getPointerId(i);
                     x = event.getX(i);
                     y = event.getY(i);
                     XashActivity.nativeTouch(pointerFingerId, action, x, y);
-                }
-			} else {
-                XashActivity.nativeTouch(pointerFingerId, action, x, y);
-			}
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i);
+                        y = event.getY(i);
+                       XashActivity.nativeTouch(pointerFingerId, action, x, y);
+                    }
+                    break;
+
+                default:
+                    break;
+        }
 		return true;
 	}
 

From 11a29ac2138e9b442832d857368270dc42a92359 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 5 May 2016 20:01:43 +0000
Subject: [PATCH 22/83] Touch action filter, add keyboard code

---
 src/in/celest/xash3d/XashActivity.java | 37 +++++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 0890c767..ac76f062 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -140,6 +140,8 @@ public class XashActivity extends Activity {
     public static native void nativeTouch(int pointerFingerId,
                                             int action, float x,
                                             float y);
+    public static native void nativeKey( int down, int code );
+    public static native void nativeString( String text );
     public static native void onNativeAccel(float x, float y, float z);
     public static native void nativeRunAudioThread();
     public static native int setenv(String key, String value, boolean overwrite);
@@ -413,6 +415,7 @@ View.OnKeyListener, View.OnTouchListener  {
                 EGL10.EGL_RED_SIZE,   8,
                 EGL10.EGL_GREEN_SIZE,   8,
                 EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_ALPHA_SIZE, 0,
                 EGL10.EGL_RENDERABLE_TYPE, 1,
                 EGL10.EGL_NONE
             };
@@ -485,17 +488,21 @@ View.OnKeyListener, View.OnTouchListener  {
 
     // Key events
     public boolean onKey(View  v, int keyCode, KeyEvent event) {
+		/*
+		 * This handles the keycodes from soft keyboard (and IME-translated
+		 * input from hardkeyboard)
+		 */
+		if (event.getAction() == KeyEvent.ACTION_DOWN) {
+			if (event.isPrintingKey()|| keyCode == 62) {
+				XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
+			}
+			XashActivity.nativeKey(1,keyCode);
+			return true;
+		} else if (event.getAction() == KeyEvent.ACTION_UP) {
 
-        if (event.getAction() == KeyEvent.ACTION_DOWN) {
-            //Log.v("SDL", "key down: " + keyCode);
-            //XashActivity.controlInterp.onKeyDown(keyCode, event);
-            return true;
-        }
-        else if (event.getAction() == KeyEvent.ACTION_UP) {
-            //Log.v("SDL", "key up: " + keyCode);
-           // XashActivity.controlInterp.onKeyUp(keyCode, event);
-            return true;
-        }
+			XashActivity.nativeKey(0,keyCode);
+			return true;
+		}
         return false;
     }
 
@@ -516,7 +523,7 @@ View.OnKeyListener, View.OnTouchListener  {
                         pointerFingerId = event.getPointerId(i);
                         x = event.getX(i);
                         y = event.getY(i);
-                        XashActivity.nativeTouch(pointerFingerId, action, x, y);
+                        XashActivity.nativeTouch(pointerFingerId, 2, x, y);
                     }
                     break;
 
@@ -532,9 +539,13 @@ View.OnKeyListener, View.OnTouchListener  {
                     }
 
                     pointerFingerId = event.getPointerId(i);
+
                     x = event.getX(i);
                     y = event.getY(i);
-                    XashActivity.nativeTouch(pointerFingerId, action, x, y);
+                    if( action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP )
+                    	XashActivity.nativeTouch(pointerFingerId,1, x, y);
+                    if( action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN )
+                    	XashActivity.nativeTouch(pointerFingerId,0, x, y);
                     break;
 
                 case MotionEvent.ACTION_CANCEL:
@@ -542,7 +553,7 @@ View.OnKeyListener, View.OnTouchListener  {
                         pointerFingerId = event.getPointerId(i);
                         x = event.getX(i);
                         y = event.getY(i);
-                       XashActivity.nativeTouch(pointerFingerId, action, x, y);
+                       XashActivity.nativeTouch(pointerFingerId, 1, x, y);
                     }
                     break;
 

From 126433c42c59b829754f6aebb67b3628cfdd291d Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 6 May 2016 08:58:01 +0000
Subject: [PATCH 23/83] Android 1.5 support

---
 jni/Application.mk                         |  8 ++-
 res/layout/activity_fpicker.xml            |  2 +-
 res/layout/activity_launcher.xml           |  4 +-
 src/in/celest/xash3d/FPicker.java          | 12 +++-
 src/in/celest/xash3d/InstallReceiver.java  | 35 ++++++++++-
 src/in/celest/xash3d/LauncherActivity.java | 38 +++++++++---
 src/in/celest/xash3d/ShortcutActivity.java | 16 +++--
 src/in/celest/xash3d/XashActivity.java     | 37 +++++++-----
 src/org/libsdl/app/SDLActivity.java        | 70 +++++++---------------
 test/AndroidManifest.xml                   |  2 +-
 10 files changed, 141 insertions(+), 83 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 2cac9797..1c98c669 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -4,17 +4,21 @@
 #APP_STL := stlport_static 
 
 XASH_SDL ?= 0
-
+XASH_LEGACY ?= 0
 ifeq ($(XASH_SDL),1)
 APP_PLATFORM := android-12
 else
+ifneq ($(XASH_LEGACY),1)
 APP_PLATFORM := android-8
+else
+APP_PLATFORM := android-3
+endif
 endif
 
 
 CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024
 CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC
-CFLAGS_OPT_ARMv5 :=-march=armv6 -mfpu=vfp -marm -pipe
+CFLAGS_OPT_ARMv5 :=-march=armv5te -marm -pipe -msoft-float
 CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS
 CFLAGS_HARDFP := -D_NDK_MATH_NO_SOFTFP=1 -mhard-float -mfloat-abi=hard -DLOAD_HARDFP -DSOFTFP_LINK
 APPLICATIONMK_PATH = $(call my-dir)
diff --git a/res/layout/activity_fpicker.xml b/res/layout/activity_fpicker.xml
index b97efbde..7001b44e 100644
--- a/res/layout/activity_fpicker.xml
+++ b/res/layout/activity_fpicker.xml
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/folder"
-        android:id="@+id/button2"
+        android:id="@+id/button_fpicker_select"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:onClick="onFileClick" />
diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 3fc3d774..8e652f5b 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -224,7 +224,7 @@
 
 
                         <Button
-                            android:id="@+id/button"
+                            android:id="@+id/button_shortcut"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="10dp"
@@ -263,7 +263,7 @@
         android:orientation="horizontal">
 
         <Button
-            android:id="@+id/button"
+            android:id="@+id/button_about"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left"
diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index 61f011f0..815c66ae 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -18,6 +18,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.Button;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -32,15 +33,22 @@ public class FPicker extends Activity {
     private File currentDir;
     private FileArrayAdapter adapter;
     static ListView delta;
+    public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if ( Build.VERSION.SDK_INT >= 21 )
+        if ( sdk >= 21 )
             super.setTheme( 0x01030224 );
         setContentView(R.layout.activity_fpicker);
         String path = Environment.getExternalStorageDirectory().toString();
         currentDir = new File(path);
-
+        ((Button)findViewById( R.id.button_fpicker_select )).setOnClickListener(new View.OnClickListener(){
+           	   @Override
+            public void onClick(View v) {
+			onFileClick(v);
+                }
+        });
         fill(currentDir);
     }
 
diff --git a/src/in/celest/xash3d/InstallReceiver.java b/src/in/celest/xash3d/InstallReceiver.java
index ecbb6809..12809778 100644
--- a/src/in/celest/xash3d/InstallReceiver.java
+++ b/src/in/celest/xash3d/InstallReceiver.java
@@ -3,12 +3,45 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import android.content.SharedPreferences;
 
 public class InstallReceiver extends BroadcastReceiver {
 private static final String TAG = "XASH3D";
 @Override
 public void onReceive(Context context, Intent arg1) {
 	Log.d( TAG, "Install received, extracting PAK" );
-    org.libsdl.app.SDLActivity.extractPAK( context, true );
+    	if( context.getPackageName() == arg1.getData().getEncodedSchemeSpecificPart() )
+    		extractPAK(context, true);
     }
+    public static SharedPreferences mPref = null;
+    	private static final int PAK_VERSION = 5;
+	public static void extractPAK(Context context, Boolean force) {
+		InputStream is = null;
+		FileOutputStream os = null;
+		try {
+		if( mPref == null )
+			mPref = context.getSharedPreferences("engine", 0);
+		if( mPref.getInt( "pakversion", 0 ) == PAK_VERSION && !force )
+			return;
+			String path = context.getFilesDir().getPath()+"/extras.pak";
+
+			is = context.getAssets().open("extras.pak");
+			os = new FileOutputStream(path);
+			byte[] buffer = new byte[1024];
+			int length;
+			while ((length = is.read(buffer)) > 0) {
+				os.write(buffer, 0, length);
+			}
+			os.close();
+			is.close();
+			SharedPreferences.Editor editor = mPref.edit();
+			editor.putInt( "pakversion", PAK_VERSION );
+			editor.commit();
+		} catch( Exception e )
+		{
+			Log.e( TAG, "Failed to extract PAK:" + e.toString() );
+		}
+	}
 }
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 8db18b09..16f35822 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -31,6 +31,7 @@ import in.celest.xash3d.hl.R;
 
 public class LauncherActivity extends Activity {
    // public final static String ARGV = "in.celest.xash3d.MESSAGE";
+   	public final static int sdk = Integer.valueOf(Build.VERSION.SDK);
 	static EditText cmdArgs;
 	static ToggleButton useVolume;
 	static EditText resPath;
@@ -47,10 +48,10 @@ public class LauncherActivity extends Activity {
         super.onCreate(savedInstanceState);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         //super.setTheme( 0x01030005 );
-        if ( Build.VERSION.SDK_INT >= 21 )
+        if ( sdk >= 21 )
 		super.setTheme( 0x01030224 );
         setContentView(R.layout.activity_launcher);
-     
+
 	TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
 
 	tabHost.setup();
@@ -60,13 +61,37 @@ public class LauncherActivity extends Activity {
 	tabSpec.setIndicator(getString(R.string.text_tab1));
 	tabSpec.setContent(R.id.tab1);
 	tabHost.addTab(tabSpec);
-	
+
 	tabSpec = tabHost.newTabSpec("tabtag2");
 	tabSpec.setIndicator(getString(R.string.text_tab2));
 	tabSpec.setContent(R.id.tab2);
 	tabHost.addTab(tabSpec);
-	
-        Button selectFolder = ( Button ) findViewById( R.id.button_select );
+
+        Button selectFolderButton = ( Button ) findViewById( R.id.button_select );
+        selectFolderButton.setOnClickListener(new View.OnClickListener(){
+           	   @Override
+            public void onClick(View v) {
+			selectFolder(v);
+                }
+        });
+        ((Button)findViewById( R.id.button_launch )).setOnClickListener(new View.OnClickListener(){
+           	   @Override
+            public void onClick(View v) {
+			startXash(v);
+                }
+        });
+        ((Button)findViewById( R.id.button_shortcut )).setOnClickListener(new View.OnClickListener(){
+           	   @Override
+            public void onClick(View v) {
+			createShortcut(v);
+                }
+        });
+        ((Button)findViewById( R.id.button_about )).setOnClickListener(new View.OnClickListener(){
+           	   @Override
+            public void onClick(View v) {
+			aboutXash(v);
+                }
+        });
 //		if ( Build.VERSION.SDK_INT < 21 )
 //			selectFolder.setVisibility( View.GONE );
 	mPref = getSharedPreferences("engine", 0);
@@ -77,7 +102,7 @@ public class LauncherActivity extends Activity {
 	resPath = ( EditText ) findViewById( R.id.cmdPath );
 	resPath.setText(mPref.getString("basedir", getDefaultPath()));
 	}
-    
+
     public void startXash(View view)
     {
 	Intent intent = new Intent(this, org.libsdl.app.SDLActivity.class);
@@ -88,7 +113,6 @@ public class LauncherActivity extends Activity {
 	editor.putBoolean("usevolume",useVolume.isChecked());
 	editor.putString("basedir", resPath.getText().toString());
 	editor.commit();
-	editor.apply();
 	startActivity(intent);
     }
 
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 377fbc3b..900fb518 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -8,6 +8,7 @@ import android.graphics.BitmapFactory;
 import android.widget.Toast;
 import in.celest.xash3d.hl.R;
 import android.widget.EditText;
+import android.widget.Button;
 import java.io.File;
 import java.io.FilenameFilter;
 
@@ -17,12 +18,13 @@ public class ShortcutActivity extends Activity
 {
 	static EditText name, gamedir, pkgname, argv;
 	String [] env = null;
+	public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
 	@Override
 	protected void onCreate(Bundle bundle)
 	{
 		super.onCreate(bundle);
 		//material dialog
-		if ( Build.VERSION.SDK_INT >= 21 )
+		if ( sdk >= 21 )
 			super.setTheme( 0x01030225 );
 		setContentView(R.layout.activity_shortcut);
 		Intent intent=getIntent();
@@ -30,6 +32,12 @@ public class ShortcutActivity extends Activity
 		pkgname = (EditText)findViewById(R.id.shortcut_pkgname);
 		gamedir = (EditText)findViewById(R.id.shortcut_gamedir);
 		argv = (EditText)findViewById(R.id.shortcut_cmdArgs);
+		((Button)findViewById( R.id.shortcut_buttonOk )).setOnClickListener(new View.OnClickListener(){
+           	   @Override
+            public void onClick(View v) {
+			saveShortcut(v);
+                }
+		});
 		String argvs = intent.getStringExtra("argv");
 		if( argvs != null )
 			argv.setText(argvs);
@@ -43,7 +51,7 @@ public class ShortcutActivity extends Activity
 		if( names != null )
 			name.setText(names);
 		env = intent.getStringArrayExtra("env");
-		
+
 		//name.setText("Name");
 	}
 	public void saveShortcut(View view)
@@ -62,7 +70,7 @@ public class ShortcutActivity extends Activity
 		Intent wrapIntent = new Intent();
 		wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
 		wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name.getText().toString());
-		
+
 		Bitmap icon = null;
 		// Try find icon
 		int size = (int) getResources().getDimension(android.R.dimen.app_icon_size);
@@ -91,7 +99,7 @@ public class ShortcutActivity extends Activity
 					return false;
 				}
 			};
-			
+
 			File gamedirfile = new File(gamedirstring);
 			String files[] = gamedirfile.list(icoFilter);
 			icon = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(gamedirstring+"/"+files[0]), size, size, false);
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index ac76f062..34d96b92 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -29,6 +29,7 @@ public class XashActivity extends Activity {
     protected static XashActivity mSingleton;
     private static EngineSurface mSurface;
     private static String mArgv[];
+    public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
 
     	// Preferences
     public static SharedPreferences mPref = null;
@@ -270,7 +271,8 @@ public class XashActivity extends Activity {
 class XashMain implements Runnable {
     public void run() {
         // Runs SDL_main()
-		XashActivity.createGLContext();
+
+	  XashActivity.createGLContext();
 
         XashActivity.nativeInit(XashActivity.getArguments());
 
@@ -286,7 +288,7 @@ class XashMain implements Runnable {
  Because of this, that's where we set up the SDL thread
  */
 class EngineSurface extends SurfaceView implements SurfaceHolder.Callback,
-View.OnKeyListener, View.OnTouchListener  {
+View.OnKeyListener {
 
     // This is what SDL runs in. It invokes SDL_main(), eventually
     private Thread mEngThread;
@@ -307,7 +309,10 @@ View.OnKeyListener, View.OnTouchListener  {
         setFocusableInTouchMode(true);
         requestFocus();
         setOnKeyListener(this);
-        setOnTouchListener(this);
+        if( XashActivity.sdk >= 5 )
+         setOnTouchListener(new EngineTouchListener_v5());
+        else
+        	setOnTouchListener(new EngineTouchListener_v1());
     }
 
     // Called when we have a valid drawing surface
@@ -412,11 +417,10 @@ View.OnKeyListener, View.OnTouchListener  {
 
             int[] configSpec = {
                 EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   8,
-                EGL10.EGL_GREEN_SIZE,   8,
-                EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   5,
+                EGL10.EGL_GREEN_SIZE,   6,
+                EGL10.EGL_BLUE_SIZE,   5,
                 EGL10.EGL_ALPHA_SIZE, 0,
-                EGL10.EGL_RENDERABLE_TYPE, 1,
                 EGL10.EGL_NONE
             };
             EGLConfig[] configs = new EGLConfig[1];
@@ -505,11 +509,18 @@ View.OnKeyListener, View.OnTouchListener  {
 		}
         return false;
     }
-
-    // Touch events
+}
+class EngineTouchListener_v1 implements View.OnTouchListener{
+       // Touch events
     public boolean onTouch(View v, MotionEvent event) {
-		/* Ref: http://developer.android.com/training/gestures/multi.html */
+                XashActivity.nativeTouch(0, event.getAction(), event.getX(), event.getY());
+		return true;
+	}
+}
 
+class EngineTouchListener_v5 implements View.OnTouchListener{
+       // Touch events
+    public boolean onTouch(View v, MotionEvent event) {
         final int touchDevId = event.getDeviceId();
         final int pointerCount = event.getPointerCount();
         int action = event.getActionMasked();
@@ -559,9 +570,7 @@ View.OnKeyListener, View.OnTouchListener  {
 
                 default:
                     break;
-        }
+       	 }
 		return true;
 	}
-
-}
-
+}
\ No newline at end of file
diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java
index 1f16250a..17c71c1e 100644
--- a/src/org/libsdl/app/SDLActivity.java
+++ b/src/org/libsdl/app/SDLActivity.java
@@ -65,19 +65,18 @@ import android.content.*;
  */
 public class SDLActivity extends Activity {
 	private static final String TAG = "SDL";
-	private static final int PAK_VERSION = 5;
 
 	// Keep track of the paused state
 	public static boolean mIsPaused, mIsSurfaceReady, mHasFocus, mUseVolume;
 	public static boolean mExitCalledFromJava;
 
 	/** If shared libraries (e.g. SDL or the native application) could not be loaded. */
-	public static boolean mBrokenLibraries;    
+	public static boolean mBrokenLibraries;
 
 	// If we want to separate mouse and touch events.
 	//  This is only toggled in native code when a hint is set!
 	public static boolean mSeparateMouseAndTouch;
-	
+
 	private static Vibrator mVibrator;
 
 	// Main components
@@ -95,7 +94,7 @@ public class SDLActivity extends Activity {
 
 	// Preferences
 	public static SharedPreferences mPref = null;
-	
+
 	// Arguments
 	public static String[] mArgv;
 	/**
@@ -153,15 +152,15 @@ public class SDLActivity extends Activity {
 		Log.v("SDL", "Model: " + android.os.Build.MODEL);
 		Log.v("SDL", "onCreate():" + mSingleton);
 		super.onCreate(savedInstanceState);
-  
-		// fullscreen   
+
+		// fullscreen
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		if(Build.VERSION.SDK_INT >= 12) {
 			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
 					WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 
-		// keep screen on 
+		// keep screen on
 		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
 				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
@@ -205,7 +204,7 @@ public class SDLActivity extends Activity {
 
 			return;
 		}
-		
+
 		Intent intent=getIntent();
 		String argv = intent.getStringExtra("argv");
 		if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
@@ -220,13 +219,13 @@ public class SDLActivity extends Activity {
 		String basedir = intent.getStringExtra("basedir");
 		if(basedir == null)
 			basedir = mPref.getString("basedir","/sdcard/xash/");
-		
+
 		setenv("XASH3D_BASEDIR", basedir, true);
 		setenv("XASH3D_ENGLIBDIR", getFilesDir().getParentFile().getPath() + "/lib", true);
 		setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
 		setenv("XASH3D_GAMEDIR", gamedir, true);
-		
-		extractPAK(this, false);
+
+		in.celest.xash3d.InstallReceiver.extractPAK(this, false);
 		setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
 		String pakfile = intent.getStringExtra("pakfile");
 		if( pakfile != null && pakfile != "" )
@@ -271,7 +270,7 @@ public class SDLActivity extends Activity {
 		}
 
 		if( mVibrator != null ) mVibrator.cancel();
-		
+
 		SDLActivity.handlePause();
 	}
 
@@ -322,10 +321,10 @@ public class SDLActivity extends Activity {
 		and kills process while engine is writing config.
 		it results in configuration loss, so we preferred to disable it
 		*/
-		
+
 		/*
 		if( mVibrator != null ) mVibrator.cancel();
-		
+
 		if (SDLActivity.mBrokenLibraries) {
 			super.onDestroy();
 			// Reset everything in case the user re opens the app
@@ -352,7 +351,7 @@ public class SDLActivity extends Activity {
 		super.onDestroy();
 		// Reset everything in case the user re opens the app
 		finish();
-		
+
 	}
 
 	@Override
@@ -511,23 +510,23 @@ public class SDLActivity extends Activity {
 	public static native int nativeRemoveJoystick(int device_id);
 	public static native String nativeGetHint(String name);
 	public static native int setenv(String key, String value, boolean overwrite);
-	
+
 	/**
 	 * This method is called by SDL using JNI.
 	 */
 	public static void flipBuffers() {
 		SDLActivity.nativeFlipBuffers();
 	}
-	
+
 	/**
          * This method is called by Xash3D engine using JNI
          */
         public void vibrate( short time ) {
                 mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
- 
+
                 mVibrator.vibrate( time );
         }
-         
+
 	/**
 	 * This method is called by SDL using JNI.
 	 */
@@ -1033,34 +1032,7 @@ public class SDLActivity extends Activity {
 			Log.e( TAG, "Failed to extract PAK:" + e.toString() );
 		}
 	}*/
-	public static void extractPAK(Context context, Boolean force) {
-		InputStream is = null;
-		FileOutputStream os = null;
-		try {
-		if( mPref == null )
-			mPref = context.getSharedPreferences("engine", 0);
-		if( mPref.getInt( "pakversion", 0 ) == PAK_VERSION && !force )
-			return;
-			String path = context.getFilesDir().getPath()+"/extras.pak";
-		
-			is = context.getAssets().open("extras.pak");
-			os = new FileOutputStream(path);
-			byte[] buffer = new byte[1024];
-			int length;
-			while ((length = is.read(buffer)) > 0) {
-				os.write(buffer, 0, length);
-			}
-			os.close();
-			is.close();
-			SharedPreferences.Editor editor = mPref.edit();
-			editor.putInt( "pakversion", PAK_VERSION );
-			editor.commit();
-			editor.apply();
-		} catch( Exception e )
-		{
-			Log.e( TAG, "Failed to extract PAK:" + e.toString() );
-		}
-	}
+
 }
 
 /**
@@ -1070,7 +1042,7 @@ class SDLMain implements Runnable {
 	@Override
 	public void run() {
 		// Runs SDL_main()
-		SDLActivity.nativeInit(SDLActivity.mArgv); 
+		SDLActivity.nativeInit(SDLActivity.mArgv);
 		//Log.v("SDL", "SDL thread terminated");
 	}
 }
@@ -1278,7 +1250,7 @@ View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
 	public boolean onTouch(View v, MotionEvent event) {
 
 		/* Ref: http://developer.android.com/training/gestures/multi.html */
-		
+
         final int touchDevId = event.getDeviceId();
         final int pointerCount = event.getPointerCount();
         int action = event.getActionMasked();
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 456202d2..5fa2058e 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -97,7 +97,7 @@
     </application>
 
     <!-- Android 2.3 -->
-    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="9" />
 
     <!-- OpenGL ES 1.1 -->
     <uses-feature android:glEsVersion="0x00010000" /> 

From aeee1419a222fce91abab6d501fde594b75954d2 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 6 May 2016 14:58:09 +0000
Subject: [PATCH 24/83] Fix and rework launch

---
 AndroidManifest.xml                        | 10 +++----
 build-test.sh                              |  2 +-
 jni/Application.mk                         |  5 ----
 jni/src/Xash3D/xash3d                      |  2 +-
 src/in/celest/xash3d/LauncherActivity.java |  2 +-
 src/in/celest/xash3d/XashActivity.java     | 34 +++++++++-------------
 test/AndroidManifest.xml                   |  9 +++---
 7 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 457c5100..23539bc9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,7 @@
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
-		
+		<!--
 		<activity android:name="org.libsdl.app.SDLActivity"
 			android:screenOrientation="sensorLandscape"
 			android:configChanges="orientation|screenSize"
@@ -63,15 +63,13 @@
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
-		
+		-->
 		<activity android:name="in.celest.xash3d.XashActivity"
 			android:screenOrientation="landscape"
 			android:label="@string/app_name">
 			<intent-filter>
-
-			<action android:name="in.celest.xash3d.XashActivity"/>
-			<action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
+				<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>
diff --git a/build-test.sh b/build-test.sh
index d3a1d95c..16070b42 100644
--- a/build-test.sh
+++ b/build-test.sh
@@ -8,7 +8,7 @@ sh gen-version.sh test build
 rm assets/extras.pak
 python2.7 makepak.py xash-extras assets/extras.pak
 $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
-$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR src/org/libsdl/app/SDLActivity.java gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*
+$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR src/org/libsdl/app/SDLActivity.java gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java
 $DX --dex --output=bin/classes.dex bin/classes/
 /mnt/app/apktool/aapt package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
 zip bin/xash3d.apk.unaligned assets/*
diff --git a/jni/Application.mk b/jni/Application.mk
index 1c98c669..4fad7304 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -4,15 +4,10 @@
 #APP_STL := stlport_static 
 
 XASH_SDL ?= 0
-XASH_LEGACY ?= 0
 ifeq ($(XASH_SDL),1)
 APP_PLATFORM := android-12
 else
-ifneq ($(XASH_LEGACY),1)
 APP_PLATFORM := android-8
-else
-APP_PLATFORM := android-3
-endif
 endif
 
 
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index b0de4002..ed8b3ea3 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit b0de40024992fb7f7ecb40e4bacc5cb7484e06bc
+Subproject commit ed8b3ea3a6eb80a20a43326c1ccb805f07ba28db
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 16f35822..e2bb38d8 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -105,7 +105,7 @@ public class LauncherActivity extends Activity {
 
     public void startXash(View view)
     {
-	Intent intent = new Intent(this, org.libsdl.app.SDLActivity.class);
+	Intent intent = new Intent(this, XashActivity.class);
 	intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
 	SharedPreferences.Editor editor = mPref.edit();
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 34d96b92..a1e1d335 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -28,7 +28,7 @@ public class XashActivity extends Activity {
     // Main components
     protected static XashActivity mSingleton;
     private static EngineSurface mSurface;
-    private static String mArgv[];
+    public static String mArgv[];
     public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
 
     	// Preferences
@@ -44,18 +44,18 @@ public class XashActivity extends Activity {
 
     // Setup
     protected void onCreate(Bundle savedInstanceState) {
-        //Log.v("SDL", "onCreate()");
-        super.onCreate(savedInstanceState);
+	      //Log.v("SDL", "onCreate()");
+	      super.onCreate(savedInstanceState);
 
-        // So we can call stuff from static callbacks
-        mSingleton = this;
-        Intent intent = getIntent();
-      //  mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
-        // Set up the surface
-        mSurface = new EngineSurface(getApplication());
-        setContentView(mSurface);
-        SurfaceHolder holder = mSurface.getHolder();
-        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+	      // So we can call stuff from static callbacks
+	      mSingleton = this;
+	      Intent intent = getIntent();
+	      //  mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
+	      // Set up the surface
+	      mSurface = new EngineSurface(getApplication());
+	      setContentView(mSurface);
+	      SurfaceHolder holder = mSurface.getHolder();
+	      holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 		mPref = this.getSharedPreferences("engine", 0);
 		String argv = intent.getStringExtra("argv");
 		if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
@@ -126,12 +126,6 @@ public class XashActivity extends Activity {
         msg.obj = data;
         commandHandler.sendMessage(msg);
     }
-    public static String[] getArguments()
-    {
-
-
-        return "-dev 5 -log +map crossfire -noch +deathmatch 1 +map crossfire".split(" ");
-    }
     // C functions we call
     public static native int nativeInit(Object arguments);
     public static native void nativeQuit();
@@ -274,7 +268,7 @@ class XashMain implements Runnable {
 
 	  XashActivity.createGLContext();
 
-        XashActivity.nativeInit(XashActivity.getArguments());
+        XashActivity.nativeInit(XashActivity.mArgv);
 
         //Log.v("SDL", "SDL thread terminated");
     }
@@ -310,7 +304,7 @@ View.OnKeyListener {
         requestFocus();
         setOnKeyListener(this);
         if( XashActivity.sdk >= 5 )
-         setOnTouchListener(new EngineTouchListener_v5());
+        	setOnTouchListener(new EngineTouchListener_v5());
         else
         	setOnTouchListener(new EngineTouchListener_v1());
     }
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 5fa2058e..f894e0b5 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -76,11 +76,10 @@
 	<activity android:name="in.celest.xash3d.XashActivity"
 		android:screenOrientation="landscape"
 		android:label="@string/app_name">
-		<intent-filter>
-			<action android:name="org.libsdl.app.SDLActivity"/>
-			<action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
-		</intent-filter>
+               <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">
 			<intent-filter android:priority="100">

From 46a9d3fac6923ff5b41eee88773bae94cbd09d30 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 6 May 2016 15:12:19 +0000
Subject: [PATCH 25/83] Update travis

---
 .travis.yml         | 14 +++++++-------
 AndroidManifest.xml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e5ac9bb..9fca1f7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,21 +21,21 @@ before_install:
 script:
   - sh gen-version.sh travis build
   - python2 makepak.py xash-extras assets/extras.pak
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
   - ant debug
   - cp bin/xashdroid-debug.apk xashdroid-armv7.apk
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi"
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi"
   - ant debug
   - cp bin/xashdroid-debug.apk xashdroid-armv6.apk
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86"
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86"
   - ant debug
   - cp bin/xashdroid-debug.apk xashdroid-x86.apk
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 clean
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC"
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=vfpv3-d16 -mcpu=cortex-a9 -pipe -fPIC"
   - ant debug
   - cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 clean
-  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC"
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
+  - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" CFLAGS_OPT_ARMv5="-marm -march=armv5te -msoft-float -fPIC"
   - ant debug
   - cp bin/xashdroid-debug.apk xashdroid-armv5.apk
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 23539bc9..64e91839 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -90,7 +90,7 @@
 	</application>
 
 	<!-- Some devices with Android 2.2 should support native activity, it was in unstable hidden API -->
-	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
+	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="19" />
 
 	<!-- OpenGL ES 1.1 -->
 	<uses-feature android:glEsVersion="0x00010000" /> 

From 441beea4314aec447fd58a8c466d96c493e1d231 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 6 May 2016 16:48:21 +0000
Subject: [PATCH 26/83] Fix install

---
 src/in/celest/xash3d/InstallReceiver.java | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/in/celest/xash3d/InstallReceiver.java b/src/in/celest/xash3d/InstallReceiver.java
index 12809778..b395a1d2 100644
--- a/src/in/celest/xash3d/InstallReceiver.java
+++ b/src/in/celest/xash3d/InstallReceiver.java
@@ -8,23 +8,24 @@ import java.io.InputStream;
 import android.content.SharedPreferences;
 
 public class InstallReceiver extends BroadcastReceiver {
-private static final String TAG = "XASH3D";
-@Override
-public void onReceive(Context context, Intent arg1) {
-	Log.d( TAG, "Install received, extracting PAK" );
-    	if( context.getPackageName() == arg1.getData().getEncodedSchemeSpecificPart() )
-    		extractPAK(context, true);
-    }
-    public static SharedPreferences mPref = null;
-    	private static final int PAK_VERSION = 5;
+	private static final String TAG = "XASH3D";
+	@Override
+	public void onReceive(Context context, Intent arg1) {
+		String pkgname = arg1.getData().getEncodedSchemeSpecificPart();
+		Log.d( TAG, "Install received, package " + pkgname );
+    		if( context.getPackageName().equals(pkgname) )
+    			extractPAK(context, true);
+	}
+	public static SharedPreferences mPref = null;
+	private static final int PAK_VERSION = 5;
 	public static void extractPAK(Context context, Boolean force) {
 		InputStream is = null;
 		FileOutputStream os = null;
 		try {
-		if( mPref == null )
-			mPref = context.getSharedPreferences("engine", 0);
-		if( mPref.getInt( "pakversion", 0 ) == PAK_VERSION && !force )
-			return;
+			if( mPref == null )
+				mPref = context.getSharedPreferences("engine", 0);
+			if( mPref.getInt( "pakversion", 0 ) == PAK_VERSION && !force )
+				return;
 			String path = context.getFilesDir().getPath()+"/extras.pak";
 
 			is = context.getAssets().open("extras.pak");

From 5b0ee9679c0c8e10e7110d3c6022fd1b27235ee8 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 6 May 2016 16:49:42 +0000
Subject: [PATCH 27/83] Fix fullscreen

---
 src/in/celest/xash3d/XashActivity.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index a1e1d335..b1155710 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -50,8 +50,19 @@ public class XashActivity extends Activity {
 	      // So we can call stuff from static callbacks
 	      mSingleton = this;
 	      Intent intent = getIntent();
-	      //  mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
-	      // Set up the surface
+
+	      // fullscreen
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		if(sdk >= 12) {
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+					WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
+
+		// keep screen on
+		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
+				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+		// Set up the surface
 	      mSurface = new EngineSurface(getApplication());
 	      setContentView(mSurface);
 	      SurfaceHolder holder = mSurface.getHolder();
@@ -76,7 +87,7 @@ public class XashActivity extends Activity {
 		setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
 		setenv("XASH3D_GAMEDIR", gamedir, true);
 
-		//extractPAK(this, false);
+		InstallReceiver.extractPAK(this, false);
 		setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
 		String pakfile = intent.getStringExtra("pakfile");
 		if( pakfile != null && pakfile != "" )

From 69b11fcf38b134f700c4918f38adbe6ef3a9ca29 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 6 May 2016 22:19:56 +0000
Subject: [PATCH 28/83] Implement EGL restore

---
 build-test.sh                                 |   2 +-
 jni/Application.mk                            |   5 +-
 jni/src/Xash3D/xash3d                         |   2 +-
 src/in/celest/xash3d/XashActivity.java        | 108 ++++++++++++++----
 test/AndroidManifest.xml                      |   8 +-
 .../org/libsdl/app/SDLActivity.java           |   0
 6 files changed, 92 insertions(+), 33 deletions(-)
 rename {src => unused}/org/libsdl/app/SDLActivity.java (100%)

diff --git a/build-test.sh b/build-test.sh
index 16070b42..c9a4e755 100644
--- a/build-test.sh
+++ b/build-test.sh
@@ -8,7 +8,7 @@ sh gen-version.sh test build
 rm assets/extras.pak
 python2.7 makepak.py xash-extras assets/extras.pak
 $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
-$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR src/org/libsdl/app/SDLActivity.java gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java
+$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java
 $DX --dex --output=bin/classes.dex bin/classes/
 /mnt/app/apktool/aapt package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
 zip bin/xash3d.apk.unaligned assets/*
diff --git a/jni/Application.mk b/jni/Application.mk
index 4fad7304..918e073f 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -11,9 +11,10 @@ APP_PLATFORM := android-8
 endif
 
 
-CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024
+CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=256 -pipe
 CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC
-CFLAGS_OPT_ARMv5 :=-march=armv5te -marm -pipe -msoft-float
+#CFLAGS_OPT_ARMv5 :=-mcpu=arm1136jf-s -mtune=arm1136jf-s -mthumb -mfpu=vfp -pipe -mfloat-abi=softfp
+CFLAGS_OPT_ARMv5 := -march=armv5te -mthumb -msoft-float
 CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS
 CFLAGS_HARDFP := -D_NDK_MATH_NO_SOFTFP=1 -mhard-float -mfloat-abi=hard -DLOAD_HARDFP -DSOFTFP_LINK
 APPLICATIONMK_PATH = $(call my-dir)
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index ed8b3ea3..2e01bd5c 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit ed8b3ea3a6eb80a20a43326c1ccb805f07ba28db
+Subproject commit 2e01bd5c41a21e36a7cfa1238661777fdcae2ff8
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index b1155710..22055c98 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -150,6 +150,8 @@ public class XashActivity extends Activity {
     public static native void nativeString( String text );
     public static native void onNativeAccel(float x, float y, float z);
     public static native void nativeRunAudioThread();
+    public static native void nativeSetPause(int pause);
+
     public static native int setenv(String key, String value, boolean overwrite);
 
 
@@ -163,6 +165,10 @@ public class XashActivity extends Activity {
         mSurface.SwapBuffers();
     }
 
+    public static void restoreEGL() {
+        mSurface.restoreEGL();
+    }
+
     public static void setActivityTitle(String title) {
         // Called from SDLMain() thread and can't directly affect the view
         mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
@@ -302,6 +308,8 @@ View.OnKeyListener {
     private EGLContext  mEGLContext;
     private EGLSurface  mEGLSurface;
     private EGLDisplay  mEGLDisplay;
+    private EGL10 mEGL;
+    private EGLConfig mEGLConfig;
 
     // Sensors
 
@@ -323,26 +331,36 @@ View.OnKeyListener {
     // Called when we have a valid drawing surface
     public void surfaceCreated(SurfaceHolder holder) {
         //Log.v("SDL", "surfaceCreated()");
+        if( mEGL == null )
+        	return;
+        XashActivity.nativeSetPause(0);
+        //mEGL = (EGL10)EGLContext.getEGL();
+        //mEGL.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
+
+        //mEGL.eglWaitGL();
+     	  //mEGL.eglDestroyContext(mEGLDisplay, mEGLContext);
+     	  int EGL_CONTEXT_CLIENT_VERSION=0x3098;
+            int contextAttrs[] = new int[]
+            {
+                EGL_CONTEXT_CLIENT_VERSION, 1,
+                EGL10.EGL_NONE
+            };
+        //mEGLContext = mEGL.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, contextAttrs);
+
     }
 
     // Called when we lose the surface
     public void surfaceDestroyed(SurfaceHolder holder) {
-        //Log.v("SDL", "surfaceDestroyed()");
+      if( mEGL == null )
+        	return;
+      XashActivity.nativeSetPause(1);
+      //mEGL = (EGL10)EGLContext.getEGL();
+     // mEGL.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
 
-        // Send a quit message to the application
-        XashActivity.nativeQuit();
-
-        // Now wait for the SDL thread to quit
-        if (mEngThread != null) {
-            try {
-                mEngThread.join();
-            } catch(Exception e) {
-                Log.v("SDL", "Problem stopping thread: " + e);
-            }
-            mEngThread = null;
-
-            //Log.v("SDL", "Finished waiting for SDL thread");
-        }
+      //mEGL.eglWaitGL();
+	mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+     	mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
+     // mEGLSurface = null;
     }
 
     // Called when the surface is resized
@@ -420,17 +438,52 @@ View.OnKeyListener {
             int[] version = new int[2];
             egl.eglInitialize(dpy, version);
 
-            int[] configSpec = {
+            int[] configSpec1 = {
+                EGL10.EGL_DEPTH_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   8,
+                EGL10.EGL_GREEN_SIZE,  8,
+                EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_ALPHA_SIZE, 8,
+                EGL10.EGL_NONE
+            };
+            int[] configSpec2 = {
                 EGL10.EGL_DEPTH_SIZE,   8,
                 EGL10.EGL_RED_SIZE,   5,
-                EGL10.EGL_GREEN_SIZE,   6,
+                EGL10.EGL_GREEN_SIZE,  6,
+                EGL10.EGL_BLUE_SIZE,   5,
+                EGL10.EGL_ALPHA_SIZE, 8,
+                EGL10.EGL_NONE
+            };
+            int[] configSpec3 = {
+                EGL10.EGL_DEPTH_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   5,
+                EGL10.EGL_GREEN_SIZE,  6,
+                EGL10.EGL_BLUE_SIZE,   5,
+                EGL10.EGL_ALPHA_SIZE, 1,
+                EGL10.EGL_NONE
+            };
+             int[] configSpec4 = {
+                EGL10.EGL_DEPTH_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   8,
+                EGL10.EGL_GREEN_SIZE,  8,
+                EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_NONE
+            };
+             int[] configSpec5 = {
+                EGL10.EGL_DEPTH_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   5,
+                EGL10.EGL_GREEN_SIZE,  6,
                 EGL10.EGL_BLUE_SIZE,   5,
-                EGL10.EGL_ALPHA_SIZE, 0,
                 EGL10.EGL_NONE
             };
             EGLConfig[] configs = new EGLConfig[1];
             int[] num_config = new int[1];
-            if (!egl.eglChooseConfig(dpy, configSpec, configs, 1, num_config) || num_config[0] == 0) {
+            if (!egl.eglChooseConfig(dpy, configSpec1, configs, 1, num_config) || num_config[0] == 0)
+             if (!egl.eglChooseConfig(dpy, configSpec2, configs, 1, num_config) || num_config[0] == 0)
+               if (!egl.eglChooseConfig(dpy, configSpec3, configs, 1, num_config) || num_config[0] == 0)
+                 if (!egl.eglChooseConfig(dpy, configSpec4, configs, 1, num_config) || num_config[0] == 0)
+                   if (!egl.eglChooseConfig(dpy, configSpec5, configs, 1, num_config) || num_config[0] == 0)
+            {
                 Log.e("SDL", "No EGL config available");
                 return false;
             }
@@ -462,6 +515,8 @@ View.OnKeyListener {
             mEGLContext = ctx;
             mEGLDisplay = dpy;
             mEGLSurface = surface;
+            mEGL = egl;
+            mEGLConfig = config;
 
         } catch(Exception e) {
             Log.v("SDL", e + "");
@@ -476,15 +531,13 @@ View.OnKeyListener {
     // EGL buffer flip
     public void SwapBuffers() {
         try {
-            EGL10 egl = (EGL10)EGLContext.getEGL();
+            //EGL10 egl = (EGL10)EGLContext.getEGL();
 
-            egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
+            //egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
 
-            // drawing here
+            //egl.eglWaitGL();
 
-            egl.eglWaitGL();
-
-            egl.eglSwapBuffers(mEGLDisplay, mEGLSurface);
+            mEGL.eglSwapBuffers(mEGLDisplay, mEGLSurface);
 
 
         } catch(Exception e) {
@@ -494,6 +547,11 @@ View.OnKeyListener {
             }
         }
     }
+    public void restoreEGL()
+    {
+               mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
+        		mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+    }
 
     // Key events
     public boolean onKey(View  v, int keyCode, KeyEvent event) {
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index f894e0b5..fa9060a8 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -56,23 +56,23 @@
 		</activity>
 	<activity android:name="in.celest.xash3d.FPicker"></activity>
 
-	<activity android:name="org.libsdl.app.SDLActivity"
+	<!--<activity android:name="org.libsdl.app.SDLActivity"
 	   android:screenOrientation="sensorLandscape"
 	   android:configChanges="orientation|screenSize"
 	   android:label="@string/app_name"
 		android:taskAffinity="org.libsdl.app.SDLActivity"
 	   >
-		<!--<intent-filter>
+		<intent-filter>
 			As user can add now empty shortcut, disable this
 			<action android:name="org.libsdl.app.SDLActivity"/>
 			<action android:name="android.intent.action.MAIN" />
 			<category android:name="android.intent.category.LAUNCHER" />
-		</intent-filter>-->
+		</intent-filter>
 		<intent-filter>
 			<action android:name="in.celest.xash3d.START" />
 			<category android:name="android.intent.category.DEFAULT" />
 		</intent-filter>
-	</activity>
+	</activity>-->
 	<activity android:name="in.celest.xash3d.XashActivity"
 		android:screenOrientation="landscape"
 		android:label="@string/app_name">
diff --git a/src/org/libsdl/app/SDLActivity.java b/unused/org/libsdl/app/SDLActivity.java
similarity index 100%
rename from src/org/libsdl/app/SDLActivity.java
rename to unused/org/libsdl/app/SDLActivity.java

From 2c8b1ee75317c239352cffcdcea85bdec0200e8f Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 7 May 2016 20:14:09 +0000
Subject: [PATCH 29/83] Improve EGL restore

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

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 22055c98..9b694180 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -165,8 +165,8 @@ public class XashActivity extends Activity {
         mSurface.SwapBuffers();
     }
 
-    public static void restoreEGL() {
-        mSurface.restoreEGL();
+    public static void toggleEGL(int toggle) {
+        mSurface.toggleEGL(toggle);
     }
 
     public static void setActivityTitle(String title) {
@@ -334,19 +334,6 @@ View.OnKeyListener {
         if( mEGL == null )
         	return;
         XashActivity.nativeSetPause(0);
-        //mEGL = (EGL10)EGLContext.getEGL();
-        //mEGL.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
-
-        //mEGL.eglWaitGL();
-     	  //mEGL.eglDestroyContext(mEGLDisplay, mEGLContext);
-     	  int EGL_CONTEXT_CLIENT_VERSION=0x3098;
-            int contextAttrs[] = new int[]
-            {
-                EGL_CONTEXT_CLIENT_VERSION, 1,
-                EGL10.EGL_NONE
-            };
-        //mEGLContext = mEGL.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, contextAttrs);
-
     }
 
     // Called when we lose the surface
@@ -354,13 +341,6 @@ View.OnKeyListener {
       if( mEGL == null )
         	return;
       XashActivity.nativeSetPause(1);
-      //mEGL = (EGL10)EGLContext.getEGL();
-     // mEGL.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
-
-      //mEGL.eglWaitGL();
-	mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
-     	mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
-     // mEGLSurface = null;
     }
 
     // Called when the surface is resized
@@ -530,6 +510,8 @@ View.OnKeyListener {
 
     // EGL buffer flip
     public void SwapBuffers() {
+       if( mEGLSurface == null )
+       	return;
         try {
             //EGL10 egl = (EGL10)EGLContext.getEGL();
 
@@ -547,10 +529,19 @@ View.OnKeyListener {
             }
         }
     }
-    public void restoreEGL()
+    public void toggleEGL(int toggle)
     {
-               mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
-        		mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+       if( toggle != 0 )
+       {
+		mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
+		mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+       }
+       else
+       {
+		mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+     		mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
+     		mEGLSurface = null;
+       }
     }
 
     // Key events

From 0211b8720f97282e19fb1779244ab6912f6e9a5f Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 7 May 2016 22:37:15 +0000
Subject: [PATCH 30/83] Update branches, enable openSLES

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

diff --git a/jni/Application.mk b/jni/Application.mk
index 918e073f..8d922173 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -7,7 +7,7 @@ XASH_SDL ?= 0
 ifeq ($(XASH_SDL),1)
 APP_PLATFORM := android-12
 else
-APP_PLATFORM := android-8
+APP_PLATFORM := android-9
 endif
 
 
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 2e01bd5c..e1e6f02e 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 2e01bd5c41a21e36a7cfa1238661777fdcae2ff8
+Subproject commit e1e6f02e444bba2ec501364576560e2bb340cb98

From e365040659eb2cb0f18bf6701e859cb82c98dae4 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 8 May 2016 07:59:53 +0000
Subject: [PATCH 31/83] Fix screen orientation

---
 AndroidManifest.xml                    | 3 ++-
 src/in/celest/xash3d/XashActivity.java | 4 ++++
 test/AndroidManifest.xml               | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 64e91839..31fd6482 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -65,7 +65,8 @@
 		</activity>
 		-->
 		<activity android:name="in.celest.xash3d.XashActivity"
-			android:screenOrientation="landscape"
+			android:screenOrientation="sensorLandscape"
+			android:configChanges="orientation|screenSize"
 			android:label="@string/app_name">
 			<intent-filter>
 				<action android:name="in.celest.xash3d.START" />
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 9b694180..88e904f8 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -58,6 +58,10 @@ public class XashActivity extends Activity {
 					WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 
+		// landscapeSensor is not supported until API9
+		if( sdk < 9 )
+			setRequestedOrientation(0);
+
 		// keep screen on
 		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
 				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index fa9060a8..190a7d3f 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -74,7 +74,8 @@
 		</intent-filter>
 	</activity>-->
 	<activity android:name="in.celest.xash3d.XashActivity"
-		android:screenOrientation="landscape"
+		android:screenOrientation="sensorLandscape"
+		android:configChanges="orientation|screenSize"
 		android:label="@string/app_name">
                <intent-filter>
                         <action android:name="in.celest.xash3d.START" />

From 3903f06abb3e6103d56da80772f26c5b2df41a3c Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 8 May 2016 08:12:05 +0000
Subject: [PATCH 32/83] Update branches

---
 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 e1e6f02e..2aebe209 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit e1e6f02e444bba2ec501364576560e2bb340cb98
+Subproject commit 2aebe209f75d0b9a015a82fd6ed980f2e1a33655

From aba773d1c0ea8d5b75f8feff9db2eeaca5427869 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 8 May 2016 08:44:32 +0000
Subject: [PATCH 33/83] Pixel format selection spinner

---
 res/layout/activity_launcher.xml           |  8 ++++
 src/in/celest/xash3d/LauncherActivity.java | 19 ++++++++
 src/in/celest/xash3d/XashActivity.java     | 52 ++++++++++++----------
 3 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 8e652f5b..fa08ecca 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -233,6 +233,14 @@
                             android:layout_marginTop="10dp"
                             android:onClick="createShortcut"
                             android:text="@string/create_shortcut_button" />
+                    <Spinner
+			    android:layout_height="match_parent"
+			    android:layout_width="wrap_content"
+			    android:id="@+id/pixelSpinner"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="10dp"/>
 
                         <TextView
                             android:id="@+id/textView7"
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index e2bb38d8..5c0e1036 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -13,6 +13,9 @@ import android.widget.EditText;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.ArrayAdapter;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -36,6 +39,7 @@ public class LauncherActivity extends Activity {
 	static ToggleButton useVolume;
 	static EditText resPath;
 	static SharedPreferences mPref;
+	static Spinner pixelSpinner;
 	String getDefaultPath()
 	{
 		File dir = Environment.getExternalStorageDirectory();
@@ -67,6 +71,19 @@ public class LauncherActivity extends Activity {
 	tabSpec.setContent(R.id.tab2);
 	tabHost.addTab(tabSpec);
 
+	final String[] list = {
+	"RGBA8888",
+	"RGBA888",
+	"RGB565",
+	"RGBA5551",
+	"RGBA4444",
+	"RGB332"
+	};
+	pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
+	ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
+	//ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, list, android.R.layout.simple_spinner_item);
+	adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
+	pixelSpinner.setAdapter(adapter);
         Button selectFolderButton = ( Button ) findViewById( R.id.button_select );
         selectFolderButton.setOnClickListener(new View.OnClickListener(){
            	   @Override
@@ -101,6 +118,7 @@ public class LauncherActivity extends Activity {
 	useVolume.setChecked(mPref.getBoolean("usevolume",true));
 	resPath = ( EditText ) findViewById( R.id.cmdPath );
 	resPath.setText(mPref.getString("basedir", getDefaultPath()));
+	pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
 	}
 
     public void startXash(View view)
@@ -112,6 +130,7 @@ public class LauncherActivity extends Activity {
 	editor.putString("argv", cmdArgs.getText().toString());
 	editor.putBoolean("usevolume",useVolume.isChecked());
 	editor.putString("basedir", resPath.getText().toString());
+	editor.putInt("pixelformat", pixelSpinner.getSelectedItemPosition());
 	editor.commit();
 	startActivity(intent);
     }
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 88e904f8..0be1e9e6 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -30,6 +30,7 @@ public class XashActivity extends Activity {
     private static EngineSurface mSurface;
     public static String mArgv[];
     public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
+    public static int mPixelFormat;
 
     	// Preferences
     public static SharedPreferences mPref = null;
@@ -109,6 +110,7 @@ public class XashActivity extends Activity {
 		{
 			e.printStackTrace();
 		}
+		mPixelFormat = mPref.getInt("pixelformat", 0);
     }
 
     // Events
@@ -422,51 +424,55 @@ View.OnKeyListener {
             int[] version = new int[2];
             egl.eglInitialize(dpy, version);
 
-            int[] configSpec1 = {
+            int[][] configSpec = {{
                 EGL10.EGL_DEPTH_SIZE,   8,
                 EGL10.EGL_RED_SIZE,   8,
                 EGL10.EGL_GREEN_SIZE,  8,
                 EGL10.EGL_BLUE_SIZE,   8,
                 EGL10.EGL_ALPHA_SIZE, 8,
                 EGL10.EGL_NONE
-            };
-            int[] configSpec2 = {
+            }, {
+                EGL10.EGL_DEPTH_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   8,
+                EGL10.EGL_GREEN_SIZE,  8,
+                EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_ALPHA_SIZE, 0,
+                EGL10.EGL_NONE
+            }, {
                 EGL10.EGL_DEPTH_SIZE,   8,
                 EGL10.EGL_RED_SIZE,   5,
                 EGL10.EGL_GREEN_SIZE,  6,
                 EGL10.EGL_BLUE_SIZE,   5,
-                EGL10.EGL_ALPHA_SIZE, 8,
+                EGL10.EGL_ALPHA_SIZE, 0,
                 EGL10.EGL_NONE
-            };
-            int[] configSpec3 = {
+            }, {
                 EGL10.EGL_DEPTH_SIZE,   8,
                 EGL10.EGL_RED_SIZE,   5,
-                EGL10.EGL_GREEN_SIZE,  6,
+                EGL10.EGL_GREEN_SIZE,  5,
                 EGL10.EGL_BLUE_SIZE,   5,
                 EGL10.EGL_ALPHA_SIZE, 1,
+
                 EGL10.EGL_NONE
-            };
-             int[] configSpec4 = {
+            }, {
                 EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   8,
-                EGL10.EGL_GREEN_SIZE,  8,
-                EGL10.EGL_BLUE_SIZE,   8,
+                EGL10.EGL_RED_SIZE,   4,
+                EGL10.EGL_GREEN_SIZE,  4,
+                EGL10.EGL_BLUE_SIZE,   4,
+                EGL10.EGL_ALPHA_SIZE,   4,
+
                 EGL10.EGL_NONE
-            };
-             int[] configSpec5 = {
+            }, {
                 EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   5,
-                EGL10.EGL_GREEN_SIZE,  6,
-                EGL10.EGL_BLUE_SIZE,   5,
+                EGL10.EGL_RED_SIZE,   3,
+                EGL10.EGL_GREEN_SIZE,  3,
+                EGL10.EGL_BLUE_SIZE,   2,
+                EGL10.EGL_ALPHA_SIZE,   0,
+
                 EGL10.EGL_NONE
-            };
+            }};
             EGLConfig[] configs = new EGLConfig[1];
             int[] num_config = new int[1];
-            if (!egl.eglChooseConfig(dpy, configSpec1, configs, 1, num_config) || num_config[0] == 0)
-             if (!egl.eglChooseConfig(dpy, configSpec2, configs, 1, num_config) || num_config[0] == 0)
-               if (!egl.eglChooseConfig(dpy, configSpec3, configs, 1, num_config) || num_config[0] == 0)
-                 if (!egl.eglChooseConfig(dpy, configSpec4, configs, 1, num_config) || num_config[0] == 0)
-                   if (!egl.eglChooseConfig(dpy, configSpec5, configs, 1, num_config) || num_config[0] == 0)
+            if (!egl.eglChooseConfig(dpy, configSpec[XashActivity.mPixelFormat], configs, 1, num_config) || num_config[0] == 0)
             {
                 Log.e("SDL", "No EGL config available");
                 return false;

From 848b1f8ae672d946422ae37d33b49636a314e263 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 8 May 2016 22:57:35 +0000
Subject: [PATCH 34/83] Keyboard and vibration support

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

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 2aebe209..342527f6 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 2aebe209f75d0b9a015a82fd6ed980f2e1a33655
+Subproject commit 342527f6eb5df3a783a431eee3e650c7ffa44fcf
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 0be1e9e6..fe1d1869 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -17,6 +17,9 @@ import android.text.*;
 import android.media.*;
 import android.hardware.*;
 import android.content.*;
+import android.widget.*;
+
+import android.view.inputmethod.*;
 
 import java.lang.*;
 
@@ -27,10 +30,12 @@ public class XashActivity extends Activity {
 
     // Main components
     protected static XashActivity mSingleton;
+    protected static View mTextEdit;
     private static EngineSurface mSurface;
     public static String mArgv[];
     public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
     public static int mPixelFormat;
+    protected static ViewGroup mLayout;
 
     	// Preferences
     public static SharedPreferences mPref = null;
@@ -69,7 +74,9 @@ public class XashActivity extends Activity {
 
 		// Set up the surface
 	      mSurface = new EngineSurface(getApplication());
-	      setContentView(mSurface);
+	      mLayout = new FrameLayout(this);
+	      mLayout.addView(mSurface);
+	      setContentView(mLayout);
 	      SurfaceHolder holder = mSurface.getHolder();
 	      holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 		mPref = this.getSharedPreferences("engine", 0);
@@ -171,6 +178,10 @@ public class XashActivity extends Activity {
         mSurface.SwapBuffers();
     }
 
+    public static void vibrate( int time ) {
+	 ((Vibrator) mSingleton.getSystemService(Context.VIBRATOR_SERVICE)).vibrate( time );
+    }
+
     public static void toggleEGL(int toggle) {
         mSurface.toggleEGL(toggle);
     }
@@ -280,6 +291,72 @@ public class XashActivity extends Activity {
             mAudioTrack = null;
         }
     }
+    public static boolean handleKey( int keyCode, KeyEvent event)
+    {
+    		/*
+		 * This handles the keycodes from soft keyboard (and IME-translated
+		 * input from hardkeyboard)
+		 */
+		Log.d("XASH3D", "Keycode " + keyCode );
+		if (event.getAction() == KeyEvent.ACTION_DOWN) {
+			if (event.isPrintingKey() || keyCode == 62) {
+				XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
+			}
+			XashActivity.nativeKey(1,keyCode);
+			return true;
+		} else if (event.getAction() == KeyEvent.ACTION_UP) {
+
+			XashActivity.nativeKey(0,keyCode);
+			return true;
+		}
+		return false;
+	}
+	static class ShowTextInputTask implements Runnable {
+		/*
+		 * This is used to regulate the pan&scan method to have some offset from
+		 * the bottom edge of the input region and the top edge of an input
+		 * method (soft keyboard)
+		 */
+		private int show;
+
+		public ShowTextInputTask(int show1) {
+		   show = show1;
+		}
+
+		@Override
+		public void run() {
+		   	InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+
+
+			if (mTextEdit == null)
+			{
+				mTextEdit = new DummyEdit(getContext());
+				mLayout.addView(mTextEdit);
+			}
+			if( show == 1 )
+			{
+
+			mTextEdit.setVisibility(View.VISIBLE);
+			mTextEdit.requestFocus();
+
+			imm.showSoftInput(mTextEdit, 0);
+			}
+			else
+			{
+				mTextEdit.setVisibility(View.GONE);
+				imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+			}
+		}
+	}
+
+	/**
+	 * This method is called by SDL using JNI.
+	 */
+	public static void showKeyboard( int show ) {
+		// Transfer the task to the main thread as a Runnable
+		mSingleton.runOnUiThread(new ShowTextInputTask(show));
+	}
+
 }
 
 /**
@@ -554,25 +631,98 @@ View.OnKeyListener {
        }
     }
 
-    // Key events
-    public boolean onKey(View  v, int keyCode, KeyEvent event) {
-		/*
-		 * This handles the keycodes from soft keyboard (and IME-translated
-		 * input from hardkeyboard)
-		 */
-		if (event.getAction() == KeyEvent.ACTION_DOWN) {
-			if (event.isPrintingKey()|| keyCode == 62) {
-				XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
-			}
-			XashActivity.nativeKey(1,keyCode);
-			return true;
-		} else if (event.getAction() == KeyEvent.ACTION_UP) {
 
-			XashActivity.nativeKey(0,keyCode);
+	@Override
+	public boolean onKey(View v, int keyCode, KeyEvent event) {
+
+		return XashActivity.handleKey( keyCode, event );
+	}
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+	InputConnection ic;
+
+	public DummyEdit(Context context) {
+		super(context);
+		setFocusableInTouchMode(true);
+		setFocusable(true);
+		setOnKeyListener(this);
+	}
+
+	@Override
+	public boolean onCheckIsTextEditor() {
+		return true;
+	}
+
+	@Override
+	public boolean onKey(View v, int keyCode, KeyEvent event) {
+
+		return XashActivity.handleKey( keyCode, event );
+	}
+
+	@Override
+	public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+		ic = new XashInputConnection(this, true);
+
+		outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+				| 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
+
+		return ic;
+	}
+}
+
+class XashInputConnection extends BaseInputConnection {
+
+	public XashInputConnection(View targetView, boolean fullEditor) {
+		super(targetView, fullEditor);
+
+	}
+
+	@Override
+	public boolean sendKeyEvent(KeyEvent event) {
+
+		if( XashActivity.handleKey( event.getKeyCode(), event ) )
 			return true;
+		return super.sendKeyEvent(event);
+	}
+
+	@Override
+	public boolean commitText(CharSequence text, int newCursorPosition) {
+
+		//nativeCommitText(text.toString(), newCursorPosition);
+		XashActivity.nativeString(text.toString());
+
+		return super.commitText(text, newCursorPosition);
+	}
+
+	@Override
+	public boolean setComposingText(CharSequence text, int newCursorPosition) {
+
+		//nativeSetComposingText(text.toString(), newCursorPosition);
+		XashActivity.nativeString(text.toString());
+
+		return super.setComposingText(text, newCursorPosition);
+	}
+
+	public native void nativeSetComposingText(String text, int newCursorPosition);
+
+	@Override
+	public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+		// Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
+		if (beforeLength == 1 && afterLength == 0) {
+
+			// backspace
+			XashActivity.nativeKey(1,KeyEvent.KEYCODE_DEL);
+			XashActivity.nativeKey(0,KeyEvent.KEYCODE_DEL);
+			//return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+					//&& super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
 		}
-        return false;
-    }
+
+		return super.deleteSurroundingText(beforeLength, afterLength);
+	}
 }
 class EngineTouchListener_v1 implements View.OnTouchListener{
        // Touch events

From 57f3f0323663b2a4215c893b63e14f7792d84fc7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 9 May 2016 14:03:50 +0000
Subject: [PATCH 35/83] Refactor code

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

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 342527f6..d2bd0aaa 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 342527f6eb5df3a783a431eee3e650c7ffa44fcf
+Subproject commit d2bd0aaa30d53ae460b9cb74a6066ec40b55e0b6
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index fe1d1869..a8467ed7 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -28,68 +28,72 @@ import java.lang.*;
  */
 public class XashActivity extends Activity {
 
-    // Main components
-    protected static XashActivity mSingleton;
-    protected static View mTextEdit;
-    private static EngineSurface mSurface;
-    public static String mArgv[];
-    public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
-    public static int mPixelFormat;
-    protected static ViewGroup mLayout;
+	// Main components
+	protected static XashActivity mSingleton;
+	protected static View mTextEdit;
+	private static EngineSurface mSurface;
+	public static String mArgv[];
+	public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
+	public static final String TAG = "XASH3D:XashActivity";
+	public static int mPixelFormat;
+	protected static ViewGroup mLayout;
 
-    	// Preferences
-    public static SharedPreferences mPref = null;
+		// Preferences
+	public static SharedPreferences mPref = null;
 
-    // Audio
-    private static Thread mAudioThread;
-    private static AudioTrack mAudioTrack;
-    // Load the .so
-    static {
-        System.loadLibrary("xash");
-    }
+	// Audio
+	private static Thread mAudioThread;
+	private static AudioTrack mAudioTrack;
+	// Load the .so
+	static {
+		System.loadLibrary("xash");
+	}
 
-    // Setup
-    protected void onCreate(Bundle savedInstanceState) {
-	      //Log.v("SDL", "onCreate()");
-	      super.onCreate(savedInstanceState);
+	// Setup
+	protected void onCreate(Bundle savedInstanceState) {
+		Log.v(TAG, "onCreate()");
+		super.onCreate(savedInstanceState);
 
-	      // So we can call stuff from static callbacks
-	      mSingleton = this;
-	      Intent intent = getIntent();
+		// So we can call stuff from static callbacks
+		mSingleton = this;
+		Intent intent = getIntent();
 
-	      // fullscreen
+		// fullscreen
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		if(sdk >= 12) {
-			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-					WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		}
+		if(sdk >= 12)
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
 		// landscapeSensor is not supported until API9
 		if( sdk < 9 )
 			setRequestedOrientation(0);
 
 		// keep screen on
-		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
-				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
 		// Set up the surface
-	      mSurface = new EngineSurface(getApplication());
-	      mLayout = new FrameLayout(this);
-	      mLayout.addView(mSurface);
-	      setContentView(mLayout);
-	      SurfaceHolder holder = mSurface.getHolder();
-	      holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+		mSurface = new EngineSurface(getApplication());
+		mLayout = new FrameLayout(this);
+		mLayout.addView(mSurface);
+		setContentView(mLayout);
+
+		SurfaceHolder holder = mSurface.getHolder();
+		holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+
+		// setup envs
 		mPref = this.getSharedPreferences("engine", 0);
 		String argv = intent.getStringExtra("argv");
 		if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
 		if(argv == null) argv = "-dev 3 -log";
 		mArgv= argv.split(" ");
+
 		String gamelibdir = intent.getStringExtra("gamelibdir");
 		if(gamelibdir == null)
 			gamelibdir = getFilesDir().getParentFile().getPath() + "/lib";
+
 		String gamedir = intent.getStringExtra("gamedir");
 		if(gamedir == null)
 			gamedir = "valve";
+
 		String basedir = intent.getStringExtra("basedir");
 		if(basedir == null)
 			basedir = mPref.getString("basedir","/sdcard/xash/");
@@ -99,7 +103,7 @@ public class XashActivity extends Activity {
 		setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
 		setenv("XASH3D_GAMEDIR", gamedir, true);
 
-		InstallReceiver.extractPAK(this, false);
+
 		setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
 		String pakfile = intent.getStringExtra("pakfile");
 		if( pakfile != null && pakfile != "" )
@@ -117,201 +121,80 @@ public class XashActivity extends Activity {
 		{
 			e.printStackTrace();
 		}
+
+		InstallReceiver.extractPAK(this, false);
+
 		mPixelFormat = mPref.getInt("pixelformat", 0);
-    }
+	}
 
-    // Events
-    protected void onPause() {
-        //Log.v("SDL", "onPause()");
-        super.onPause();
-    }
+	// Events
+	protected void onPause() {
+		Log.v(TAG, "onPause()");
+		super.onPause();
+	}
 
-    protected void onResume() {
-        //Log.v("SDL", "onResume()");
-        super.onResume();
-    }
+	protected void onResume() {
+		Log.v(TAG, "onResume()");
+		super.onResume();
+	}
 
-    // Messages from the SDLMain thread
-    static int COMMAND_CHANGE_TITLE = 1;
+	public static native int nativeInit(Object arguments);
+	public static native void nativeQuit();
+	public static native void onNativeResize(int x, int y);
+	public static native void nativeTouch(int pointerFingerId, int action, float x, float y);
+	public static native void nativeKey( int down, int code );
+	public static native void nativeString( String text );
+	public static native void nativeSetPause(int pause);
 
-    // Handler for the messages
-    Handler commandHandler = new Handler() {
-        public void handleMessage(Message msg) {
-            if (msg.arg1 == COMMAND_CHANGE_TITLE) {
-                setTitle((String)msg.obj);
-            }
-        }
-    };
-
-    // Send a message from the SDLMain thread
-    void sendCommand(int command, Object data) {
-        Message msg = commandHandler.obtainMessage();
-        msg.arg1 = command;
-        msg.obj = data;
-        commandHandler.sendMessage(msg);
-    }
-    // C functions we call
-    public static native int nativeInit(Object arguments);
-    public static native void nativeQuit();
-    public static native void onNativeResize(int x, int y);
-    public static native void onNativeKeyDown(int keycode);
-    public static native void onNativeKeyUp(int keycode);
-    public static native void nativeTouch(int pointerFingerId,
-                                            int action, float x,
-                                            float y);
-    public static native void nativeKey( int down, int code );
-    public static native void nativeString( String text );
-    public static native void onNativeAccel(float x, float y, float z);
-    public static native void nativeRunAudioThread();
-    public static native void nativeSetPause(int pause);
-
-    public static native int setenv(String key, String value, boolean overwrite);
+	public static native int setenv(String key, String value, boolean overwrite);
 
 
-    // Java functions called from C
+	// Java functions called from C
 
-    public static boolean createGLContext() {
-        return mSurface.InitGL();
-    }
+	public static boolean createGLContext() {
+		return mSurface.InitGL();
+	}
 
-    public static void swapBuffers() {
-        mSurface.SwapBuffers();
-    }
+	public static void swapBuffers() {
+		mSurface.SwapBuffers();
+	}
 
-    public static void vibrate( int time ) {
-	 ((Vibrator) mSingleton.getSystemService(Context.VIBRATOR_SERVICE)).vibrate( time );
-    }
+	public static void vibrate( int time ) {
+		((Vibrator) mSingleton.getSystemService(Context.VIBRATOR_SERVICE)).vibrate( time );
+	}
 
-    public static void toggleEGL(int toggle) {
-        mSurface.toggleEGL(toggle);
-    }
+	public static void toggleEGL(int toggle) {
+		mSurface.toggleEGL(toggle);
+	}
 
-    public static void setActivityTitle(String title) {
-        // Called from SDLMain() thread and can't directly affect the view
-        mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
-    }
+	public static Context getContext() {
+		return mSingleton;
+	}
 
-    public static Context getContext() {
-        return mSingleton;
-    }
+	public static boolean handleKey( int keyCode, KeyEvent event )
+	{
 
-    // Audio
-    private static Object buf;
-
-    public static Object audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
-        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
-        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
-        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
-
-        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + ((float)sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
-
-        // Let the user pick a larger buffer if they really want -- but ye
-        // gods they probably shouldn't, the minimums are horrifyingly high
-        // latency already
-        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
-
-        mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
-									 channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
-
-        audioStartThread();
-
-        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + ((float)mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
-
-        if (is16Bit) {
-            buf = new short[desiredFrames * (isStereo ? 2 : 1)];
-        } else {
-            buf = new byte[desiredFrames * (isStereo ? 2 : 1)];
-        }
-        return buf;
-    }
-
-    public static void audioStartThread() {
-        mAudioThread = new Thread(new Runnable() {
-				public void run() {
-					mAudioTrack.play();
-					nativeRunAudioThread();
-				}
-			});
-
-        // I'd take REALTIME if I could get it!
-        mAudioThread.setPriority(Thread.MAX_PRIORITY);
-        mAudioThread.start();
-    }
-
-    public static void audioWriteShortBuffer(short[] buffer) {
-        for (int i = 0; i < buffer.length; ) {
-            int result = mAudioTrack.write(buffer, i, buffer.length - i);
-            if (result > 0) {
-                i += result;
-            } else if (result == 0) {
-                try {
-                    Thread.sleep(1);
-                } catch(InterruptedException e) {
-                    // Nom nom
-                }
-            } else {
-                Log.w("SDL", "SDL audio: error return from write(short)");
-                return;
-            }
-        }
-    }
-
-    public static void audioWriteByteBuffer(byte[] buffer) {
-        for (int i = 0; i < buffer.length; ) {
-            int result = mAudioTrack.write(buffer, i, buffer.length - i);
-            if (result > 0) {
-                i += result;
-            } else if (result == 0) {
-                try {
-                    Thread.sleep(1);
-                } catch(InterruptedException e) {
-                    // Nom nom
-                }
-            } else {
-                Log.w("SDL", "SDL audio: error return from write(short)");
-                return;
-            }
-        }
-    }
-
-    public static void audioQuit() {
-        if (mAudioThread != null) {
-            try {
-                mAudioThread.join();
-            } catch(Exception e) {
-                Log.v("SDL", "Problem stopping audio thread: " + e);
-            }
-            mAudioThread = null;
-
-            //Log.v("SDL", "Finished waiting for audio thread");
-        }
-
-        if (mAudioTrack != null) {
-            mAudioTrack.stop();
-            mAudioTrack = null;
-        }
-    }
-    public static boolean handleKey( int keyCode, KeyEvent event)
-    {
-    		/*
-		 * This handles the keycodes from soft keyboard (and IME-translated
-		 * input from hardkeyboard)
-		 */
-		Log.d("XASH3D", "Keycode " + keyCode );
-		if (event.getAction() == KeyEvent.ACTION_DOWN) {
-			if (event.isPrintingKey() || keyCode == 62) {
+		//Log.d( TAG, "Keycode " + keyCode );
+		if (event.getAction() == KeyEvent.ACTION_DOWN)
+		{
+			if (event.isPrintingKey() || keyCode == 62)// space is printing too
 				XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
-			}
+
 			XashActivity.nativeKey(1,keyCode);
+
 			return true;
-		} else if (event.getAction() == KeyEvent.ACTION_UP) {
+		}
+		else if (event.getAction() == KeyEvent.ACTION_UP)
+		{
 
 			XashActivity.nativeKey(0,keyCode);
 			return true;
 		}
 		return false;
 	}
-	static class ShowTextInputTask implements Runnable {
+
+	static class ShowTextInputTask implements Runnable
+	{
 		/*
 		 * This is used to regulate the pan&scan method to have some offset from
 		 * the bottom edge of the input region and the top edge of an input
@@ -335,11 +218,10 @@ public class XashActivity extends Activity {
 			}
 			if( show == 1 )
 			{
+				mTextEdit.setVisibility(View.VISIBLE);
+				mTextEdit.requestFocus();
 
-			mTextEdit.setVisibility(View.VISIBLE);
-			mTextEdit.requestFocus();
-
-			imm.showSoftInput(mTextEdit, 0);
+				imm.showSoftInput(mTextEdit, 0);
 			}
 			else
 			{
@@ -352,7 +234,8 @@ public class XashActivity extends Activity {
 	/**
 	 * This method is called by SDL using JNI.
 	 */
-	public static void showKeyboard( int show ) {
+	public static void showKeyboard( int show )
+	{
 		// Transfer the task to the main thread as a Runnable
 		mSingleton.runOnUiThread(new ShowTextInputTask(show));
 	}
@@ -363,15 +246,11 @@ public class XashActivity extends Activity {
  Simple nativeInit() runnable
  */
 class XashMain implements Runnable {
-    public void run() {
-        // Runs SDL_main()
-
-	  XashActivity.createGLContext();
-
-        XashActivity.nativeInit(XashActivity.mArgv);
-
-        //Log.v("SDL", "SDL thread terminated");
-    }
+	public void run()
+	{
+		XashActivity.createGLContext();
+		XashActivity.nativeInit(XashActivity.mArgv);
+	}
 }
 
 
@@ -384,252 +263,198 @@ class XashMain implements Runnable {
 class EngineSurface extends SurfaceView implements SurfaceHolder.Callback,
 View.OnKeyListener {
 
-    // This is what SDL runs in. It invokes SDL_main(), eventually
-    private Thread mEngThread;
+	// This is what SDL runs in. It invokes SDL_main(), eventually
+	private Thread mEngThread;
 
-    // EGL private objects
-    private EGLContext  mEGLContext;
-    private EGLSurface  mEGLSurface;
-    private EGLDisplay  mEGLDisplay;
-    private EGL10 mEGL;
-    private EGLConfig mEGLConfig;
+	// EGL private objects
+	private EGLContext  mEGLContext;
+	private EGLSurface  mEGLSurface;
+	private EGLDisplay  mEGLDisplay;
+	private EGL10 mEGL;
+	private EGLConfig mEGLConfig;
+	public static final String TAG = "XASH3D-EngineSurface";
 
-    // Sensors
+	// Sensors
 
-    // Startup
-    public EngineSurface(Context context) {
-        super(context);
-        getHolder().addCallback(this);
+	// Startup
+	public EngineSurface(Context context)
+	{
+		super(context);
+		getHolder().addCallback(this);
 
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        requestFocus();
-        setOnKeyListener(this);
-        if( XashActivity.sdk >= 5 )
-        	setOnTouchListener(new EngineTouchListener_v5());
-        else
-        	setOnTouchListener(new EngineTouchListener_v1());
-    }
+		setFocusable(true);
+		setFocusableInTouchMode(true);
+		requestFocus();
+		setOnKeyListener(this);
+		if( XashActivity.sdk >= 5 )
+			setOnTouchListener(new EngineTouchListener_v5());
+		else
+			setOnTouchListener(new EngineTouchListener_v1());
+	}
 
-    // Called when we have a valid drawing surface
-    public void surfaceCreated(SurfaceHolder holder) {
-        //Log.v("SDL", "surfaceCreated()");
-        if( mEGL == null )
-        	return;
-        XashActivity.nativeSetPause(0);
-    }
+	// Called when we have a valid drawing surface
+	public void surfaceCreated(SurfaceHolder holder)
+	{
+		Log.v(TAG, "surfaceCreated()");
+		if( mEGL == null )
+			return;
+		XashActivity.nativeSetPause(0);
+	}
 
-    // Called when we lose the surface
-    public void surfaceDestroyed(SurfaceHolder holder) {
-      if( mEGL == null )
-        	return;
-      XashActivity.nativeSetPause(1);
-    }
+	// Called when we lose the surface
+	public void surfaceDestroyed(SurfaceHolder holder)
+	{
+		Log.v(TAG, "surfaceDestroyed()");
+		if( mEGL == null )
+			return;
+		XashActivity.nativeSetPause(1);
+	}
 
-    // Called when the surface is resized
-    public void surfaceChanged(SurfaceHolder holder,
-                               int format, int width, int height) {
-        //Log.v("SDL", "surfaceChanged()");
-/*
-        int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default
-        switch (format) {
-			case PixelFormat.A_8:
-				Log.v("SDL", "pixel format A_8");
-				break;
-			case PixelFormat.LA_88:
-				Log.v("SDL", "pixel format LA_88");
-				break;
-			case PixelFormat.L_8:
-				Log.v("SDL", "pixel format L_8");
-				break;
-			case PixelFormat.RGBA_4444:
-				Log.v("SDL", "pixel format RGBA_4444");
-				sdlFormat = 0x85421002; // SDL_PIXELFORMAT_RGBA4444
-				break;
-			case PixelFormat.RGBA_5551:
-				Log.v("SDL", "pixel format RGBA_5551");
-				sdlFormat = 0x85441002; // SDL_PIXELFORMAT_RGBA5551
-				break;
-			case PixelFormat.RGBA_8888:
-				Log.v("SDL", "pixel format RGBA_8888");
-				sdlFormat = 0x86462004; // SDL_PIXELFORMAT_RGBA8888
-				break;
-			case PixelFormat.RGBX_8888:
-				Log.v("SDL", "pixel format RGBX_8888");
-				sdlFormat = 0x86262004; // SDL_PIXELFORMAT_RGBX8888
-				break;
-			case PixelFormat.RGB_332:
-				Log.v("SDL", "pixel format RGB_332");
-				sdlFormat = 0x84110801; // SDL_PIXELFORMAT_RGB332
-				break;
-			case PixelFormat.RGB_565:
-				Log.v("SDL", "pixel format RGB_565");
-				sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565
-				break;
-			case PixelFormat.RGB_888:
-				Log.v("SDL", "pixel format RGB_888");
-				// Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
-				sdlFormat = 0x86161804; // SDL_PIXELFORMAT_RGB888
-				break;
-			default:
-				Log.v("SDL", "pixel format unknown " + format);
-				break;
-        }*/
+	// Called when the surface is resized
+	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
+	{
+		Log.v(TAG, "surfaceChanged()");
+
+		XashActivity.onNativeResize(width, height);
+		// Now start up the C app thread
+		if (mEngThread == null) {
+
+			mEngThread = new Thread(new XashMain(), "EngineThread");
+			mEngThread.start();
+		}
+	}
+
+	// unused
+	public void onDraw(Canvas canvas) {}
 
 
-        XashActivity.onNativeResize(width, height);
-        // Now start up the C app thread
-        if (mEngThread == null) {
+	// EGL functions
+	public boolean InitGL() {
 
-            mEngThread = new Thread(new XashMain(), "EngineThread");
-            mEngThread.start();
-        }
-    }
+		try
+		{
+			EGL10 egl = (EGL10)EGLContext.getEGL();
 
-    // unused
-    public void onDraw(Canvas canvas) {}
+			EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
 
+			int[] version = new int[2];
+			egl.eglInitialize(dpy, version);
 
-    // EGL functions
-    public boolean InitGL() {
+			int[][] configSpec = {{
+				EGL10.EGL_DEPTH_SIZE,   8,
+				EGL10.EGL_RED_SIZE,   8,
+				EGL10.EGL_GREEN_SIZE,  8,
+				EGL10.EGL_BLUE_SIZE,   8,
+				EGL10.EGL_ALPHA_SIZE, 8,
+				EGL10.EGL_NONE
+			}, {
+				EGL10.EGL_DEPTH_SIZE,   8,
+				EGL10.EGL_RED_SIZE,   8,
+				EGL10.EGL_GREEN_SIZE,  8,
+				EGL10.EGL_BLUE_SIZE,   8,
+				EGL10.EGL_ALPHA_SIZE, 0,
+				EGL10.EGL_NONE
+			}, {
+				EGL10.EGL_DEPTH_SIZE,   8,
+				EGL10.EGL_RED_SIZE,   5,
+				EGL10.EGL_GREEN_SIZE,  6,
+				EGL10.EGL_BLUE_SIZE,   5,
+				EGL10.EGL_ALPHA_SIZE, 0,
+				EGL10.EGL_NONE
+			}, {
+				EGL10.EGL_DEPTH_SIZE,   8,
+				EGL10.EGL_RED_SIZE,   5,
+				EGL10.EGL_GREEN_SIZE,  5,
+				EGL10.EGL_BLUE_SIZE,   5,
+				EGL10.EGL_ALPHA_SIZE, 1,
 
-        try {
-            EGL10 egl = (EGL10)EGLContext.getEGL();
+				EGL10.EGL_NONE
+			}, {
+				EGL10.EGL_DEPTH_SIZE,   8,
+				EGL10.EGL_RED_SIZE,   4,
+				EGL10.EGL_GREEN_SIZE,  4,
+				EGL10.EGL_BLUE_SIZE,   4,
+				EGL10.EGL_ALPHA_SIZE,   4,
 
-            EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+				EGL10.EGL_NONE
+			}, {
+				EGL10.EGL_DEPTH_SIZE,   8,
+				EGL10.EGL_RED_SIZE,   3,
+				EGL10.EGL_GREEN_SIZE,  3,
+				EGL10.EGL_BLUE_SIZE,   2,
+				EGL10.EGL_ALPHA_SIZE,   0,
 
-            int[] version = new int[2];
-            egl.eglInitialize(dpy, version);
+				EGL10.EGL_NONE
+			}};
+			EGLConfig[] configs = new EGLConfig[1];
+			int[] num_config = new int[1];
+			if (!egl.eglChooseConfig(dpy, configSpec[XashActivity.mPixelFormat], configs, 1, num_config) || num_config[0] == 0)
+			{
+				Log.e(TAG, "No EGL config available");
+				return false;
+			}
+			EGLConfig config = configs[0];
 
-            int[][] configSpec = {{
-                EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   8,
-                EGL10.EGL_GREEN_SIZE,  8,
-                EGL10.EGL_BLUE_SIZE,   8,
-                EGL10.EGL_ALPHA_SIZE, 8,
-                EGL10.EGL_NONE
-            }, {
-                EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   8,
-                EGL10.EGL_GREEN_SIZE,  8,
-                EGL10.EGL_BLUE_SIZE,   8,
-                EGL10.EGL_ALPHA_SIZE, 0,
-                EGL10.EGL_NONE
-            }, {
-                EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   5,
-                EGL10.EGL_GREEN_SIZE,  6,
-                EGL10.EGL_BLUE_SIZE,   5,
-                EGL10.EGL_ALPHA_SIZE, 0,
-                EGL10.EGL_NONE
-            }, {
-                EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   5,
-                EGL10.EGL_GREEN_SIZE,  5,
-                EGL10.EGL_BLUE_SIZE,   5,
-                EGL10.EGL_ALPHA_SIZE, 1,
+			int EGL_CONTEXT_CLIENT_VERSION=0x3098;
+			int contextAttrs[] = new int[]
+			{
+				EGL_CONTEXT_CLIENT_VERSION, 1,
+				EGL10.EGL_NONE
+			};
+			EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
+			if (ctx == EGL10.EGL_NO_CONTEXT) {
+				Log.e(TAG, "Couldn't create context");
+				return false;
+			}
 
-                EGL10.EGL_NONE
-            }, {
-                EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   4,
-                EGL10.EGL_GREEN_SIZE,  4,
-                EGL10.EGL_BLUE_SIZE,   4,
-                EGL10.EGL_ALPHA_SIZE,   4,
+			EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null);
+			if (surface == EGL10.EGL_NO_SURFACE) {
+				Log.e(TAG, "Couldn't create surface");
+				return false;
+			}
 
-                EGL10.EGL_NONE
-            }, {
-                EGL10.EGL_DEPTH_SIZE,   8,
-                EGL10.EGL_RED_SIZE,   3,
-                EGL10.EGL_GREEN_SIZE,  3,
-                EGL10.EGL_BLUE_SIZE,   2,
-                EGL10.EGL_ALPHA_SIZE,   0,
+			if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) {
+				Log.e(TAG, "Couldn't make context current");
+				return false;
+			}
 
-                EGL10.EGL_NONE
-            }};
-            EGLConfig[] configs = new EGLConfig[1];
-            int[] num_config = new int[1];
-            if (!egl.eglChooseConfig(dpy, configSpec[XashActivity.mPixelFormat], configs, 1, num_config) || num_config[0] == 0)
-            {
-                Log.e("SDL", "No EGL config available");
-                return false;
-            }
-            EGLConfig config = configs[0];
+			mEGLContext = ctx;
+			mEGLDisplay = dpy;
+			mEGLSurface = surface;
+			mEGL = egl;
+			mEGLConfig = config;
 
-            int EGL_CONTEXT_CLIENT_VERSION=0x3098;
-            int contextAttrs[] = new int[]
-            {
-                EGL_CONTEXT_CLIENT_VERSION, 1,
-                EGL10.EGL_NONE
-            };
-            EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
-            if (ctx == EGL10.EGL_NO_CONTEXT) {
-                Log.e("SDL", "Couldn't create context");
-                return false;
-            }
+		} catch(Exception e) {
+			Log.v(TAG, e + "");
+			for (StackTraceElement s : e.getStackTrace()) {
+				Log.v(TAG, s.toString());
+			}
+		}
 
-            EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null);
-            if (surface == EGL10.EGL_NO_SURFACE) {
-                Log.e("SDL", "Couldn't create surface");
-                return false;
-            }
+		return true;
+	}
 
-            if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) {
-                Log.e("SDL", "Couldn't make context current");
-                return false;
-            }
-
-            mEGLContext = ctx;
-            mEGLDisplay = dpy;
-            mEGLSurface = surface;
-            mEGL = egl;
-            mEGLConfig = config;
-
-        } catch(Exception e) {
-            Log.v("SDL", e + "");
-            for (StackTraceElement s : e.getStackTrace()) {
-                Log.v("SDL", s.toString());
-            }
-        }
-
-        return true;
-    }
-
-    // EGL buffer flip
-    public void SwapBuffers() {
-       if( mEGLSurface == null )
-       	return;
-        try {
-            //EGL10 egl = (EGL10)EGLContext.getEGL();
-
-            //egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
-
-            //egl.eglWaitGL();
-
-            mEGL.eglSwapBuffers(mEGLDisplay, mEGLSurface);
-
-
-        } catch(Exception e) {
-            Log.v("SDL", "flipEGL(): " + e);
-            for (StackTraceElement s : e.getStackTrace()) {
-                Log.v("SDL", s.toString());
-            }
-        }
-    }
-    public void toggleEGL(int toggle)
-    {
-       if( toggle != 0 )
-       {
-		mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
-		mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
-       }
-       else
-       {
-		mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
-     		mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
-     		mEGLSurface = null;
-       }
-    }
+	// EGL buffer flip
+	public void SwapBuffers()
+	{
+		if( mEGLSurface == null )
+			return;
+		mEGL.eglSwapBuffers(mEGLDisplay, mEGLSurface);
+	}
+	public void toggleEGL(int toggle)
+	{
+	   if( toggle != 0 )
+	   {
+			mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
+			mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+	   }
+	   else
+	   {
+			mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+			mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
+			mEGLSurface = null;
+	   }
+	}
 
 
 	@Override
@@ -717,74 +542,74 @@ class XashInputConnection extends BaseInputConnection {
 			// backspace
 			XashActivity.nativeKey(1,KeyEvent.KEYCODE_DEL);
 			XashActivity.nativeKey(0,KeyEvent.KEYCODE_DEL);
-			//return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
-					//&& super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
 		}
 
 		return super.deleteSurroundingText(beforeLength, afterLength);
 	}
 }
 class EngineTouchListener_v1 implements View.OnTouchListener{
-       // Touch events
-    public boolean onTouch(View v, MotionEvent event) {
-                XashActivity.nativeTouch(0, event.getAction(), event.getX(), event.getY());
+	// Touch events
+	public boolean onTouch(View v, MotionEvent event)
+	{
+		XashActivity.nativeTouch(0, event.getAction(), event.getX(), event.getY());
 		return true;
 	}
 }
 
 class EngineTouchListener_v5 implements View.OnTouchListener{
-       // Touch events
-    public boolean onTouch(View v, MotionEvent event) {
-        final int touchDevId = event.getDeviceId();
-        final int pointerCount = event.getPointerCount();
-        int action = event.getActionMasked();
-        int pointerFingerId;
-        int mouseButton;
-        int i = -1;
-        float x,y;
-            switch(action) {
-                case MotionEvent.ACTION_MOVE:
-                    for (i = 0; i < pointerCount; i++) {
-                        pointerFingerId = event.getPointerId(i);
-                        x = event.getX(i);
-                        y = event.getY(i);
-                        XashActivity.nativeTouch(pointerFingerId, 2, x, y);
-                    }
-                    break;
+	// Touch events
+	public boolean onTouch(View v, MotionEvent event)
+	{
+		final int touchDevId = event.getDeviceId();
+		final int pointerCount = event.getPointerCount();
+		int action = event.getActionMasked();
+		int pointerFingerId;
+		int mouseButton;
+		int i = -1;
+		float x,y;
+			switch(action) {
+				case MotionEvent.ACTION_MOVE:
+					for (i = 0; i < pointerCount; i++) {
+						pointerFingerId = event.getPointerId(i);
+						x = event.getX(i);
+						y = event.getY(i);
+						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:
-                    // Non primary pointer up/down
-                    if (i == -1) {
-                        i = event.getActionIndex();
-                    }
+				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:
+					// Non primary pointer up/down
+					if (i == -1) {
+						i = event.getActionIndex();
+					}
 
-                    pointerFingerId = event.getPointerId(i);
+					pointerFingerId = event.getPointerId(i);
 
-                    x = event.getX(i);
-                    y = event.getY(i);
-                    if( action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP )
-                    	XashActivity.nativeTouch(pointerFingerId,1, x, y);
-                    if( action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN )
-                    	XashActivity.nativeTouch(pointerFingerId,0, x, y);
-                    break;
+					x = event.getX(i);
+					y = event.getY(i);
+					if( action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP )
+						XashActivity.nativeTouch(pointerFingerId,1, x, y);
+					if( action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN )
+						XashActivity.nativeTouch(pointerFingerId,0, x, y);
+					break;
 
-                case MotionEvent.ACTION_CANCEL:
-                    for (i = 0; i < pointerCount; i++) {
-                        pointerFingerId = event.getPointerId(i);
-                        x = event.getX(i);
-                        y = event.getY(i);
-                       XashActivity.nativeTouch(pointerFingerId, 1, x, y);
-                    }
-                    break;
+				case MotionEvent.ACTION_CANCEL:
+					for (i = 0; i < pointerCount; i++) {
+						pointerFingerId = event.getPointerId(i);
+						x = event.getX(i);
+						y = event.getY(i);
+					   XashActivity.nativeTouch(pointerFingerId, 1, x, y);
+					}
+					break;
 
-                default:
-                    break;
-       	 }
+				default:
+					break;
+		 }
 		return true;
 	}
-}
\ No newline at end of file
+}

From 0735d551ffad90b0a76264fadb95fcdc5a0df737 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 9 May 2016 15:05:28 +0000
Subject: [PATCH 36/83] Implement messagebox and enable resize

---
 jni/src/Xash3D/xash3d                  |  2 +-
 src/in/celest/xash3d/XashActivity.java | 85 +++++++++++++++++++++++++-
 test/AndroidManifest.xml               |  1 +
 3 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index d2bd0aaa..f6e28e5d 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit d2bd0aaa30d53ae460b9cb74a6066ec40b55e0b6
+Subproject commit f6e28e5dc876ab0269f8f0ff97c375029a2864c8
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index a8467ed7..c9c697e2 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -60,8 +60,8 @@ public class XashActivity extends Activity {
 
 		// fullscreen
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		if(sdk >= 12)
-			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		//if(sdk >= 12)
+		getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
 		// landscapeSensor is not supported until API9
 		if( sdk < 9 )
@@ -125,6 +125,7 @@ public class XashActivity extends Activity {
 		InstallReceiver.extractPAK(this, false);
 
 		mPixelFormat = mPref.getInt("pixelformat", 0);
+		AndroidBug5497Workaround.assistActivity(this);
 	}
 
 	// Events
@@ -170,6 +171,38 @@ public class XashActivity extends Activity {
 	public static Context getContext() {
 		return mSingleton;
 	}
+	protected final String[] messageboxData = new String[2];
+	public static void messageBox(String title, String text)
+	{
+		mSingleton.messageboxData[0] = title;
+		mSingleton.messageboxData[1] = text;
+		mSingleton.runOnUiThread(new Runnable() {
+		@Override
+		public void run()
+		{
+			new AlertDialog.Builder(mSingleton)
+				.setTitle(mSingleton.messageboxData[0])
+				.setMessage(mSingleton.messageboxData[1])
+				.setPositiveButton( "Ok", new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int whichButton) {
+						synchronized(mSingleton.messageboxData)
+						{
+							mSingleton.messageboxData.notify();
+						}
+					}
+				})
+				.setCancelable(false)
+				.show();
+			}
+		});
+		synchronized (mSingleton.messageboxData) {
+			try {
+				mSingleton.messageboxData.wait();
+			} catch (InterruptedException ex) {
+				ex.printStackTrace();
+			}
+		}
+	}
 
 	public static boolean handleKey( int keyCode, KeyEvent event )
 	{
@@ -613,3 +646,51 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
 		return true;
 	}
 }
+class AndroidBug5497Workaround {
+
+	// For more information, see https://code.google.com/p/android/issues/detail?id=5497
+	// To use this class, simply invoke assistActivity() on an Activity that already has its content view set.
+
+	public static void assistActivity (Activity activity) {
+		new AndroidBug5497Workaround(activity);
+	}
+
+	private View mChildOfContent;
+	private int usableHeightPrevious;
+	private FrameLayout.LayoutParams frameLayoutParams;
+
+	private AndroidBug5497Workaround(Activity activity) {
+		FrameLayout content = (FrameLayout) activity.findViewById(android.R.id.content);
+		mChildOfContent = content.getChildAt(0);
+		mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			public void onGlobalLayout() {
+				possiblyResizeChildOfContent();
+			}
+		});
+		frameLayoutParams = (FrameLayout.LayoutParams) mChildOfContent.getLayoutParams();
+	}
+
+	private void possiblyResizeChildOfContent() {
+		int usableHeightNow = computeUsableHeight();
+		if (usableHeightNow != usableHeightPrevious) {
+			int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
+			int heightDifference = usableHeightSansKeyboard - usableHeightNow;
+			if (heightDifference > (usableHeightSansKeyboard/4)) {
+				// keyboard probably just became visible
+				frameLayoutParams.height = usableHeightSansKeyboard - heightDifference;
+			} else {
+				// keyboard probably just became hidden
+				frameLayoutParams.height = usableHeightSansKeyboard;
+			}
+			mChildOfContent.requestLayout();
+			usableHeightPrevious = usableHeightNow;
+		}
+	}
+
+	private int computeUsableHeight() {
+		Rect r = new Rect();
+		mChildOfContent.getWindowVisibleDisplayFrame(r);
+		return (r.bottom - r.top);
+	}
+
+}
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 190a7d3f..e473d17a 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -76,6 +76,7 @@
 	<activity android:name="in.celest.xash3d.XashActivity"
 		android:screenOrientation="sensorLandscape"
 		android:configChanges="orientation|screenSize"
+		android:windowSoftInputMode="adjustResize"
 		android:label="@string/app_name">
                <intent-filter>
                         <action android:name="in.celest.xash3d.START" />

From 19c8340b5c797a096c8023d49c0dd9a0bfcd24a6 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 9 May 2016 19:51:00 +0000
Subject: [PATCH 37/83] Add default icon

---
 jni/src/Xash3D/xash3d        |   2 +-
 res/drawable/ic_launcher.png | Bin 0 -> 3724 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 res/drawable/ic_launcher.png

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index f6e28e5d..44fcb937 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit f6e28e5dc876ab0269f8f0ff97c375029a2864c8
+Subproject commit 44fcb93740395955378a28ef4f12c5bac90fdbf5
diff --git a/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..942847a2f0dda6abe4649d8327f8eb7407a56813
GIT binary patch
literal 3724
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

literal 0
HcmV?d00001


From 7bcaa0db87aeb30027cfba9868d8ccdf427bb0cc Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 12 May 2016 22:42:15 +0000
Subject: [PATCH 38/83] Disable EGL initialization, called from native now

---
 src/in/celest/xash3d/XashActivity.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index c9c697e2..e4d72703 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -160,6 +160,10 @@ public class XashActivity extends Activity {
 		mSurface.SwapBuffers();
 	}
 
+	public static Surface getNativeSurface() {
+		return XashActivity.mSurface.getNativeSurface();
+	}
+
 	public static void vibrate( int time ) {
 		((Vibrator) mSingleton.getSystemService(Context.VIBRATOR_SERVICE)).vibrate( time );
 	}
@@ -281,12 +285,10 @@ public class XashActivity extends Activity {
 class XashMain implements Runnable {
 	public void run()
 	{
-		XashActivity.createGLContext();
 		XashActivity.nativeInit(XashActivity.mArgv);
 	}
 }
 
-
 /**
  SDLSurface. This is what we draw on, so we need to know when it's created
  in order to do anything useful.
@@ -360,6 +362,10 @@ View.OnKeyListener {
 	// unused
 	public void onDraw(Canvas canvas) {}
 
+	// first, initialize native backend
+	public Surface getNativeSurface() {
+		return getHolder().getSurface();
+	}
 
 	// EGL functions
 	public boolean InitGL() {

From b708774bcd00737b08ab1e439e0fec8e454d5995 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 12 May 2016 22:43:28 +0000
Subject: [PATCH 39/83] Update branches

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

diff --git a/jni/src/NanoGL/nanogl b/jni/src/NanoGL/nanogl
index 51ccb8db..4f937221 160000
--- a/jni/src/NanoGL/nanogl
+++ b/jni/src/NanoGL/nanogl
@@ -1 +1 @@
-Subproject commit 51ccb8dbf05b56a5d01091ed7c5d3ec144d1d5d4
+Subproject commit 4f937221b421f3c63856af69e4d620a7f8b0a6b0
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 44fcb937..1e458cac 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 44fcb93740395955378a28ef4f12c5bac90fdbf5
+Subproject commit 1e458cacc1ee9049d037f7b43b66a693cc6e585f

From ff81e98bc21fc3c7b9725f00ba13dca33fc83025 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 13 May 2016 14:56:35 +0000
Subject: [PATCH 40/83] Update branches

---
 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 1e458cac..973f8686 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 1e458cacc1ee9049d037f7b43b66a693cc6e585f
+Subproject commit 973f8686e0884c04f79eb0265f3a7ce2bc3235ad

From 12115e1dd1bda248406cd7827ca99043cc036e50 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 14 May 2016 00:10:39 +0300
Subject: [PATCH 41/83] Rework Travis autobuilds

---
 .travis.yml              | 11 +-----
 scripts/auto-rename.sh   | 75 ++++++++++++++++++++++++++++++++++++++++
 scripts/travis-upload.sh | 57 ++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 10 deletions(-)
 create mode 100755 scripts/auto-rename.sh
 create mode 100755 scripts/travis-upload.sh

diff --git a/.travis.yml b/.travis.yml
index 6e5ac9bb..a19ba5aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,14 +41,5 @@ script:
 
 
 after_script:
-  - curl --upload-file xashdroid-armv7.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d_%H-%M`.apk
-  - curl --upload-file xashdroid-armv6.apk https://transfer.sh/xash3d-armv6-`date -u +%y-%m-%d_%H-%M`.apk
-  - curl --upload-file xashdroid-x86.apk https://transfer.sh/xash3d-x86-`date -u +%y-%m-%d_%H-%M`.apk
-  - curl --upload-file xashdroid-armv7-tegra2.apk https://transfer.sh/xash3d-armv7-tegra2-`date -u +%y-%m-%d_%H-%M`.apk
-  - curl --upload-file xashdroid-armv5.apk https://transfer.sh/xash3d-armv5-`date -u +%y-%m-%d_%H-%M`.apk
-  - curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
-  - curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv6-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
-  - curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-x86-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
-  - curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-tegra2-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
-  - curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv5-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
+  - scripts/travis_upload.sh
 
diff --git a/scripts/auto-rename.sh b/scripts/auto-rename.sh
new file mode 100755
index 00000000..af4b0ca0
--- /dev/null
+++ b/scripts/auto-rename.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Was used to move bunch of travis autobuilds to new path
+
+# Remove unneeded info
+function clearName
+{
+	echo $1 | sed 's/xashdroid-//;s/.apk//'
+}
+
+function getYear
+{
+	echo $1 | awk -F- '{ print $(NF-4)}'
+}
+
+function getMonth
+{
+	echo $1 | awk -F- '{ print $(NF-3)}'
+}
+
+function getDay
+{
+	echo $1 | awk -F- '{ print $(NF-2)}' | awk -F_ '{ print $1 }'
+}
+
+function getHour
+{
+	echo $1 | awk -F- '{ print $(NF-2)}' | awk -F_ '{ print $2 }'
+}
+
+function getMinute
+{
+	echo $1 | awk -F- '{ print $(NF-1)}'
+}
+
+function getHash
+{
+	echo $1 | awk -F- '{ print $(NF)}'
+}
+
+
+function getArch
+{
+	local SECOND=`echo $1 | awk -F- '{ print $(NF-5)}'`
+	local FIRST=`echo $1 | awk -F- '{ print $(NF-6)}'`
+	
+	if [ "$SECOND" = "tegra2" ]; then
+		echo $FIRST-$SECOND
+	else
+		echo $SECOND
+	fi
+}
+
+function getDaysSinceRelease
+{
+	printf %04d $(( ( $(date -ud "$1$2$3" +'%s') - $(date -ud '150401' +'%s') )/60/60/24 ))
+}
+
+
+for i in *.apk;
+do
+	NAME=`clearName ${i}`
+	YEAR=`getYear ${NAME}`
+	MONTH=`getMonth ${NAME}`
+	DAY=`getDay ${NAME}`
+	HOUR=`getHour ${NAME}`
+	MINUTE=`getMinute ${NAME}`
+	ARCH=`getArch ${NAME}`
+	HASH=`getHash ${NAME}`
+	DAYSSINCERELEASE=`getDaysSinceRelease ${YEAR} ${MONTH} ${DAY}`
+	
+	echo "Moving ${i} to 20${YEAR}/${MONTH}/${DAY}/xash3d-${DAYSSINCERELEASE}-${HOUR}-${MINUTE}-${ARCH}-${HASH}.apk"
+	mkdir -p 20${YEAR}/${MONTH}/${DAY}/
+	mv ${i} 20${YEAR}/${MONTH}/${DAY}/xash3d-${DAYSSINCERELEASE}-${HOUR}-${MINUTE}-${ARCH}-${HASH}.apk
+done
\ No newline at end of file
diff --git a/scripts/travis-upload.sh b/scripts/travis-upload.sh
new file mode 100755
index 00000000..aeea4087
--- /dev/null
+++ b/scripts/travis-upload.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Upload travis generated APKs to the Transfer.sh and Yandex.Disk
+
+function getDaysSinceRelease
+{
+	printf %04d $(( ( $(date -ud +'%s') - $(date -ud '150401' +'%s') )/60/60/24 ))
+}
+
+DAYSSINCERELEASE=`getDaysSinceRelease`
+COMMITHASH=$(git rev-parse --short HEAD)
+CURRENTBRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+function generateFileName
+{
+	echo "xash3d-$DAYSSINCERELEASE-$(date +"%H-%M")-$1-$COMMITHASH.apk"
+}
+
+
+
+# Transfer.sh
+TRANSFERSH_ARMV5=`curl --upload-file xashdroid-armv5.apk https://transfer.sh/$(generateFileName armv5)`
+TRANSFERSH_ARMV6=`curl --upload-file xashdroid-armv6.apk https://transfer.sh/$(generateFileName armv6)`
+TRANSFERSH_ARMV7=`curl --upload-file xashdroid-armv7.apk https://transfer.sh/$(generateFileName armv7)`
+TRANSFERSH_ARMV7TEGRA2=`curl --upload-file xashdroid-armv7-tegra2.apk https://transfer.sh/$(generateFileName armv7-tegra2)`
+TRANSFERSH_X86=`curl --upload-file xashdroid-x86.apk https://transfer.sh/$(generateFileName x86)`
+
+echo "Transfer.sh links:\narmv5:\t${TRANSFERSH_ARMV5}\narmv6:\t${TRANSFERSH_ARMV6}\narmv7:\t${TRANSFERSH_ARMV7}\ntegra2:\t${TRANSFERSH_ARMV7TEGRA2}\nx86:\t${TRANSFERSH_X86}\n"
+
+# YaDisk
+
+YADISKPATH=`date +%Y/%m/%d`
+
+curl -u $YADISK_USERNAME:$YADISK_PASSWORD -X MKCOL https://webdav.yandex.ru/XashTestVersions/`date +%Y`
+curl -u $YADISK_USERNAME:$YADISK_PASSWORD -X MKCOL https://webdav.yandex.ru/XashTestVersions/`date +%Y/%m`/
+curl -u $YADISK_USERNAME:$YADISK_PASSWORD -X MKCOL https://webdav.yandex.ru/XashTestVersions/`date +%Y/%m/%d`/
+
+curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv7)
+curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv6)
+curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv5)
+curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv7-tegra2)
+curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName x86)
+
+# Update current
+function generateFileName_current
+{
+	echo "xash3d-current-$1-$CURRENTBRANCH-$COMMITHASH.apk"
+}
+
+curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv7)
+curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv6)
+curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv5)
+curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv7-tegra2)
+curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current x86)
+
+
+exit 0
\ No newline at end of file

From 6f27a141a5cc80ee2daff1257c129c9ca1b0ef46 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 14 May 2016 00:25:23 +0300
Subject: [PATCH 42/83] Mistype in script name >_<

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a19ba5aa..693fe6cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,5 +41,5 @@ script:
 
 
 after_script:
-  - scripts/travis_upload.sh
+  - scripts/travis-upload.sh
 

From 8a599ee8e9a3f12df837575394397fc08ad7cbcf Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 14 May 2016 00:28:02 +0300
Subject: [PATCH 43/83] Forgot 'sh' >___<

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 693fe6cf..f1c6cf64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,5 +41,5 @@ script:
 
 
 after_script:
-  - scripts/travis-upload.sh
+  - sh scripts/travis-upload.sh
 

From 491d5373845286ad3acfe1a45edf37b7815a56d2 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 14 May 2016 00:43:37 +0300
Subject: [PATCH 44/83] Seems gen-version.sh generates invalid XML when commit
 message have characters like less- or greater-than signs

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f1c6cf64..a76083a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,5 +41,5 @@ script:
 
 
 after_script:
-  - sh scripts/travis-upload.sh
+  - bash scripts/travis-upload.sh
 

From 77327d2c2156622c48ea7d8e7020891b4a3a19ff Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 14 May 2016 00:50:27 +0300
Subject: [PATCH 45/83] Fix script

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

diff --git a/scripts/travis-upload.sh b/scripts/travis-upload.sh
index aeea4087..6ce3d8a0 100755
--- a/scripts/travis-upload.sh
+++ b/scripts/travis-upload.sh
@@ -4,7 +4,7 @@
 
 function getDaysSinceRelease
 {
-	printf %04d $(( ( $(date -ud +'%s') - $(date -ud '150401' +'%s') )/60/60/24 ))
+	printf %04d $(( ( $(date +'%s') - $(date -ud '150401' +'%s') )/60/60/24 ))
 }
 
 DAYSSINCERELEASE=`getDaysSinceRelease`
@@ -54,4 +54,4 @@ curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://
 curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current x86)
 
 
-exit 0
\ No newline at end of file
+exit 0

From 87a536ffc0b81bf179ea86bcbb58fe12d73f9647 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 14 May 2016 01:19:07 +0300
Subject: [PATCH 46/83] Adjust upload script

---
 scripts/travis-upload.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/travis-upload.sh b/scripts/travis-upload.sh
index 6ce3d8a0..251f9a73 100755
--- a/scripts/travis-upload.sh
+++ b/scripts/travis-upload.sh
@@ -25,7 +25,12 @@ TRANSFERSH_ARMV7=`curl --upload-file xashdroid-armv7.apk https://transfer.sh/$(g
 TRANSFERSH_ARMV7TEGRA2=`curl --upload-file xashdroid-armv7-tegra2.apk https://transfer.sh/$(generateFileName armv7-tegra2)`
 TRANSFERSH_X86=`curl --upload-file xashdroid-x86.apk https://transfer.sh/$(generateFileName x86)`
 
-echo "Transfer.sh links:\narmv5:\t${TRANSFERSH_ARMV5}\narmv6:\t${TRANSFERSH_ARMV6}\narmv7:\t${TRANSFERSH_ARMV7}\ntegra2:\t${TRANSFERSH_ARMV7TEGRA2}\nx86:\t${TRANSFERSH_X86}\n"
+echo "Transfer.sh links:"
+echo "armv5:              ${TRANSFERSH_ARMV5}"
+echo "armv6:              ${TRANSFERSH_ARMV6}"
+echo "armv7:              ${TRANSFERSH_ARMV7}"
+echo "tegra2:             ${TRANSFERSH_ARMV7TEGRA2}"
+echo "x86:                ${TRANSFERSH_X86}"
 
 # YaDisk
 
@@ -42,16 +47,17 @@ curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://
 curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName x86)
 
 # Update current
+# $TRAVIS_BRANCH is predefined by Travis CI
 function generateFileName_current
 {
-	echo "xash3d-current-$1-$CURRENTBRANCH-$COMMITHASH.apk"
+	echo "xash3d-current-$1-$TRAVIS_BRANCH.apk"
 }
 
-curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv7)
-curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv6)
-curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv5)
-curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current armv7-tegra2)
-curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName_current x86)
+curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv7)
+curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv6)
+curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv5)
+curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv7-tegra2)
+curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current x86)
 
 
 exit 0

From dab20204ce349c170b94d059fa0805e5d9a51545 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 13 May 2016 22:29:13 +0000
Subject: [PATCH 47/83] Update branches

---
 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 973f8686..e685152d 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 973f8686e0884c04f79eb0265f3a7ce2bc3235ad
+Subproject commit e685152df20f67d73ab5f90c924d97c87bfbda4f

From fa1d58020b6399dfae5a35f031ab7231a623a36f Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 15 May 2016 09:25:43 +0000
Subject: [PATCH 48/83] 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 e685152d..eebd633f 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit e685152df20f67d73ab5f90c924d97c87bfbda4f
+Subproject commit eebd633f6307c3e921b8086fd236184ce8f2d25d

From 1333895aa6b9a24a1f4ba00a071958d424d6f231 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 16 May 2016 22:24:23 +0000
Subject: [PATCH 49/83] 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 eebd633f..a1ffbf31 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit eebd633f6307c3e921b8086fd236184ce8f2d25d
+Subproject commit a1ffbf310f7cfc08647bd8731f7c45b6e31b37c5

From 2ddcaf37b45f78ce105ddabd1260e4f4e3b01713 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 20 May 2016 14:01:28 +0300
Subject: [PATCH 50/83] Add org.json package

---
 .gitmodules  | 3 +++
 src/org/json | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 src/org/json

diff --git a/.gitmodules b/.gitmodules
index a134a82f..08e60d55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "jni/src/hlsdk-xash3d"]
 	path = jni/src/hlsdk-xash3d
 	url = https://github.com/SDLash3D/hlsdk-xash3d
+[submodule "src/org/json"]
+	path = src/org/json
+	url = https://github.com/stleary/JSON-java
diff --git a/src/org/json b/src/org/json
new file mode 160000
index 00000000..9a81b403
--- /dev/null
+++ b/src/org/json
@@ -0,0 +1 @@
+Subproject commit 9a81b40334ff2eba531478d013654c5d1b12ad24

From 64b30c4bd64959f449f0182a51fb9206ebe3a874 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 20 May 2016 22:32:59 +0300
Subject: [PATCH 51/83] Fix warnings

---
 res/values-es/strings.xml     | 1 -
 res/values-fa/strings.xml     | 1 -
 res/values-pt-rBR/strings.xml | 1 -
 res/values-zh/strings.xml     | 2 --
 4 files changed, 5 deletions(-)

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 09303709..1274ab34 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,7 +21,6 @@
 <!-- TODO: Remove or change this placeholder text -->
     <string name="about_main">Xash3D Android</string>
     <string name="about_copyright">SDLash3D no está afiliado con Valve o cualquiera de sus socios. Todos los derechos reservados a sus respectivos dueños.</string>
-    <string name="version_string" translatable="false">v0.17.1</string>
     <string name="about_authors">Adaptación para Android por SDLash3D team: \n
 &#8226; a1batross\n
 &#8226; mittorn \n
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d947e412..1ab3ec44 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,7 +17,6 @@
   <string name="shortcut_name">نام میانبر</string>
   <string name="about_main">Xash3D Android</string>
   <string name="about_copyright">یا شرکای آن ندارد. تمامی حقوق کپی برای صاحبان هر کدام محفوظ است. Valve هیچ نسبتی با SDLash3D</string>
-  <string name="version_string" translatable="false">v0.17.1</string>
   <string name="about_authors">:SDLash3D پورت شده به اندروید توسط تیم \n • a1batross\n • mittorn \n • nicknekit.\n  تشکر ویژه از:\n • Xash3Dبرای موتور Uncle Mike\n •  Half-Life برای Valve\n • libSDL2 توسعه دهندگان.\n</string>
   <string name="about_links">ما را دنبال کنید در  : •<a href="https://vk.com/xashdroid">VK</a>•<a href="http://moddb.com/game/xash3d-android">ModDB</a>•<a href="https://github.com/SDLash3D">GitHub</a></string>
   <string name="about_button">Xash3D Android درباره</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 63694943..1ebfdc15 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -21,7 +21,6 @@
 <!-- TODO: Remove or change this placeholder text -->
     <string name="about_main">Xash3D Android</string>
     <string name="about_copyright">SDLash3D não é afiliado com a Valve ou qualquer um dos seus parceiros. Todos os direitos autorais reservados aos respectivos proprietários.</string>
-    <string name="version_string" translatable="false">v0.17.1</string>
     <string name="about_authors">Porta para android pelo time SDLash3D: \n
 &#8226; a1batross\n
 &#8226; mittorn \n
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 0f72430c..f524884c 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -40,8 +40,6 @@
 
     <string name="about_copyright">SDLash3D不隶属于Valve或其合作伙伴。 版权归各自所有。</string>
 
-    <string name="version_string" translatable="false">v0.17.1</string>
-
     <string name="about_authors">由SDLash3D团队移植到Android系统，成员： \n
 
 &#8226; a1batross\n

From e5c3122ba79cbc681e405ea06b0fb12a87b0804f Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 20 May 2016 23:46:11 +0300
Subject: [PATCH 52/83] Lower android API

---
 project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.properties b/project.properties
index 6e18427a..c052cd8f 100644
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-13

From 9b2c616baafe018f82f74a9f383f85847ed8eca5 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 20 May 2016 23:46:35 +0300
Subject: [PATCH 53/83] Add autoupdate checker

---
 res/layout/activity_launcher.xml           | 557 ++++++++++-----------
 res/values/strings.xml                     |  44 +-
 src/in/celest/xash3d/LauncherActivity.java | 314 ++++++++----
 3 files changed, 497 insertions(+), 418 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index fa08ecca..51796d7c 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -1,296 +1,265 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout_shortcut"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="#252525"
-    android:weightSum="1"
-    tools:context="in.celest.xash3d.LauncherActivity">
-
-    <TextView
-        android:id="@+id/textView_tittle"
-        android:layout_width="fill_parent"
-        android:layout_height="50dp"
-        android:layout_marginBottom="1dp"
-        android:layout_marginLeft="5dp"
-        android:background="#555555"
-        android:layout_marginRight="5dp"
-        android:layout_marginTop="20dp"
-        android:text="@string/launcher_name"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="25sp"
-        android:drawableLeft="@drawable/ic_launcher"
-        android:drawablePadding="10dp"
-        android:singleLine="true"
-        android:gravity="center_vertical" />
-
-    <TabHost
-        android:id="@+id/tabhost"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1.20"
-        android:paddingBottom="10dp"
-        android:paddingLeft="3dp"
-        android:paddingRight="3dp"
-        android:paddingTop="8dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#555555"
-            android:orientation="vertical">
-
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:showDividers="middle"></TabWidget>
-
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/scrollView2" >
-            <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                >
-
-                <LinearLayout
-                    android:id="@+id/tab1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="25dp"
-                    android:background="#333333"
-                    android:orientation="vertical"
-                    android:text="@string/text_tab1"
-                    android:weightSum="0.6">
-
-                    <TextView
-                        android:id="@+id/textView_path1"
-                        android:layout_width="fill_parent"
-                        android:layout_height="40dp"
-                        android:layout_marginBottom="2dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="#444444"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginTop="10dp"
-                        android:text="@string/text_res_tittle2"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="20sp"
-                        android:gravity="center_vertical|center_horizontal" />
-
-                    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                        xmlns:tools="http://schemas.android.com/tools"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginTop="10dp"
-                        android:background="#444444"
-                        android:orientation="vertical"
-                        android:weightSum="1">
-
-
-                        <ToggleButton
-                            android:id="@+id/useVolume"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="10dp"
-                            android:text="nothing"
-                            android:textOff="@string/no_volume"
-                            android:textOn="@string/use_volume" />
-
-                        <!--<CheckBox-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_width="match_parent"-->
-                        <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-                        <!--android:text="@string/use_volume"-->
-                        <!--android:id="@+id/useVolume"/>-->
-
-                        <!--<CheckBox-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_width="match_parent"-->
-                        <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-                        <!--android:text="@string/tracking"-->
-                        <!--android:id="@+id/Tracking"/>-->
-
-
-
-                        <Button
-                            android:id="@+id/button_select"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="bottom"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginRight="10dp"
-                            android:onClick="selectFolder"
-                            android:text="@string/select_folder" />
-
-
-
-                    </LinearLayout>
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/tab2"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="15dp"
-                    android:background="#333333"
-                    android:orientation="vertical"
-                    android:text="@string/text_tab2">
-
-                    <TextView
-                        android:id="@+id/textView_path2"
-                        android:layout_width="fill_parent"
-                        android:layout_height="40dp"
-                        android:layout_marginBottom="2dp"
-                        android:layout_marginLeft="10dp"
-                        android:background="#444444"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginTop="13dp"
-                        android:text="@string/text_res_tittle3"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="20sp"
-                        android:gravity="center_vertical|center_horizontal" />
-
-                    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                        xmlns:tools="http://schemas.android.com/tools"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginTop="10dp"
-                        android:background="#444444"
-                        android:orientation="vertical"
-                        android:weightSum="1">
-
-                        <TextView
-                            android:id="@+id/textView_args"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="20dp"
-                            android:text="@string/cmd_args_text"
-                            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                        <EditText
-                            android:id="@+id/cmdArgs"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="3dp" />
-
-                        <TextView
-                            android:id="@+id/textView_path"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="3dp"
-                            android:text="@string/text_res_path"
-                            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                        <EditText
-                            android:id="@+id/cmdPath"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="3dp" />
-
-
-                        <Button
-                            android:id="@+id/button_shortcut"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="10dp"
-                            android:onClick="createShortcut"
-                            android:text="@string/create_shortcut_button" />
-                    <Spinner
-			    android:layout_height="match_parent"
-			    android:layout_width="wrap_content"
-			    android:id="@+id/pixelSpinner"
-                            android:layout_marginBottom="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginTop="10dp"/>
-
-                        <TextView
-                            android:id="@+id/textView7"
-                            android:layout_marginBottom="10dp"
-                            android:layout_width="fill_parent"
-                            android:layout_height="0dp"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_weight="1"
-                            android:clickable="false" />
-                    </LinearLayout>
-                </LinearLayout>
-
-
-            </FrameLayout>
-
-            </ScrollView>
-        </LinearLayout>
-
-    </TabHost>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="#444444"
-        android:layout_marginBottom="-20dp"
-        android:paddingTop="5dp"
-        android:layout_gravity="bottom"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/button_about"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-
-            android:onClick="aboutXash"
-            android:text="@string/about_button" />
-
-        <Button
-            android:id="@+id/button_launch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_column="6"
-            android:layout_marginLeft="0dp"
-            android:layout_weight="0.87"
-            android:onClick="startXash"
-            android:text="@string/launch_button" />
-
-    </LinearLayout>
-
-
-</LinearLayout>
-
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:id="@+id/layout_shortcut"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical"
+			  android:background="#252525"
+			  android:weightSum="1"
+			  tools:context="in.celest.xash3d.LauncherActivity">
+	<TextView
+		android:id="@+id/textView_tittle"
+		android:layout_width="fill_parent"
+		android:layout_height="50dp"
+		android:layout_marginBottom="1dp"
+		android:layout_marginLeft="5dp"
+		android:background="#555555"
+		android:layout_marginRight="5dp"
+		android:layout_marginTop="20dp"
+		android:text="@string/launcher_name"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textSize="25sp"
+		android:drawableLeft="@drawable/ic_launcher"
+		android:drawablePadding="10dp"
+		android:singleLine="true"
+		android:gravity="center_vertical" />
+	<TabHost
+		android:id="@+id/tabhost"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_weight="1.20"
+		android:paddingBottom="10dp"
+		android:paddingLeft="3dp"
+		android:paddingRight="3dp"
+		android:paddingTop="8dp">
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="#555555"
+			android:orientation="vertical">
+			<TabWidget
+				android:id="@android:id/tabs"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:showDividers="middle" />
+			<ScrollView
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:id="@+id/scrollView2">
+				<FrameLayout
+					android:id="@android:id/tabcontent"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent">
+					<LinearLayout
+						android:id="@+id/tab1"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="10dp"
+						android:layout_marginRight="10dp"
+						android:layout_marginTop="15dp"
+						android:layout_marginBottom="25dp"
+						android:background="#333333"
+						android:orientation="vertical"
+						android:text="@string/text_tab1"
+						android:weightSum="0.6">
+						<TextView
+							android:id="@+id/textView_path1"
+							android:layout_width="fill_parent"
+							android:layout_height="40dp"
+							android:layout_marginBottom="2dp"
+							android:layout_marginLeft="10dp"
+							android:background="#444444"
+							android:layout_marginRight="10dp"
+							android:layout_marginTop="10dp"
+							android:text="@string/text_res_tittle2"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textSize="20sp"
+							android:gravity="center_vertical|center_horizontal" />
+						<LinearLayout 
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_marginBottom="10dp"
+							android:layout_marginLeft="10dp"
+							android:layout_marginRight="10dp"
+							android:layout_marginTop="10dp"
+							android:background="#444444"
+							android:orientation="vertical"
+							android:weightSum="1">
+							<ToggleButton
+								android:id="@+id/useVolume"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_margin="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp"
+								android:text="nothing"
+								android:textOff="@string/no_volume"
+								android:textOn="@string/use_volume" />
+							<!--
+							<CheckBox
+								android:layout_height="wrap_content"
+								android:layout_width="match_parent"
+								android:textAppearance="?android:attr/textAppearanceMedium"
+								android:text="@string/use_volume"
+								android:id="@+id/useVolume"/>
+							-->
+							
+							<!--
+							<CheckBox
+								android:layout_height="wrap_content"
+								android:layout_width="match_parent"
+								android:textAppearance="?android:attr/textAppearanceMedium"
+								android:text="@string/tracking"
+								android:id="@+id/Tracking"/>
+							-->
+							<Button
+								android:id="@+id/button_select"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_gravity="bottom"
+								android:layout_marginLeft="10dp"
+								android:layout_marginTop="10dp"
+								android:layout_marginBottom="10dp"
+								android:layout_marginRight="10dp"
+								android:onClick="selectFolder"
+								android:text="@string/select_folder" />
+						</LinearLayout>
+					</LinearLayout>
+					<LinearLayout
+						android:id="@+id/tab2"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_marginLeft="10dp"
+						android:layout_marginRight="10dp"
+						android:layout_marginTop="15dp"
+						android:background="#333333"
+						android:orientation="vertical"
+						android:text="@string/text_tab2">
+						<TextView
+							android:id="@+id/textView_path2"
+							android:layout_width="fill_parent"
+							android:layout_height="40dp"
+							android:layout_marginBottom="2dp"
+							android:layout_marginLeft="10dp"
+							android:background="#444444"
+							android:layout_marginRight="10dp"
+							android:layout_marginTop="13dp"
+							android:text="@string/text_res_tittle3"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textSize="20sp"
+							android:gravity="center_vertical|center_horizontal" />
+						<LinearLayout 
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_marginBottom="10dp"
+							android:layout_marginLeft="10dp"
+							android:layout_marginRight="10dp"
+							android:layout_marginTop="10dp"
+							android:background="#444444"
+							android:orientation="vertical"
+							android:weightSum="1">
+							<TextView
+								android:id="@+id/textView_args"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="20dp"
+								android:text="@string/cmd_args_text"
+								android:textAppearance="?android:attr/textAppearanceMedium" />
+							<EditText
+								android:id="@+id/cmdArgs"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="3dp" />
+							<TextView
+								android:id="@+id/textView_path"
+								android:layout_width="fill_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="3dp"
+								android:text="@string/text_res_path"
+								android:textAppearance="?android:attr/textAppearanceMedium" />
+							<EditText
+								android:id="@+id/cmdPath"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="3dp" />
+							<Button
+								android:id="@+id/button_shortcut"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp"
+								android:onClick="createShortcut"
+								android:text="@string/create_shortcut_button" />
+							<Spinner
+								android:layout_height="match_parent"
+								android:layout_width="wrap_content"
+								android:id="@+id/pixelSpinner"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp" />
+							<CheckBox
+								android:id="@+id/check_updates"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_margin="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp"
+								android:text="@string/update_button" />
+							<TextView
+								android:id="@+id/textView7"
+								android:layout_marginBottom="10dp"
+								android:layout_width="fill_parent"
+								android:layout_height="0dp"
+								android:layout_gravity="center_horizontal"
+								android:layout_weight="1"
+								android:clickable="false" />
+						</LinearLayout>
+					</LinearLayout>
+				</FrameLayout>
+			</ScrollView>
+		</LinearLayout>
+	</TabHost>
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="50dp"
+		android:background="#444444"
+		android:layout_marginBottom="-20dp"
+		android:paddingTop="5dp"
+		android:layout_gravity="bottom"
+		android:orientation="horizontal">
+		<Button
+			android:id="@+id/button_about"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="left"
+			android:onClick="aboutXash"
+			android:text="@string/about_button" />
+		<Button
+			android:id="@+id/button_launch"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_column="6"
+			android:layout_marginLeft="0dp"
+			android:layout_weight="0.87"
+			android:onClick="startXash"
+			android:text="@string/launch_button" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19b742ab..1283762e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Xash3D</string>
 	<string name="launcher_name">Xash3D</string>
 	<string name="launcher_name_test">Xash3D (test)</string>
+	<string name="version_string" translatable="false">v0.17.1</string>
 
     <string name="launch_button">Launch Xash3D!</string>
     <string name="cmd_args_text">Command line arguments(experts only)</string>
@@ -16,26 +16,29 @@
 	<string name="pkgname">Mod package name (experts only)</string>
 	<string name="shortcut_name">Shortcut name</string>
 
-<!-- TODO: Remove or change this placeholder text -->
     <string name="about_main">Xash3D Android</string>
     <string name="about_copyright">SDLash3D is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners.</string>
-    <string name="version_string" translatable="false">v0.17.1</string>
-    <string name="about_authors">Port to Android by SDLash3D team: \n
-&#8226; a1batross\n
-&#8226; mittorn \n
-&#8226; nicknekit.\n
+	<!-- Seems Android skips any line breaks and tabs here. -->
+    <string name="about_authors">
+		Port to Android by SDLash3D team: \n
+		&#8226; a1batross\n
+		&#8226; mittorn \n
+		&#8226; nicknekit.\n
 
-Special thanks to:\n
-&#8226; Uncle Mike for Xash3D engine\n
-&#8226; Valve for Half-Life\n
-&#8226; libSDL2 developers.\n</string>
-<string name="about_links">Follow us in: 
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
-	&#8226; <a href="https://github.com/SDLash3D">GitHub</a></string>
-    <string name="about_button">About Xash3D Android</string>
+		Special thanks to:\n
+		&#8226; Uncle Mike for Xash3D engine\n
+		&#8226; Valve for Half-Life\n
+		&#8226; libSDL2 developers.\n
+	</string>
+	<string name="about_links">
+		Follow us in: \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/SDLash3D">GitHub</a>
+	</string>
+    <string name="about_button">About</string>
     <string name="create_shortcut_button">Create mod shortcut</string>
-    <string name="select_folder">(select)</string>
+    <string name="select_folder">Select game data location</string>
     
     <string name="text_tab1">Normal</string>
     <string name="text_tab2">Advanced</string>
@@ -44,4 +47,11 @@ Special thanks to:\n
     <string name="use_volume">Gamepad support off!</string>
     <string name="no_volume">Gamepad support active!</string>
     <string name="folder">Set current folder</string>
+	
+	<string name="update_button">Check updates on start</string>
+	<string name="update_message">%s is available!</string>
+	<string name="update">Update</string>
+	<string name="cancel">Cancel</string>
+	<string name="no_updates">No updates was found</string>
+	<string name="checking_updates">Working...</string>
 </resources>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 5c0e1036..4c9471e5 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -2,44 +2,67 @@ package in.celest.xash3d;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.app.AlertDialog;
+
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Build;
+import android.os.Environment;
+
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.content.Intent;
 import android.view.Window;
-import android.widget.EditText;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.Button;
-import android.widget.Spinner;
-import android.widget.ArrayAdapter;
 
+import android.content.Intent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.SharedPreferences;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
-import android.net.Uri;
-import android.os.Environment;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.io.File;
+
+import android.widget.EditText;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.ArrayAdapter;
 import android.widget.TabHost;
 import android.widget.ToggleButton;
+import android.widget.Toast;
+
+import android.net.Uri;
+
+import android.util.Log;
+
+import java.lang.reflect.Method;
+
+import java.util.List;
+
+import java.io.File;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.FileOutputStream;
+
+import java.net.URLConnection;
+import java.net.URL;
+
+import org.json.*;
 
 import in.celest.xash3d.hl.R;
 
 public class LauncherActivity extends Activity {
    // public final static String ARGV = "in.celest.xash3d.MESSAGE";
    	public final static int sdk = Integer.valueOf(Build.VERSION.SDK);
+	public final static String UPDATE_LINK = "https://api.github.com/repos/SDLash3D/xash3d-android-project/releases/latest";
 	static EditText cmdArgs;
 	static ToggleButton useVolume;
+	static CheckBox	checkUpdates;
 	static EditText resPath;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
+	
 	String getDefaultPath()
 	{
 		File dir = Environment.getExternalStorageDirectory();
@@ -47,104 +70,87 @@ public class LauncherActivity extends Activity {
 			return dir.getPath() + "/xash";
 		return "/sdcard/xash";
 	}
+    
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        //super.setTheme( 0x01030005 );
-        if ( sdk >= 21 )
+    protected void onCreate(Bundle savedInstanceState)
+    {
+		super.onCreate(savedInstanceState);
+		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		//super.setTheme( 0x01030005 );
+		if ( sdk >= 21 )
 		super.setTheme( 0x01030224 );
-        setContentView(R.layout.activity_launcher);
+		setContentView(R.layout.activity_launcher);
 
-	TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
+		TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
+		tabHost.setup();
+		
+		TabHost.TabSpec tabSpec;
+		tabSpec = tabHost.newTabSpec("tabtag1");
+		tabSpec.setIndicator(getString(R.string.text_tab1));
+		tabSpec.setContent(R.id.tab1);
+		tabHost.addTab(tabSpec);
 
-	tabHost.setup();
+		tabSpec = tabHost.newTabSpec("tabtag2");
+		tabSpec.setIndicator(getString(R.string.text_tab2));
+		tabSpec.setContent(R.id.tab2);
+		tabHost.addTab(tabSpec);
 
-	TabHost.TabSpec tabSpec;
-	tabSpec = tabHost.newTabSpec("tabtag1");
-	tabSpec.setIndicator(getString(R.string.text_tab1));
-	tabSpec.setContent(R.id.tab1);
-	tabHost.addTab(tabSpec);
+		mPref		 = getSharedPreferences("engine", 0);
+		cmdArgs		 = (EditText)findViewById(R.id.cmdArgs);
+		useVolume	 = ( ToggleButton ) findViewById( R.id.useVolume );
+		resPath		 = ( EditText ) findViewById( R.id.cmdPath );
+		checkUpdates = (CheckBox)findViewById(R.id.check_updates);
+		pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
 
-	tabSpec = tabHost.newTabSpec("tabtag2");
-	tabSpec.setIndicator(getString(R.string.text_tab2));
-	tabSpec.setContent(R.id.tab2);
-	tabHost.addTab(tabSpec);
+		final String[] list = {
+			"RGBA8888",
+			"RGBA888",
+			"RGB565",
+			"RGBA5551",
+			"RGBA4444",
+			"RGB332"
+		};
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
+		adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
+		pixelSpinner.setAdapter(adapter);
+		useVolume.setChecked(mPref.getBoolean("usevolume",true));
+		checkUpdates.setChecked(mPref.getBoolean("check_updates",true));
+		resPath.setText(mPref.getString("basedir", getDefaultPath()));
+		cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
+		pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
+
+		if(mPref.getBoolean("check_updates", true))
+		{
+			new RetrieveJSON(true).execute(UPDATE_LINK);
+		}
 
-	final String[] list = {
-	"RGBA8888",
-	"RGBA888",
-	"RGB565",
-	"RGBA5551",
-	"RGBA4444",
-	"RGB332"
-	};
-	pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
-	ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
-	//ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, list, android.R.layout.simple_spinner_item);
-	adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
-	pixelSpinner.setAdapter(adapter);
-        Button selectFolderButton = ( Button ) findViewById( R.id.button_select );
-        selectFolderButton.setOnClickListener(new View.OnClickListener(){
-           	   @Override
-            public void onClick(View v) {
-			selectFolder(v);
-                }
-        });
-        ((Button)findViewById( R.id.button_launch )).setOnClickListener(new View.OnClickListener(){
-           	   @Override
-            public void onClick(View v) {
-			startXash(v);
-                }
-        });
-        ((Button)findViewById( R.id.button_shortcut )).setOnClickListener(new View.OnClickListener(){
-           	   @Override
-            public void onClick(View v) {
-			createShortcut(v);
-                }
-        });
-        ((Button)findViewById( R.id.button_about )).setOnClickListener(new View.OnClickListener(){
-           	   @Override
-            public void onClick(View v) {
-			aboutXash(v);
-                }
-        });
-//		if ( Build.VERSION.SDK_INT < 21 )
-//			selectFolder.setVisibility( View.GONE );
-	mPref = getSharedPreferences("engine", 0);
-	cmdArgs = (EditText)findViewById(R.id.cmdArgs);
-	cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
-	useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
-	useVolume.setChecked(mPref.getBoolean("usevolume",true));
-	resPath = ( EditText ) findViewById( R.id.cmdPath );
-	resPath.setText(mPref.getString("basedir", getDefaultPath()));
-	pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
 	}
 
     public void startXash(View view)
     {
-	Intent intent = new Intent(this, XashActivity.class);
-	intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		Intent intent = new Intent(this, XashActivity.class);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-	SharedPreferences.Editor editor = mPref.edit();
-	editor.putString("argv", cmdArgs.getText().toString());
-	editor.putBoolean("usevolume",useVolume.isChecked());
-	editor.putString("basedir", resPath.getText().toString());
-	editor.putInt("pixelformat", pixelSpinner.getSelectedItemPosition());
-	editor.commit();
-	startActivity(intent);
+		SharedPreferences.Editor editor = mPref.edit();
+		editor.putString("argv", cmdArgs.getText().toString());
+		editor.putBoolean("usevolume",useVolume.isChecked());
+		editor.putString("basedir", resPath.getText().toString());
+		editor.putInt("pixelformat", pixelSpinner.getSelectedItemPosition());
+		editor.putBoolean("check_updates", checkUpdates.isChecked());
+		editor.commit();
+		startActivity(intent);
     }
 
 	public void aboutXash(View view)
 	{
 		final Activity a = this;
-		this.runOnUiThread(new Runnable() {
+		this.runOnUiThread(new Runnable() 
+		{
 			public void run()
 			{
 				final Dialog dialog = new Dialog(a);
 				dialog.setContentView(R.layout.about);
 				dialog.setCancelable(true);
-
 				dialog.show();
 			}
 		});
@@ -154,30 +160,32 @@ public class LauncherActivity extends Activity {
 	{
 		Intent intent = new Intent(this, in.celest.xash3d.FPicker.class);
 		//intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-	//	Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT_TREE");
+		//Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT_TREE");
 		startActivityForResult(intent, 42);
 		resPath.setEnabled(false);
 	}
 
-public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
-		if (resultCode == RESULT_OK) {
-try{
-
-		resPath = ( EditText ) findViewById( R.id.cmdPath );
-		resPath.setText( resultData.getStringExtra("GetPath"));
-
-//	final List<String> paths = resultData.getData().getPathSegments();
-//			String[] parts = paths.get(1).split(":");
-//			String storagepath = Environment.getExternalStorageDirectory().getPath() + "/";
-//			String path = storagepath + parts[1];
-//			if( path != null)
-//				resPath.setText( path );
-			resPath.setEnabled(true);
-		}
-		catch(Exception e)
+	public void onActivityResult(int requestCode, int resultCode, Intent resultData) 
+	{
+		if (resultCode == RESULT_OK) 
 		{
-			e.printStackTrace();
-		}
+			try	
+			{
+				resPath = ( EditText ) findViewById( R.id.cmdPath );
+				resPath.setText( resultData.getStringExtra("GetPath"));
+
+//				final List<String> paths = resultData.getData().getPathSegments();
+//				String[] parts = paths.get(1).split(":");
+//				String storagepath = Environment.getExternalStorageDirectory().getPath() + "/";
+//				String path = storagepath + parts[1];
+//				if( path != null)
+//					resPath.setText( path );
+				resPath.setEnabled(true);
+			}
+			catch(Exception e)
+			{
+				e.printStackTrace();
+			}
 		}
 		resPath.setEnabled(true);
 	}
@@ -212,4 +220,96 @@ try{
 
         return super.onOptionsItemSelected(item);
     }
+
+	private class RetrieveJSON extends AsyncTask<String, Void, String> {
+		InputStream is = null;
+		ByteArrayOutputStream os = null;
+		boolean mSilent;
+
+		public RetrieveJSON( boolean silent )
+		{
+			mSilent = silent;
+		}
+
+		protected String doInBackground(String... urls) {
+			try
+			{
+				URL url = new URL(urls[0]);
+				is = url.openConnection().getInputStream();
+				os = new ByteArrayOutputStream();
+
+				byte[] buffer = new byte[8196];
+				int len;
+
+				while ((len = is.read(buffer)) > 0)
+				{
+					os.write(buffer, 0, len);
+				}
+				return os.toString();
+			}
+			catch(Exception e)
+			{
+				e.printStackTrace();
+				return null;
+			}
+		}
+
+		protected void onPostExecute(String result)
+		{
+			try
+			{
+				if (is != null)
+				{
+					is.close();
+					is = null;
+				}
+			}
+			catch(Exception e)
+			{
+				e.printStackTrace();
+			}
+			JSONObject obj = new JSONObject(os.toString());
+
+			try
+			{
+				if (os != null) {
+					os.close();
+					os = null;
+				}
+			}
+			catch(Exception e)
+			{
+				e.printStackTrace();
+			}
+			final String version = obj.getString("tag_name");
+			final String url 	 = obj.getString("html_url");
+			final String name	 = obj.getString("name");
+
+			Log.d("Xash", "Found: " + version +
+				", I: " + getString(R.string.version_string));
+
+			if( !getString(R.string.version_string).equals(version) )
+			{
+				String dialog_message = getString(R.string.update_message).format(name);
+				AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
+				builder.setMessage(dialog_message)
+					.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
+					{
+						public void onClick(DialogInterface dialog, int id) {
+							final Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
+							startActivity(intent);
+						}
+					})
+					.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
+					{
+						public void onClick(DialogInterface dialog, int which){}
+					});
+				builder.create().show();
+			}
+			else if( !mSilent )
+			{
+				Toast.makeText(getBaseContext(), R.string.no_updates, Toast.LENGTH_SHORT).show();
+			}
+		}
+	}
 }

From 38ec8561983912136a6751ada5a89c362a49f2c9 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 21 May 2016 20:13:18 +0300
Subject: [PATCH 54/83] Fix new version checking

---
 src/in/celest/xash3d/LauncherActivity.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 4c9471e5..ef7fabf8 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -121,7 +121,7 @@ public class LauncherActivity extends Activity {
 
 		if(mPref.getBoolean("check_updates", true))
 		{
-			new RetrieveJSON(true).execute(UPDATE_LINK);
+			new CheckUpdate(true).execute(UPDATE_LINK);
 		}
 
 	}
@@ -221,12 +221,12 @@ public class LauncherActivity extends Activity {
         return super.onOptionsItemSelected(item);
     }
 
-	private class RetrieveJSON extends AsyncTask<String, Void, String> {
+	private class CheckUpdate extends AsyncTask<String, Void, String> {
 		InputStream is = null;
 		ByteArrayOutputStream os = null;
 		boolean mSilent;
 
-		public RetrieveJSON( boolean silent )
+		public CheckUpdate( boolean silent )
 		{
 			mSilent = silent;
 		}
@@ -272,7 +272,8 @@ public class LauncherActivity extends Activity {
 
 			try
 			{
-				if (os != null) {
+				if (os != null) 
+				{
 					os.close();
 					os = null;
 				}
@@ -288,9 +289,10 @@ public class LauncherActivity extends Activity {
 			Log.d("Xash", "Found: " + version +
 				", I: " + getString(R.string.version_string));
 
-			if( !getString(R.string.version_string).equals(version) )
+			// this is an update
+			if( getString(R.string.version_string).compareTo(version) < 0 )
 			{
-				String dialog_message = getString(R.string.update_message).format(name);
+				String dialog_message = String.format(getString(R.string.update_message), name);
 				AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
 				builder.setMessage(dialog_message)
 					.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()

From 4ccca49099b8d2d929597de944236d4880b69ed4 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 21 May 2016 20:13:48 +0300
Subject: [PATCH 55/83] Update all translations: update russian translation,
 remove untranslatable strings

---
 res/values-de/strings.xml     | 12 ++-----
 res/values-es/strings.xml     | 13 ++------
 res/values-fa/strings.xml     |  6 +---
 res/values-ko/strings.xml     | 11 ++-----
 res/values-pt-rBR/strings.xml | 13 ++------
 res/values-ru/strings.xml     | 60 +++++++++++++++++++++++++----------
 res/values-tr/strings.xml     | 13 ++------
 res/values-ua/strings.xml     | 13 ++------
 res/values-zh/strings.xml     | 48 ++--------------------------
 res/values/strings.xml        | 10 +++---
 10 files changed, 71 insertions(+), 128 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f5882234..67b7e0d7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (test)</string>
-
     <string name="launch_button">Xash3D starten!</string>
 	<string name="cmd_args_text">Command line arguments(experts only)</string>
 	<string name="use_controls">Touch Kontroller aktivieren</string>
@@ -19,7 +14,6 @@
 	<string name="shortcut_name">Kurzbefehl Name</string>
 
 <!-- TODO: Remove or change this placeholder text -->
-    <string name="about_main">Xash3D Android</string>
 	<string name="about_copyright">SDLash3D steht in keinem Zusammenhang zu Valve oder einem ihrer Partners. All copyrights reserved to their respective owners.</string>
     <string name="about_authors">Portierung auf Android by SDLash3D team: \n
 &#8226; a1batross\n
@@ -30,9 +24,9 @@ Spezieller Dank an:\n
 &#8226; Uncle Mike für Xash3D engine\n
 &#8226; Valve for Half-Life\n
 &#8226; libSDL2 developers.\n</string>
-<string name="about_links">Folge uns auf:
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+<string name="about_links">Folge uns auf:\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/SDLash3D">GitHub</a></string>
 	<string name="about_button">Über Xash3D Android</string>
 	<string name="create_shortcut_button">mod Kurzbefehl ersellen</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1274ab34..2d68a8c2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (test)</string>
-
     <string name="launch_button">¡Iniciar Xash3D!</string>
     <string name="cmd_args_text">Parámetros de línea de comandos(sólo expertos)</string>
 	<string name="use_controls">Activar controles táctiles</string>
@@ -18,8 +13,6 @@
 	<string name="pkgname">Nombre del paquete del mod (sólo expertos)</string>
 	<string name="shortcut_name">Nombre del acceso directo</string>
 
-<!-- TODO: Remove or change this placeholder text -->
-    <string name="about_main">Xash3D Android</string>
     <string name="about_copyright">SDLash3D no está afiliado con Valve o cualquiera de sus socios. Todos los derechos reservados a sus respectivos dueños.</string>
     <string name="about_authors">Adaptación para Android por SDLash3D team: \n
 &#8226; a1batross\n
@@ -30,9 +23,9 @@ Especial agradecimiento a:\n
 &#8226; Uncle Mike por Xash3D engine\n
 &#8226; Valve por Half-Life\n
 &#8226; Desarrolladores de libSDL2.\n</string>
-<string name="about_links">Siguenos en: 
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+<string name="about_links">Siguenos en: \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/SDLash3D">GitHub</a></string>
     <string name="about_button">Acerca de Xash3D Android</string>
     <string name="create_shortcut_button">Crear acceso directo del mod</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1ab3ec44..25b5935b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="app_name">Xash3D</string>
-  <string name="launcher_name">Xash3D</string>
-  <string name="launcher_name_test">Xash3D (آزمایشی)</string>
   <string name="launch_button">!Xash3Dاجرای</string>
   <string name="cmd_args_text">دستورات خط فرمان (فقط برای حرفه ای ها):</string>
   <string name="use_controls">فعال کردن کنترل های لمسی</string>
@@ -15,10 +12,9 @@
   <string name="gamedir">مسیر مود</string>
   <string name="pkgname">نام بسته مود (فقط برای حرفه ای ها):</string>
   <string name="shortcut_name">نام میانبر</string>
-  <string name="about_main">Xash3D Android</string>
   <string name="about_copyright">یا شرکای آن ندارد. تمامی حقوق کپی برای صاحبان هر کدام محفوظ است. Valve هیچ نسبتی با SDLash3D</string>
   <string name="about_authors">:SDLash3D پورت شده به اندروید توسط تیم \n • a1batross\n • mittorn \n • nicknekit.\n  تشکر ویژه از:\n • Xash3Dبرای موتور Uncle Mike\n •  Half-Life برای Valve\n • libSDL2 توسعه دهندگان.\n</string>
-  <string name="about_links">ما را دنبال کنید در  : •<a href="https://vk.com/xashdroid">VK</a>•<a href="http://moddb.com/game/xash3d-android">ModDB</a>•<a href="https://github.com/SDLash3D">GitHub</a></string>
+  <string name="about_links">ما را دنبال کنید در  :\n •<a href="https://vk.com/xashdroid">VK</a>\n•<a href="http://moddb.com/game/xash3d-android">ModDB</a>\n•<a href="https://github.com/SDLash3D">GitHub</a></string>
   <string name="about_button">Xash3D Android درباره</string>
   <string name="create_shortcut_button">ایجاد میانبر مود</string>
   <string name="select_folder">(انتخاب)</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7aeab5d8..87f25934 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <resources>
-	<string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (테스트)</string>
-
 	<string name="launch_button">Xash3D 실행!</string>
 	<string name="cmd_args_text">커멘드 라인 입력(고급 설정)</string>
 	<string name="use_controls">터치 컨트롤 사용</string>
@@ -17,7 +13,6 @@
 	<string name="gamedir">모드 디렉토리</string>
 	<string name="pkgname">모드 패키지 이름(고급설정)</string>
 	<string name="shortcut_name">바로가기 이름</string>
-	<string name="about_main">Xash3D 안드로이드</string>
 	<string name="about_copyright">우리 SDLash3D는 밸브와 상업적으로 관련이 없습니다. 모든 저작권은 소유주로 보류되어있음을 알립니다..</string>
 	<string name="about_authors">안드로이드 이식 by SDLash3D팀: \n
 • a1batross\n 
@@ -29,9 +24,9 @@
 • 밸브의 하프라이프\n 
 • libSDL2 개발자분들\n 
 • 한글화 byAIC from X3A NaverCafe</string>
-	<string name="about_links">
-여기서 우리를: • <a href="https://vk.com/xashdroid">VK</a>
-• <a href="http://moddb.com/game/xash3d-android">모드디비</a>
+	<string name="about_links">\n
+여기서 우리를: • <a href="https://vk.com/xashdroid">VK</a>\n
+• <a href="http://moddb.com/game/xash3d-android">모드디비</a>\n
 • <a href="https://github.com/SDLash3D">깃허브</a>
 	</string>
 	<string name="about_button">Xash3D 안드로이드 정보</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 1ebfdc15..337dc49d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (test)</string>
-
     <string name="launch_button">Iniciar Xash3D!</string>
     <string name="cmd_args_text">Argumentos de linha de comando(apenas expecialistas)</string>
 	<string name="use_controls">Habilitar controles de touch</string>
@@ -18,8 +13,6 @@
 	<string name="pkgname">Nome do pacote de Mod (apenas expecialistas)</string>
 	<string name="shortcut_name">Nome do atalho</string>
 
-<!-- TODO: Remove or change this placeholder text -->
-    <string name="about_main">Xash3D Android</string>
     <string name="about_copyright">SDLash3D não é afiliado com a Valve ou qualquer um dos seus parceiros. Todos os direitos autorais reservados aos respectivos proprietários.</string>
     <string name="about_authors">Porta para android pelo time SDLash3D: \n
 &#8226; a1batross\n
@@ -30,9 +23,9 @@ Agradecimentos especiais para:\n
 &#8226; Uncle Mike pelo motor Xash3D\n
 &#8226; Valve pelo Half-Life\n
 &#8226; Desenvolvedores libSDL2.\n</string>
-<string name="about_links">Siga-nos no:
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+<string name="about_links">Siga-nos no:\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/SDLash3D">GitHub</a></string>
     <string name="about_button">Sobre Android Xash3D</string>
     <string name="create_shortcut_button">Criar atalho para o mod</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0fa5a456..c847ed9a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,29 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+	<!--<string name="app_name" translatable="false">Xash3D</string>
+	<string name="launcher_name" translatable="false">Xash3D</string>
+	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>
+	<string name="version_string" translatable="false">v0.17.1</string>-->
+	
+    <string name="launch_button">Запустить Xash3D</strin g>
     <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
-    <string name="launch_button">Запустить Xash3D</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 (тест)</string>
 	<string name="shortcut_button_save">Сохранить ярлык</string>
 	<string name="gamedir">Каталог мода</string>
 	<string name="pkgname">Пакет мода (только для экспертов)</string>
 	<string name="shortcut_name">Название ярлыка</string>
-	<string name="about_authors">Порт на Android осуществлен командой SDLash3D:\n
-&#8226; a1batross\n
-&#8226; mittorn\n
-&#8226; nicknekit\n
 
-Особые благодарности:\n
-&#8226; Дяде Мише за Xash3D\n
-&#8226; Valve за Half-Life\n
-&#8226; Beloko Games за поддержку сенсорного управления\n
-&#8226; Разработчикам libSDL2</string>
-	<string name="about_button">О Xash3D Android</string>
+	<!--<string name="about_main" translatable="false">Xash3D Android</string>-->
 	<string name="about_copyright">SDLash3D не связан с Valve или с любыми из их партнеров. Все авторские права принадлежат их соотвественным обладателям.</string>
-	<string name="action_settings">Настройки</string>
-	<string name="text_shortcut_test">Ярлык Xash3D (тест)</string>
+	<!-- Seems Android skips any line breaks and tabs here. -->
+	<string name="about_authors">
+		Порт на Android осуществлен командой SDLash3D:\n
+		&#8226; a1batross\n
+		&#8226; mittorn\n
+		&#8226; nicknekit\n
+
+		Особые благодарности:\n
+		&#8226; Дяде Мише за Xash3D\n
+		&#8226; Valve за Half-Life\n
+		&#8226; Разработчикам libSDL2
+	</string>
+	<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/SDLash3D">GitHub</a>
+	</string>
+	<string name="about_button">О Xash3D Android</string>
 	<string name="create_shortcut_button">Создать ярлык</string>
+    <string name="select_folder">Выбрать путь игровых файлов</string>
+    
+    <string name="text_tab1">Стандартный</string>
+    <string name="text_tab2">Продвинутый</string>
+    <string name="text_res_tittle2">Стандартные настройки</string>
+    <string name="text_res_tittle3">Продвинутые настройки</string>
+    <string name="use_volume">Использовать кнопки громкости</string>
+    <string name="no_volume">Не использовать кнопки громкости</string>
+    <string name="folder">Выбрать текущий каталог</string>
+	
+	<string name="update_button">Проверять обновления при запуске</string>
+	<string name="update_message">%s доступен! Скачай его сейчас!</string>
+	<string name="update">Обновить</string>
+	<string name="cancel">Отмена</string>
+	<string name="no_updates">Обновления не найдены</string>
+	<string name="checking_updates">Работаю...</string>-
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a313ea30..718018e9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (test)</string>
-
     <string name="launch_button">Xash3D\'yi Başlat!</string>
     <string name="cmd_args_text">Komut satırı parametreleri(uzmanlar için)</string>
 	<string name="use_controls">Dokunmatik kontrolleri etkinleştir</string>
@@ -18,8 +13,6 @@
 	<string name="pkgname">Mod\'un paket adı (uzmanlar için)</string>
 	<string name="shortcut_name">Kısayol adı</string>
 
-<!-- TODO: Remove or change this placeholder text -->
-    <string name="about_main">Xash3D Android</string>
     <string name="about_copyright">SDLash3D, Valve veya Valve\'ın herhangi bir partnerine bağlı değildir. Tüm telif hakları kendi sahiplerine aittir.</string>
     <string name="about_authors">SDLash3D takımından Android Port\'u: \n
 &#8226; a1batross\n
@@ -30,9 +23,9 @@
 &#8226; Uncle Mike for Xash3D engine\n
 &#8226; Valve for Half-Life\n
 &#8226; libSDL2 developers.\n</string>
-<string name="about_links">Bizi buralardan takip edin: 
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+<string name="about_links">Bizi buralardan takip edin: \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/SDLash3D">GitHub</a></string>
     <string name="about_button">Xash3D Android Hakkında</string>
     <string name="create_shortcut_button">Mod kısayolu oluştur</string>
diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml
index 3b7a91f4..c869bee8 100644
--- a/res/values-ua/strings.xml
+++ b/res/values-ua/strings.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (test)</string>
-
 	<string name="launch_button">Запустити Xash3D</string>
 	<string name="cmd_args_text">Аргументи командного рядка(тільки для експертів)</string>
 	<string name="use_controls">Включити екранне управління</string>
@@ -16,9 +12,6 @@
 	<string name="gamedir">Каталог мода</string>
 	<string name="pkgname">Пакет мода (тільки для експертів)</string>
 	<string name="shortcut_name">Назва ярлика</string>
-
-<!-- TODO: Remove or change this placeholder text -->
-	<string name="about_main">Xash3D Android</string>
 	<string name="about_copyright">SDLash3D не пов\'язаний з Valve або з будь-якими з їх партнерів. Всі авторські права належать їх відповідним власникам.</string>
 	<string name="about_authors">Порт на Android здійснений командою SDLash3D:\n
 &#8226; a1batross\n
@@ -29,9 +22,9 @@
 &#8226; Дяде Мише за Xash3D\n
 &#8226; Valve за Half-Life\n
 &#8226; Розробникам libSDL2.\n</string>
-	<string name="about_links">Слідуйте за нами в:
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+	<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/SDLash3D">GitHub</a></string>
 	<string name="about_button">О Xash3D Android</string>
 	<string name="create_shortcut_button">Створити ярлик мода</string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index f524884c..e0e63847 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -1,75 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
-
-
-    <string name="app_name">Xash3D</string>
-
-    <string name="launcher_name">Xash3D</string>
-
-    <string name="launcher_name_test">Xash3D (test)</string>
-
     <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="text_shortcut">Xash3D 快捷方式</string>
-
     <string name="text_shortcut_test">Xash3D_test 快捷方式</string>
-
     <string name="shortcut_button_save">保存快捷方式</string>
-
     <string name="gamedir">Mod 目录</string>
-
     <string name="pkgname">Mod 资源包名字（高级）</string>
-
     <string name="shortcut_name">快捷方式名字</string>
-
-
-<!-- TODO: Remove or change this placeholder text -->
-
-    <string name="about_main">Xash3D Android</string>
-
     <string name="about_copyright">SDLash3D不隶属于Valve或其合作伙伴。 版权归各自所有。</string>
-
     <string name="about_authors">由SDLash3D团队移植到Android系统，成员： \n
-
 &#8226; a1batross\n
-
 &#8226; mittorn \n
-
 &#8226; nicknekit.\n
 
-
 特别感谢：\n
-
 &#8226; Uncle Mike 制作的 Xash3D 引擎\n
-
 &#8226; Valve 制作的 《半条命》\n
-
 &#8226; libSDL2 开发商\n</string>
-
-    <string name="about_links">联系我们： 
-
-	&#8226; <a href="https://vk.com/xashdroid">VK</a>
-
-	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
-
+    <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/SDLash3D">GitHub</a></string>
-
     <string name="about_button">关于 Xash3D Android</string>
-
     <string name="create_shortcut_button">创建mod快捷方式</string>
-
     <string name="select_folder">(选择)</string>
-
 </resources>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1283762e..c9af50bd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Xash3D</string>
-	<string name="launcher_name">Xash3D</string>
-	<string name="launcher_name_test">Xash3D (test)</string>
+    <string name="app_name" translatable="false">Xash3D</string>
+	<string name="launcher_name" translatable="false">Xash3D</string>
+	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>
 	<string name="version_string" translatable="false">v0.17.1</string>
 
     <string name="launch_button">Launch Xash3D!</string>
@@ -16,7 +16,7 @@
 	<string name="pkgname">Mod package name (experts only)</string>
 	<string name="shortcut_name">Shortcut name</string>
 
-    <string name="about_main">Xash3D Android</string>
+    <string name="about_main" translatable="false">Xash3D Android</string>
     <string name="about_copyright">SDLash3D is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners.</string>
 	<!-- Seems Android skips any line breaks and tabs here. -->
     <string name="about_authors">
@@ -49,7 +49,7 @@
     <string name="folder">Set current folder</string>
 	
 	<string name="update_button">Check updates on start</string>
-	<string name="update_message">%s is available!</string>
+	<string name="update_message">%s is available! Download it now!</string>
 	<string name="update">Update</string>
 	<string name="cancel">Cancel</string>
 	<string name="no_updates">No updates was found</string>

From cd1c47245acebd33ea6039d7db8e828718a06b51 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 27 May 2016 00:18:02 +0000
Subject: [PATCH 56/83] 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 a1ffbf31..fbb62fba 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit a1ffbf310f7cfc08647bd8731f7c45b6e31b37c5
+Subproject commit fbb62fbaebb3b92b09eb2979e4cf34b7a53fce92

From c52453ea1ace4b89d6381b44866b3ef1489ccf91 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 31 May 2016 09:03:38 +0000
Subject: [PATCH 57/83] Volume buttons

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

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index fbb62fba..a581d086 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit fbb62fbaebb3b92b09eb2979e4cf34b7a53fce92
+Subproject commit a581d08683dd5c6b5695cc334acd9d5d56b23f31
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index e4d72703..78653a6d 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -40,6 +40,7 @@ public class XashActivity extends Activity {
 
 		// Preferences
 	public static SharedPreferences mPref = null;
+	private static boolean mUseVolume;
 
 	// Audio
 	private static Thread mAudioThread;
@@ -125,6 +126,7 @@ public class XashActivity extends Activity {
 		InstallReceiver.extractPAK(this, false);
 
 		mPixelFormat = mPref.getInt("pixelformat", 0);
+		mUseVolume = mPref.getBoolean("usevolume", false);
 		AndroidBug5497Workaround.assistActivity(this);
 	}
 
@@ -211,6 +213,9 @@ public class XashActivity extends Activity {
 	public static boolean handleKey( int keyCode, KeyEvent event )
 	{
 
+	if ( mUseVolume && ( keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+			keyCode == KeyEvent.KEYCODE_VOLUME_UP ) )
+		return false;
 		//Log.d( TAG, "Keycode " + keyCode );
 		if (event.getAction() == KeyEvent.ACTION_DOWN)
 		{

From 1fde2ba0ddc3d323739aa936a39202de42e209d0 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 31 May 2016 12:23:09 +0000
Subject: [PATCH 58/83] Update layout

---
 res/layout/activity_fpicker.xml            | 12 +++---
 res/layout/activity_launcher.xml           | 50 +++++++++++++++++-----
 res/values-ru/strings.xml                  |  6 ++-
 res/values/strings.xml                     |  7 +--
 src/in/celest/xash3d/LauncherActivity.java | 38 ++++++++++++----
 5 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/res/layout/activity_fpicker.xml b/res/layout/activity_fpicker.xml
index 7001b44e..fde6e1ac 100644
--- a/res/layout/activity_fpicker.xml
+++ b/res/layout/activity_fpicker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -7,20 +7,20 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="in.celest.xash3dVR.FPicker">
+    tools:context="in.celest.xash3dVR.FPicker"
+    android:orientation="vertical">
 
     <ListView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/FileView"
-        android:layout_above="@+id/button2" />
+        android:id="@+id/FileView"
+        android:layout_weight="1"/>
 
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/folder"
         android:id="@+id/button_fpicker_select"
-        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:onClick="onFileClick" />
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index fa08ecca..670c604b 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -97,6 +97,15 @@
                         android:orientation="vertical"
                         android:weightSum="1">
 
+                        <TextView
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp"
+                            android:text="@string/volume"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
 
                         <ToggleButton
                             android:id="@+id/useVolume"
@@ -125,6 +134,17 @@
                         <!--android:id="@+id/Tracking"/>-->
 
 
+                        <TextView
+                            android:id="@+id/textView_path"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp"
+                            android:text="@string/text_res_path"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
                         <Button
                             android:id="@+id/button_select"
@@ -137,8 +157,16 @@
                             android:layout_marginRight="10dp"
                             android:onClick="selectFolder"
                             android:text="@string/select_folder" />
-
-
+                        <Button
+                            android:id="@+id/button_shortcut"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="10dp"
+                            android:onClick="createShortcut"
+                            android:text="@string/create_shortcut_button" />
 
                     </LinearLayout>
 
@@ -203,7 +231,6 @@
                             android:layout_marginTop="3dp" />
 
                         <TextView
-                            android:id="@+id/textView_path"
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="10dp"
@@ -213,6 +240,7 @@
                             android:text="@string/text_res_path"
                             android:textAppearance="?android:attr/textAppearanceMedium" />
 
+
                         <EditText
                             android:id="@+id/cmdPath"
                             android:layout_width="match_parent"
@@ -223,19 +251,19 @@
                             android:layout_marginTop="3dp" />
 
 
-                        <Button
-                            android:id="@+id/button_shortcut"
-                            android:layout_width="match_parent"
+                    <TextView
+                            android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="10dp"
                             android:layout_marginLeft="10dp"
                             android:layout_marginRight="10dp"
-                            android:layout_marginTop="10dp"
-                            android:onClick="createShortcut"
-                            android:text="@string/create_shortcut_button" />
+                            android:layout_marginTop="3dp"
+                            android:text="Pixel format"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
                     <Spinner
-			    android:layout_height="match_parent"
-			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:layout_width="match_parent"
 			    android:id="@+id/pixelSpinner"
                             android:layout_marginBottom="10dp"
                             android:layout_marginLeft="10dp"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0fa5a456..8dfbc0ad 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,7 +3,9 @@
     <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
     <string name="launch_button">Запустить Xash3D</string>
 	<string name="use_controls">Включить экранное управление</string>
-	<string name="use_volume">Использовать кнопки громкости</string>
+	<string name="volume">Действие кнопок громкости</string>
+	<string name="use_volume">Регулировка громкости</string>
+	<string name="no_volume">Использовать в игре</string>
 	<string name="text_res_path">Путь к ресурсам игры</string>
 	<string name="touch_set">Настройки управления</string>
 	<string name="text_shortcut">Ярлык Xash3D</string>
@@ -26,4 +28,6 @@
 	<string name="action_settings">Настройки</string>
 	<string name="text_shortcut_test">Ярлык Xash3D (тест)</string>
 	<string name="create_shortcut_button">Создать ярлык</string>
+	<string name="select_folder">Выбрать</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19b742ab..0543fed8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,13 +35,14 @@ Special thanks to:\n
 	&#8226; <a href="https://github.com/SDLash3D">GitHub</a></string>
     <string name="about_button">About Xash3D Android</string>
     <string name="create_shortcut_button">Create mod shortcut</string>
-    <string name="select_folder">(select)</string>
+    <string name="select_folder">Select folder</string>
     
     <string name="text_tab1">Normal</string>
     <string name="text_tab2">Advanced</string>
     <string name="text_res_tittle2">Normal settings</string>
     <string name="text_res_tittle3">Advanced settings</string>
-    <string name="use_volume">Gamepad support off!</string>
-    <string name="no_volume">Gamepad support active!</string>
+    <string name="volume">Volume buttons mode</string>
+    <string name="use_volume">Default action</string>
+    <string name="no_volume">Use in game</string>
     <string name="folder">Set current folder</string>
 </resources>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 5c0e1036..92946fe4 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -10,6 +10,8 @@ import android.view.View;
 import android.content.Intent;
 import android.view.Window;
 import android.widget.EditText;
+import android.widget.TextView;
+
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.Button;
@@ -40,6 +42,7 @@ public class LauncherActivity extends Activity {
 	static EditText resPath;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
+	static TextView tvResPath;
 	String getDefaultPath()
 	{
 		File dir = Environment.getExternalStorageDirectory();
@@ -72,12 +75,12 @@ public class LauncherActivity extends Activity {
 	tabHost.addTab(tabSpec);
 
 	final String[] list = {
-	"RGBA8888",
-	"RGBA888",
-	"RGB565",
-	"RGBA5551",
-	"RGBA4444",
-	"RGB332"
+	"32 bit (RGBA8888)",
+	"24 bit (RGB888)",
+	"16 bit (RGB565)",
+	"15 bit (RGBA5551)",
+	"12 bit (RGBA4444)",
+	"8 bit (RGB332)"
 	};
 	pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
 	ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
@@ -117,10 +120,26 @@ public class LauncherActivity extends Activity {
 	useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
 	useVolume.setChecked(mPref.getBoolean("usevolume",true));
 	resPath = ( EditText ) findViewById( R.id.cmdPath );
-	resPath.setText(mPref.getString("basedir", getDefaultPath()));
+	tvResPath = ( TextView ) findViewById( R.id.textView_path );
+	updatePath(mPref.getString("basedir", getDefaultPath()));
+	resPath.setOnFocusChangeListener( new View.OnFocusChangeListener()
+	
+	{
+		@Override
+		public void onFocusChange(View v, boolean hasFocus)
+		{
+			updatePath( resPath.getText().toString() );
+		}
+	} );
 	pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
 	}
 
+	void updatePath( String text )
+	{
+		tvResPath.setText(getResources().getString(R.string.text_res_path) + ":\n" + text );
+		resPath.setText(text);
+	
+	}
     public void startXash(View view)
     {
 	Intent intent = new Intent(this, XashActivity.class);
@@ -163,8 +182,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent resultData)
 		if (resultCode == RESULT_OK) {
 try{
 
-		resPath = ( EditText ) findViewById( R.id.cmdPath );
-		resPath.setText( resultData.getStringExtra("GetPath"));
+		if( resPath == null )
+		    return;
+		updatePath( resultData.getStringExtra("GetPath"));
 
 //	final List<String> paths = resultData.getData().getPathSegments();
 //			String[] parts = paths.get(1).split(":");

From 530d68e43a05b98d0e0d5bb4e092e55ea1d0b342 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 12 Jun 2016 20:31:15 +0000
Subject: [PATCH 59/83] Update branches

---
 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 a581d086..1b489f0e 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit a581d08683dd5c6b5695cc334acd9d5d56b23f31
+Subproject commit 1b489f0e4d21ac487efc9fb7837d687344d59940
diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d
index 1706490b..2c0f598c 160000
--- a/jni/src/hlsdk-xash3d
+++ b/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit 1706490b2078cb45c35d25ebc46b1e96c6abcc38
+Subproject commit 2c0f598c6d7990b2e1ae1af6178aa4b9e6d82cf6

From cc211aa82e816e9556c4aeb2d2f31d624b08333a Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 13 Jun 2016 20:09:45 +0000
Subject: [PATCH 60/83] Update branch

---
 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 1b489f0e..2edbead1 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 1b489f0e4d21ac487efc9fb7837d687344d59940
+Subproject commit 2edbead146345c5406547f5d1450889a7531438d

From a7a1a2457cd8d59fb00cbd5a5ecb1771aa233678 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 26 Jun 2016 11:15:37 +0000
Subject: [PATCH 61/83] 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 2edbead1..ba4c1628 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 2edbead146345c5406547f5d1450889a7531438d
+Subproject commit ba4c1628716f5423643f64bdfc92067c062b8a51

From 249bbf991a877cfe40dda41718b65cbf28a8fe8b Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 27 Jun 2016 11:01:00 +0000
Subject: [PATCH 62/83] 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 ba4c1628..1318e3b1 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit ba4c1628716f5423643f64bdfc92067c062b8a51
+Subproject commit 1318e3b12bc5e59c08e9826a664ff2ae088a49f1

From e55c292c817cd5363be6e2f0c27f70ea053ae336 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 2 Jul 2016 22:30:01 +0000
Subject: [PATCH 63/83] 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 1318e3b1..1c21fb1d 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 1318e3b12bc5e59c08e9826a664ff2ae088a49f1
+Subproject commit 1c21fb1dace7b943853c3332cf1a924723b51b44

From d19f81fef11b1637bc08e781f178d9e813323257 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 2 Jul 2016 22:31:25 +0000
Subject: [PATCH 64/83] Add switch for resize on keyboard

---
 res/layout/activity_launcher.xml           | 13 +++++++++++++
 src/in/celest/xash3d/LauncherActivity.java |  8 ++++++--
 src/in/celest/xash3d/XashActivity.java     |  3 ++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 670c604b..0b1895d4 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -270,6 +270,19 @@
                             android:layout_marginRight="10dp"
                             android:layout_marginTop="10dp"/>
 
+
+					<ToggleButton
+								 android:id="@+id/enableResizeWorkaround"
+								 android:layout_width="match_parent"
+								 android:layout_height="wrap_content"
+								 android:layout_margin="10dp"
+								 android:layout_marginLeft="10dp"
+								 android:layout_marginRight="10dp"
+								 android:layout_marginTop="10dp"
+								 android:text="enableResizeWorkaround"
+								 android:textOff="Keyboard does not resize screen"
+                            android:textOn="Keyboard resizes screen" />
+
                         <TextView
                             android:id="@+id/textView7"
                             android:layout_marginBottom="10dp"
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 92946fe4..4e4e998c 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -39,6 +39,7 @@ public class LauncherActivity extends Activity {
    	public final static int sdk = Integer.valueOf(Build.VERSION.SDK);
 	static EditText cmdArgs;
 	static ToggleButton useVolume;
+	static ToggleButton resizeWorkaround;
 	static EditText resPath;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
@@ -78,8 +79,8 @@ public class LauncherActivity extends Activity {
 	"32 bit (RGBA8888)",
 	"24 bit (RGB888)",
 	"16 bit (RGB565)",
-	"15 bit (RGBA5551)",
-	"12 bit (RGBA4444)",
+	"16 bit (RGBA5551)",
+	"16 bit (RGBA4444)",
 	"8 bit (RGB332)"
 	};
 	pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
@@ -119,6 +120,8 @@ public class LauncherActivity extends Activity {
 	cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
 	useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
 	useVolume.setChecked(mPref.getBoolean("usevolume",true));
+	resizeWorkaround = ( ToggleButton ) findViewById( R.id.enableResizeWorkaround );
+	resizeWorkaround.setChecked(mPref.getBoolean("enableResizeWorkaround",true));
 	resPath = ( EditText ) findViewById( R.id.cmdPath );
 	tvResPath = ( TextView ) findViewById( R.id.textView_path );
 	updatePath(mPref.getString("basedir", getDefaultPath()));
@@ -150,6 +153,7 @@ public class LauncherActivity extends Activity {
 	editor.putBoolean("usevolume",useVolume.isChecked());
 	editor.putString("basedir", resPath.getText().toString());
 	editor.putInt("pixelformat", pixelSpinner.getSelectedItemPosition());
+	editor.putBoolean("enableResizeWorkaround",resizeWorkaround.isChecked());
 	editor.commit();
 	startActivity(intent);
     }
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 78653a6d..8e90e176 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -127,7 +127,8 @@ public class XashActivity extends Activity {
 
 		mPixelFormat = mPref.getInt("pixelformat", 0);
 		mUseVolume = mPref.getBoolean("usevolume", false);
-		AndroidBug5497Workaround.assistActivity(this);
+		if( mPref.getBoolean("enableResizeWorkaround", true) )
+			AndroidBug5497Workaround.assistActivity(this);
 	}
 
 	// Events

From c4d3e4af20502bc5fd2359a4e0ce27cb198ca1c6 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 2 Jul 2016 22:50:31 +0000
Subject: [PATCH 65/83] New test icons

---
 test/res/drawable-hdpi/ic_launcher.png  | Bin 6048 -> 5401 bytes
 test/res/drawable-ldpi/ic_launcher.png  | Bin 0 -> 2476 bytes
 test/res/drawable-mdpi/ic_launcher.png  | Bin 3572 -> 3503 bytes
 test/res/drawable-xhdpi/ic_launcher.png | Bin 8275 -> 7340 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/res/drawable-ldpi/ic_launcher.png

diff --git a/test/res/drawable-hdpi/ic_launcher.png b/test/res/drawable-hdpi/ic_launcher.png
index 8ec8cec54b9f59d4f75f7a575c57dfc2daa762be..04362f709863b3f2c6dc8bd06bd6e22fbf1bbb4b 100644
GIT binary patch
delta 5369
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
XFgh?W<at$p00000NkvXXu0mjfWCyik

delta 6023
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
B+syy~

diff --git a/test/res/drawable-ldpi/ic_launcher.png b/test/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..4224b229335e65e2d908ed92a135129eb0e341fd
GIT binary patch
literal 2476
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

literal 0
HcmV?d00001

diff --git a/test/res/drawable-mdpi/ic_launcher.png b/test/res/drawable-mdpi/ic_launcher.png
index dd751c758c014d5011f78f47e3ef71060a24da35..bf998a5bbf0e1a2348bacbd82d54fe5904d37e46 100644
GIT binary patch
delta 3456
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

delta 3528
zcmV;(4L9<y8}u8HB#~e(f8Pfh3Lzh^IP!4-01bgjL_t(&-qo6WkW}@R$3MS&`!W5R
zo;S=4Fu)*>;VA)A3Mv8DM-UTgU9F9njUlzf)x^ZLN_VYw<5sN^wX9f4ts%y2%F3=4
zHg2&&0w}91ZqP^&7(oY+hrDKBm^b~reeZAoIDO~d9;VR^nyPeFe^2+^zWw{1?>XP|
zJ?HoPwbGk00nMN0L!mcg{D~Tm-i#6WtOozp^A7|%KG+vfO3~IfyRh=ECkmfQ2=rzQ
zbra5|4D!OGGlIuHI@6ra<l3x)J<V}wEjVUl!6pglV1R*uVV^b)j)a1Nj%XzG{?sW=
zr~l%ieT7Snz#k02e>(Y3>hXX4!Px%6?De^PVYyYX7dW=l<Y>ZLkDgLWDGY;Lz%)*V
zg67UhMd0P?%E-0{*Y%wFqXKyJ>otx21DREstaWFhV9#*0{)4D!n#u|W%zd$F@P*o{
z$iF|duJ`O`3gD@Gn?s#v`)*04^AB2<Jzr~GA^=(!<xB%=f8=a(O#y1eXNIBdaLC+Q
z84rJd;>4!SYaTmfed+-I;j2}3eFN!-vbn+<$8q9*yR-(=fXXP;C!sD0$tVQOBHaow
zkcM*uaCQKO(%@(?MgR!}jDc7*_%CB>V^2P`uD9<~1Mt9Y(Uw%&dM0mKE421x*U=CS
zLu(_<nFN!@e?nCZLct4-b2Q`&&^ri6x}g0i9O;CtReG;sC_7pad}(Zb;(@<^uII!h
z1Nhrp!!4<dwa&7f8?=uq0TZT=hpT4^fN-!hBBNIwp^s9K&BLM7@J2fvJOz&9QA;U^
zMMA$BQ=j<e!xsVZu>kJBHQbQN7Jizy>=mw2j)v+ue=M5^S4@M7kT<!)$Nkarpm<69
zz@)P9RtLPc8-_A|5Q=CdxW1_&_RYWhNnc+%0A;K2{kJ8;nQY<Vyk+0)H@>L`zVZcF
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
C8RGo_

diff --git a/test/res/drawable-xhdpi/ic_launcher.png b/test/res/drawable-xhdpi/ic_launcher.png
index bd51c964e42676e96a384f1e5aabe333337bbb3f..763dd64d752eec890eabb3ba23da1a6fa0b0b239 100644
GIT binary patch
delta 7323
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
Bgbx4!

delta 8268
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%0A@`1AN9AXGQ%we
z3?Rw?%rd~J0$5EX#Oi9xSVL_&>MBdvf2^{oh=v0Q`c<hYT#j!|<L2|P+yg9{jL(1K
z31Inh3by<90gpXKY-l174jiC>eZviBEc}nc1-TXR%#wBtz#xEb0z+2Bld|Ga66J?Z
zp-fR&c_hfni^9C3BrJ=HBfLBuV9`*3g@b<hRfQ?s*iEEvOlK>OXud@QqHy-1f4bUv
zR`Zot==nSDpnz&pQZILO>7_s-;l*|yow8PbjNhnjT7(Zk5J1?-A&PB}D1Zn(Scr2a
ztSHQ{aHcXwUB<W5*()!Uvd;BPZ@x*vcFB@Lpa0ZT!0oqB-W|<==6_r+$O{N77y$#2
zAb^koOvrcyjacF{Ue7y$`<sCCe<wW4oH^t5n}XxaK$w>BO#tYhbLTJvwrT(oF=|Ye
zMt0o@U=DzJ0Ok(^TV&x5WYc>*^^}xSN~vj5u3S0U_x<6FeDXO6fSYxgpp09H2D~(5
z!gm5;)vB{9{IgMtI9q{R8i88_kd;8I1b(FeYi9gx4?hh2!#_|HWz8BOLL8n}d10zS
z*bmHTDdOxM4<L%Y_%9In-dQ_GQxg^5UVq&!W^BSnTsK2!<NqIbyp18aot%mQ0000<
KMNUMnLSTYjE)zWf


From 106b193511ae87989e03b7cf3c2b3114904991a6 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Tue, 26 Jul 2016 17:54:29 +0600
Subject: [PATCH 66/83] Autoupdater: add a checkbox for checking beta versions
 also

---
 res/layout/activity_launcher.xml           |  54 ++++++--
 res/values-ru/strings.xml                  |   1 +
 res/values/strings.xml                     |   1 +
 src/in/celest/xash3d/LauncherActivity.java | 139 ++++++++++++---------
 4 files changed, 128 insertions(+), 67 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 693858af..abed4953 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -87,6 +87,15 @@
 							android:background="#444444"
 							android:orientation="vertical"
 							android:weightSum="1">
+							<TextView
+								android:layout_width="fill_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="3dp"
+								android:text="@string/volume"
+								android:textAppearance="?android:attr/textAppearanceMedium" />
 							<ToggleButton
 								android:id="@+id/useVolume"
 								android:layout_width="match_parent"
@@ -98,6 +107,16 @@
 								android:text="nothing"
 								android:textOff="@string/no_volume"
 								android:textOn="@string/use_volume" />
+							<TextView
+								android:id="@+id/textView_path"
+								android:layout_width="fill_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="3dp"
+								android:text="@string/text_res_path"
+								android:textAppearance="?android:attr/	textAppearanceMedium" />
 							<Button
 								android:id="@+id/button_select"
 								android:layout_width="match_parent"
@@ -109,6 +128,16 @@
 								android:layout_marginRight="10dp"
 								android:onClick="selectFolder"
 								android:text="@string/select_folder" />
+							<Button
+								android:id="@+id/button_shortcut"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp"
+								android:onClick="createShortcut"
+								android:text="@string/create_shortcut_button" />
 						</LinearLayout>
 					</LinearLayout>
 					<LinearLayout
@@ -163,7 +192,6 @@
 								android:layout_marginRight="10dp"
 								android:layout_marginTop="3dp" />
 							<TextView
-								android:id="@+id/textView_path"
 								android:layout_width="fill_parent"
 								android:layout_height="wrap_content"
 								android:layout_marginBottom="10dp"
@@ -180,19 +208,18 @@
 								android:layout_marginLeft="10dp"
 								android:layout_marginRight="10dp"
 								android:layout_marginTop="3dp" />
-							<Button
-								android:id="@+id/button_shortcut"
-								android:layout_width="match_parent"
+							<TextView
+								android:layout_width="fill_parent"
 								android:layout_height="wrap_content"
 								android:layout_marginBottom="10dp"
 								android:layout_marginLeft="10dp"
 								android:layout_marginRight="10dp"
-								android:layout_marginTop="10dp"
-								android:onClick="createShortcut"
-								android:text="@string/create_shortcut_button" />
+								android:layout_marginTop="3dp"
+								android:text="Pixel Format"
+								android:textAppearance="?android:attr/textAppearanceMedium" />
 							<Spinner
-								android:layout_height="match_parent"
-								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_width="math_parent"
 								android:id="@+id/pixelSpinner"
 								android:layout_marginBottom="10dp"
 								android:layout_marginLeft="10dp"
@@ -218,6 +245,15 @@
 								android:layout_marginRight="10dp"
 								android:layout_marginTop="10dp"
 								android:text="@string/update_button" />
+							<CheckBox
+								android:id="@+id/check_betas"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_margin="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp"
+								android:text="@string/update_to_beta" />
 							<TextView
 								android:id="@+id/textView7"
 								android:layout_marginBottom="10dp"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c5e429f3..dacb2b48 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -57,6 +57,7 @@
     <string name="folder">Выбрать текущий каталог</string>
 	
 	<string name="update_button">Проверять обновления при запуске</string>
+	<string name="update_button">Обновлять до нестабильной версии, если доступно</string>
 	<string name="update_message">%s доступен! Скачай его сейчас!</string>
 	<string name="update">Обновить</string>
 	<string name="cancel">Отмена</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47ba0832..faaaf8fd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="folder">Set current folder</string>
 	
 	<string name="update_button">Check updates on start</string>
+	<string name="update_button">Update to unstable version if available</string>
 	<string name="update_message">%s is available! Download it now!</string>
 	<string name="update">Update</string>
 	<string name="cancel">Cancel</string>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index df1b1325..bd978cdd 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -56,14 +56,13 @@ import in.celest.xash3d.hl.R;
 public class LauncherActivity extends Activity {
    // public final static String ARGV = "in.celest.xash3d.MESSAGE";
    	public final static int sdk = Integer.valueOf(Build.VERSION.SDK);
-	public final static String UPDATE_LINK = "https://api.github.com/repos/SDLash3D/xash3d-android-project/releases/latest";
-	static EditText cmdArgs;
-	static ToggleButton useVolume;
-	static ToggleButton resizeWorkaround;
-	static CheckBox	checkUpdates;
-	static EditText resPath;
+	public final static String UPDATE_LINK = "https://api.github.com/repos/SDLash3D/xash3d-android-project/releases"; // releases/latest doesn't return prerelease and drafts
+	static EditText cmdArgs, resPath;
+	static ToggleButton useVolume, resizeWorkaround;
+	static CheckBox	checkUpdates, updateToBeta;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
+	static TextView tvResPath;
 	
 	String getDefaultPath()
 	{
@@ -98,35 +97,47 @@ public class LauncherActivity extends Activity {
 		tabSpec.setContent(R.id.tab2);
 		tabHost.addTab(tabSpec);
 
-		mPref		 = getSharedPreferences("engine", 0);
-		cmdArgs		 = (EditText)findViewById(R.id.cmdArgs);
-		useVolume	 = (ToggleButton) findViewById( R.id.useVolume );
-		resPath		 = (EditText) findViewById( R.id.cmdPath );
+		mPref        = getSharedPreferences("engine", 0);
+		cmdArgs      = (EditText)findViewById(R.id.cmdArgs);
+		useVolume    = (ToggleButton) findViewById( R.id.useVolume );
+		resPath      = (EditText) findViewById( R.id.cmdPath );
 		checkUpdates = (CheckBox)findViewById(R.id.check_updates);
+		updateToBeta = (CheckBox)findViewById(R.id.check_betas);
 		pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
 		resizeWorkaround = (ToggleButton) findViewById( R.id.enableResizeWorkaround );
-
+		tvResPath    = (TextView) findViewById( R.id.textView_path );
+		
 		final String[] list = {
-			"RGBA8888",
-			"RGBA888",
-			"RGB565",
-			"RGBA5551",
-			"RGBA4444",
-			"RGB332"
+			"32 bit (RGBA8888)",
+			"24 bit (RGB888)",
+			"16 bit (RGB565)",
+			"15 bit (RGBA5551)",
+			"12 bit (RGBA4444)",
+			"8 bit (RGB332)"
 		};
 		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
 		adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
 		pixelSpinner.setAdapter(adapter);
 		useVolume.setChecked(mPref.getBoolean("usevolume",true));
 		checkUpdates.setChecked(mPref.getBoolean("check_updates",true));
-		resPath.setText(mPref.getString("basedir", getDefaultPath()));
+		updateToBeta.setChecked(mPref.getBoolean("check_betas", false);
+		updatePath(mPref.getString("basedir", getDefaultPath()));
 		cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
 		pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
-		resizeWorkaround.setChecked(mPref.getBoolean("enableResizeWorkaround",true));
+		resizeWorkaround.setChecked(mPref.getBoolean("enableResizeWorkaround", true));
+		
+		resPath.setOnFocusChangeListener( new View.OnFocusChangeListener()
+		{
+			@Override
+			public void onFocusChange(View v, boolean hasFocus)
+			{
+				updatePath( resPath.getText().toString() );
+			}
+		} );
 
 		if(mPref.getBoolean("check_updates", true))
 		{
-			new CheckUpdate(true).execute(UPDATE_LINK);
+			new CheckUpdate(true, updateToBeta.getBoolean()).execute(UPDATE_LINK);
 		}
 	}
 
@@ -185,13 +196,6 @@ public class LauncherActivity extends Activity {
 				if( resPath == null )
 					return;
 				updatePath(resultData.getStringExtra("GetPath"));
-
-//				final List<String> paths = resultData.getData().getPathSegments();
-//				String[] parts = paths.get(1).split(":");
-//				String storagepath = Environment.getExternalStorageDirectory().getPath() + "/";
-//				String path = storagepath + parts[1];
-//				if( path != null)
-//					resPath.setText( path );
 				resPath.setEnabled(true);
 			}
 			catch(Exception e)
@@ -237,13 +241,16 @@ public class LauncherActivity extends Activity {
 		InputStream is = null;
 		ByteArrayOutputStream os = null;
 		boolean mSilent;
+		boolean mBeta;
 
-		public CheckUpdate( boolean silent )
+		public CheckUpdate( boolean silent, boolean beta )
 		{
 			mSilent = silent;
+			mBeta = beta;
 		}
 
-		protected String doInBackground(String... urls) {
+		protected String doInBackground(String... urls) 
+		{
 			try
 			{
 				URL url = new URL(urls[0]);
@@ -268,6 +275,7 @@ public class LauncherActivity extends Activity {
 
 		protected void onPostExecute(String result)
 		{
+			JSONArray releases = null;
 			try
 			{
 				if (is != null)
@@ -280,12 +288,12 @@ public class LauncherActivity extends Activity {
 			{
 				e.printStackTrace();
 			}
-			JSONObject obj = new JSONObject(os.toString());
 
 			try
 			{
 				if (os != null) 
 				{
+					releases = new JSONArray(os.toString());
 					os.close();
 					os = null;
 				}
@@ -293,36 +301,51 @@ public class LauncherActivity extends Activity {
 			catch(Exception e)
 			{
 				e.printStackTrace();
+				return;
 			}
-			final String version = obj.getString("tag_name");
-			final String url 	 = obj.getString("html_url");
-			final String name	 = obj.getString("name");
-
-			Log.d("Xash", "Found: " + version +
-				", I: " + getString(R.string.version_string));
-
-			// this is an update
-			if( getString(R.string.version_string).compareTo(version) < 0 )
+			
+			if( releases == null )
+				return;
+			
+			for( JSONObject obj: releases )
 			{
-				String dialog_message = String.format(getString(R.string.update_message), name);
-				AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
-				builder.setMessage(dialog_message)
-					.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int id) {
-							final Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
-							startActivity(intent);
-						}
-					})
-					.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int which){}
-					});
-				builder.create().show();
-			}
-			else if( !mSilent )
-			{
-				Toast.makeText(getBaseContext(), R.string.no_updates, Toast.LENGTH_SHORT).show();
+				final String version, url, name;
+				final bool beta = obj.getBoolean("prerelease");
+				
+				if( beta && !mBeta )
+					continue;
+					
+				version = obj.getString("tag_name");
+				url = obj.getString("html_url");
+				name = obj.getString("name");
+				Log.d("Xash", "Found: " + version +
+					", I: " + getString(R.string.version_string));
+					
+				// this is an update
+				if( getString(R.string.version_string).compareTo(version) < 0 )
+				{
+					String dialog_message String.format(getString(R.string.update_message), name);
+					AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
+					builder.setMessage(dialog_message)
+						.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
+						{
+							public void onClick(DialogInterface dialog, int id) 
+							{
+								final Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
+								startActivity(intent);
+							}
+						})
+						.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
+							{ public void onClick(DialogInterface dialog, int id) {} } );
+					builder.create().show();
+				}
+				else if( !mSilent )
+				{
+					Toast.makeText(getBaseContext(), R.string.no_updates, Toast.LENGTH_SHORT).show();
+				}
+				
+				// No need to check other releases, so we will stop here.
+				break;
 			}
 		}
 	}

From df0a0f2a64b725c8a45b9f148d309f5997068023 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Tue, 26 Jul 2016 18:01:17 +0600
Subject: [PATCH 67/83] Update autoupdater link

---
 src/in/celest/xash3d/LauncherActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index bd978cdd..f55ad489 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -56,7 +56,7 @@ import in.celest.xash3d.hl.R;
 public class LauncherActivity extends Activity {
    // public final static String ARGV = "in.celest.xash3d.MESSAGE";
    	public final static int sdk = Integer.valueOf(Build.VERSION.SDK);
-	public final static String UPDATE_LINK = "https://api.github.com/repos/SDLash3D/xash3d-android-project/releases"; // releases/latest doesn't return prerelease and drafts
+	public final static String UPDATE_LINK = "https://api.github.com/repos/FWGS/xash3d-android-project/releases"; // releases/latest doesn't return prerelease and drafts
 	static EditText cmdArgs, resPath;
 	static ToggleButton useVolume, resizeWorkaround;
 	static CheckBox	checkUpdates, updateToBeta;

From 4697cda8b0d911aa3ae2ba5bb75b8df8e92edc27 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Tue, 26 Jul 2016 22:39:54 +0600
Subject: [PATCH 68/83] Android joystick backend

---
 .../xash3d/.ShortcutActivity.java.kate-swp    | Bin 0 -> 109 bytes
 src/in/celest/xash3d/LauncherActivity.java    |   6 +-
 src/in/celest/xash3d/ShortcutActivity.java    |   2 +-
 src/in/celest/xash3d/XashActivity.java        | 172 +++++++++++++++++-
 4 files changed, 167 insertions(+), 13 deletions(-)
 create mode 100644 src/in/celest/xash3d/.ShortcutActivity.java.kate-swp

diff --git a/src/in/celest/xash3d/.ShortcutActivity.java.kate-swp b/src/in/celest/xash3d/.ShortcutActivity.java.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..175bf014ca65c8602941e7be798b20be50ea2713
GIT binary patch
literal 109
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnQC^Xl?RUzI>4e16i%rZ*E^T}EE)5O>
a%5VU&G!V<U274lLnJ&z7#V5}g<O%?C1{9nC

literal 0
HcmV?d00001

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index f55ad489..57f41b1c 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -120,7 +120,7 @@ public class LauncherActivity extends Activity {
 		pixelSpinner.setAdapter(adapter);
 		useVolume.setChecked(mPref.getBoolean("usevolume",true));
 		checkUpdates.setChecked(mPref.getBoolean("check_updates",true));
-		updateToBeta.setChecked(mPref.getBoolean("check_betas", false);
+		updateToBeta.setChecked(mPref.getBoolean("check_betas", false));
 		updatePath(mPref.getString("basedir", getDefaultPath()));
 		cmdArgs.setText(mPref.getString("argv","-dev 3 -log"));
 		pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
@@ -264,6 +264,8 @@ public class LauncherActivity extends Activity {
 				{
 					os.write(buffer, 0, len);
 				}
+				os.flush();
+				
 				return os.toString();
 			}
 			catch(Exception e)
@@ -324,7 +326,7 @@ public class LauncherActivity extends Activity {
 				// this is an update
 				if( getString(R.string.version_string).compareTo(version) < 0 )
 				{
-					String dialog_message String.format(getString(R.string.update_message), name);
+					String dialog_message = String.format(getString(R.string.update_message), name);
 					AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
 					builder.setMessage(dialog_message)
 						.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 900fb518..23a8616b 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.Toast;
-import in.celest.xash3d.hl.R;
+import in.celest.xash3d.hl.*;
 import android.widget.EditText;
 import android.widget.Button;
 import java.io.File;
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 8e90e176..4741adab 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -38,7 +38,7 @@ public class XashActivity extends Activity {
 	public static int mPixelFormat;
 	protected static ViewGroup mLayout;
 
-		// Preferences
+	// Preferences
 	public static SharedPreferences mPref = null;
 	private static boolean mUseVolume;
 
@@ -150,9 +150,17 @@ public class XashActivity extends Activity {
 	public static native void nativeString( String text );
 	public static native void nativeSetPause(int pause);
 
+	public static native void nativeHat(int id, byte hat, byte keycode, byte down);
+	public static native void nativeAxis(int id, byte axis, short value);
+	public static native void nativeJoyButton(int id, byte button, byte down);
+	
+	// for future expansion
+	public static native void nativeBall(int id, byte ball, short xrel, short yrel);
+	public static native void nativeJoyAdd( int id );
+	public static native void nativeJoyDel( int id );
+	
 	public static native int setenv(String key, String value, boolean overwrite);
 
-
 	// Java functions called from C
 
 	public static boolean createGLContext() {
@@ -213,28 +221,161 @@ public class XashActivity extends Activity {
 
 	public static boolean handleKey( int keyCode, KeyEvent event )
 	{
-
-	if ( mUseVolume && ( keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+		if ( mUseVolume && ( keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
 			keyCode == KeyEvent.KEYCODE_VOLUME_UP ) )
-		return false;
-		//Log.d( TAG, "Keycode " + keyCode );
+			return false;
+			
+		int source = event.getSource();
+		boolean isGamePad  = (source & InputDevice.SOURCE_GAMEPAD)  == InputDevice.SOURCE_GAMEPAD;
+		boolean isJoystick = (source & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK;
+		boolean isDPad     = (source & InputDevice.SOURCE_DPAD)     == InputDevice.SOURCE_DPAD;
+		
+		if( isGamePad || isJoystick )
+		{
+			byte value;
+			
+			switch( keyCode )
+			{
+			// main buttons. DONT CHANGE THIS!!!!111oneone
+			case KeyEvent.KEYCODE_BUTTON_A:      value = 0; break;
+			case KeyEvent.KEYCODE_BUTTON_B:	     value = 1; break;
+			case KeyEvent.KEYCODE_BUTTON_X:	     value = 2; break;
+			case KeyEvent.KEYCODE_BUTTON_Y:	     value = 3; break;
+			case KeyEvent.KEYCODE_BUTTON_L1:     value = 4;	break;
+			case KeyEvent.KEYCODE_BUTTON_R1:     value = 5;	break;
+			case KeyEvent.KEYCODE_BUTTON_SELECT: value = 6;	break;
+			case KeyEvent.KEYCODE_BUTTON_MODE:   value = 7; break;
+			case KeyEvent.KEYCODE_BUTTON_START:  value = 8; break;
+			case KeyEvent.KEYCODE_BUTTON_THUMBL: value = 9; break;
+			case KeyEvent.KEYCODE_BUTTON_THUMBR: value = 10; break;
+			
+			// other
+			case KeyEvent.KEYCODE_BUTTON_C:  value = 11; break;
+			case KeyEvent.KEYCODE_BUTTON_Z:  value = 12; break;
+			case KeyEvent.KEYCODE_BUTTON_L2: value = 13; break;
+			case KeyEvent.KEYCODE_BUTTON_R2: value = 14; break;
+			default: 
+				if( keyCode >= KeyEvent.KEYCODE_BUTTON_1 && keyCode <= KeyEvent.KEYCODE_BUTTON_16 )
+				{
+					value = keyCode - KeyEvent.KEYCODE_BUTTON_1 + 15;
+				}
+				else if( KeyEvent.isGamePadButton(keyCode) )
+				{
+					Log.d(TAG, "Unhandled GamePad button: " + KeyEvent.keyCodeToString(keyCode) );
+					return false;
+				}
+			}
+			if( event.getAction() == KeyEvent.ACTION_DOWN )
+				nativeJoyButton( 0, value, true );
+			else if( event.getAction() == KeyEvent.ACTION_UP )
+				nativeJoyButton( 0, value, false );
+				
+			return true;
+		}
+		
+		if( isDPad )
+		{
+			int dpad;
+						
+			switch( keyCode )
+			{
+			case KeyEvent.KEYCODE_DPAD_CENTER:
+				dpad = 0; break;
+			case KeyEvent.KEYCODE_DPAD_UP:
+				dpad = 1; break;
+			case KeyEvent.KEYCODE_DPAD_RIGHT:
+				dpad = 2; break;
+			case KeyEvent.KEYCODE_DPAD_LEFT:
+				dpad = 3; break;
+			case KeyEvent.KEYCODE_DPAD_DOWN:
+				dpad = 4; break;
+			default: return false;
+			}
+			
+			if( event.getAction() == KeyEvent.ACTION_DOWN )
+				nativeJoyButton( 0, 0, dpad, true );
+			else if( event.getAction() == KeyEvent.ACTION_UP )
+				nativeJoyButton( 0, 0, dpad, false );
+			
+			return true;
+		}
+				
+		Log.d( TAG, "Keycode " + KeyEvent.keyCodeToString(keyCode) + 
+			". IsGamePadButton(" + KeyEvent.isGamePadButton(keyCode) + ")" );
 		if (event.getAction() == KeyEvent.ACTION_DOWN)
 		{
 			if (event.isPrintingKey() || keyCode == 62)// space is printing too
 				XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
 
-			XashActivity.nativeKey(1,keyCode);
+			XashActivity.nativeKey(1, keyCode);
 
 			return true;
 		}
 		else if (event.getAction() == KeyEvent.ACTION_UP)
 		{
 
-			XashActivity.nativeKey(0,keyCode);
+			XashActivity.nativeKey(0, keyCode);
 			return true;
 		}
 		return false;
 	}
+	
+	public static float performEngineAxisEvent( MotionEvent event, int axis, byte engineAxis, float prev )
+	{
+		final float current = event.getAxisValue( axis );
+		if( prev != current && engineAxis != 255 )
+		{
+			if( current < 0 )
+				nativeAxis( 0, engineAxis, (short)(current * -32768) );
+			else nativeAxis(0, engineAxis, (short)(current * 32767) );
+		}
+		
+		return current;
+	}
+	
+	private static float prevLeftX, prevLeftY, prevRightX, prevRightY, prevLT, prevRT, prevHX, prevHY;
+	public static boolean handleAxis( MotionEvent event )
+	{
+		
+		prevLeftX = performEngineAxisEvent(event, event.AXIS_X, 0, prevLeftX);
+		prevLeftY = performEngineAxisEvent(event, event.AXIS_Y, 1, prevLeftY);
+		prevRightX = performEngineAxisEvent(event, event.AXIS_Z, 2, prevRightX);
+		prevRightY = performEngineAxisEvent(event, event.AXIS_RZ, 3, prevRightY);
+		prevLT = performEngineAxisEvent(event, event.LTRIGGER, 4, prevLT);
+		prevRT = performEngineAxisEvent(event, event.RTRIGGER, 5, prevRT);
+		
+		// Because Android may map DPad to AXIS_HAT_X/Y, we need to check these again here
+		float HX = motionEvent.getAxisValue(MotionEvent.AXIS_HAT_X);
+		float HY = motionEvent.getAxisValue(MotionEvent.AXIS_HAT_Y);
+		
+		if(prevHX != HX)
+		{
+			if(HX == 1.0f)
+				nativeHat( 0, 0, 2, true );
+			else if(HX == -1.0f)
+				nativeHat( 0, 0, 3, true );
+			else
+			{
+				nativeHat( 0, 0, 2, false );
+				nativeHat( 0, 0, 3, false );
+			}
+			prevHX = HX;
+		}
+		
+		if( prevHY != HY )
+		{
+			if(HX == 1.0f)
+				nativeHat( 0, 0, 1, true );
+			else if(HX == -1.0f)
+				nativeHat( 0, 0, 4, true );
+			else
+			{
+				nativeHat( 0, 0, 1, false );
+				nativeHat( 0, 0, 4, false );
+			}
+			prevHY = HY;
+		}
+	}
 
 	static class ShowTextInputTask implements Runnable
 	{
@@ -503,10 +644,21 @@ View.OnKeyListener {
 
 
 	@Override
-	public boolean onKey(View v, int keyCode, KeyEvent event) {
-
+	public boolean onKey(View v, int keyCode, KeyEvent event) 
+	{
 		return XashActivity.handleKey( keyCode, event );
 	}
+	
+	@Override 
+	public boolean onGenericMotionEvent(MotionEvent event)
+	{
+		if( (event.getSource & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK )
+			return XashActivity.handleAxis( event );
+		// TODO: Add it someday
+		// else if( (event.getSource & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
+		//	return XashActivity.handleBall( event );
+		return super.onGenericMotionEvent( event );
+	}
 }
 
 /* This is a fake invisible editor view that receives the input and defines the

From 0af71adf397ac8e3a6251a7a9dac7049b3c8ad76 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Thu, 28 Jul 2016 00:12:01 +0600
Subject: [PATCH 69/83] Fix build, fix awful merge, add joystick backend

---
 res/layout/activity_launcher.xml              |   4 +-
 res/values-ru/strings.xml                     |  14 +-
 res/values/strings.xml                        |   2 +-
 .../xash3d/.ShortcutActivity.java.kate-swp    | Bin 109 -> 0 bytes
 src/in/celest/xash3d/LauncherActivity.java    |  25 +-
 src/in/celest/xash3d/ShortcutActivity.java    |   2 +-
 src/in/celest/xash3d/XashActivity.java        | 219 ++++++++++--------
 7 files changed, 148 insertions(+), 118 deletions(-)
 delete mode 100644 src/in/celest/xash3d/.ShortcutActivity.java.kate-swp

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index abed4953..2d0eb754 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -116,7 +116,7 @@
 								android:layout_marginRight="10dp"
 								android:layout_marginTop="3dp"
 								android:text="@string/text_res_path"
-								android:textAppearance="?android:attr/	textAppearanceMedium" />
+								android:textAppearance="?android:attr/textAppearanceMedium" />
 							<Button
 								android:id="@+id/button_select"
 								android:layout_width="match_parent"
@@ -219,7 +219,7 @@
 								android:textAppearance="?android:attr/textAppearanceMedium" />
 							<Spinner
 								android:layout_height="wrap_content"
-								android:layout_width="math_parent"
+								android:layout_width="match_parent"
 								android:id="@+id/pixelSpinner"
 								android:layout_marginBottom="10dp"
 								android:layout_marginLeft="10dp"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dacb2b48..44b263b3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -5,16 +5,12 @@
 	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>
 	<string name="version_string" translatable="false">v0.17.1</string>-->
 	
-    <string name="launch_button">Запустить Xash3D</strin g>
-    <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
-<<<<<<< HEAD
     <string name="launch_button">Запустить Xash3D</string>
+    <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
 	<string name="use_controls">Включить экранное управление</string>
 	<string name="volume">Действие кнопок громкости</string>
 	<string name="use_volume">Регулировка громкости</string>
 	<string name="no_volume">Использовать в игре</string>
-=======
->>>>>>> autoupdate
 	<string name="text_res_path">Путь к ресурсам игры</string>
 	<string name="touch_set">Настройки управления</string>
 	<string name="text_shortcut">Ярлык Xash3D</string>
@@ -52,16 +48,12 @@
     <string name="text_tab2">Продвинутый</string>
     <string name="text_res_tittle2">Стандартные настройки</string>
     <string name="text_res_tittle3">Продвинутые настройки</string>
-    <string name="use_volume">Использовать кнопки громкости</string>
-    <string name="no_volume">Не использовать кнопки громкости</string>
-    <string name="folder">Выбрать текущий каталог</string>
 	
 	<string name="update_button">Проверять обновления при запуске</string>
-	<string name="update_button">Обновлять до нестабильной версии, если доступно</string>
+	<string name="update_to_beta">Обновлять до нестабильной версии, если доступно</string>
 	<string name="update_message">%s доступен! Скачай его сейчас!</string>
 	<string name="update">Обновить</string>
 	<string name="cancel">Отмена</string>
 	<string name="no_updates">Обновления не найдены</string>
-	<string name="checking_updates">Работаю...</string>-
->>>>>>> autoupdate
+	<string name="checking_updates">Работаю...</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index faaaf8fd..742dae1d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,7 +50,7 @@
     <string name="folder">Set current folder</string>
 	
 	<string name="update_button">Check updates on start</string>
-	<string name="update_button">Update to unstable version if available</string>
+	<string name="update_to_beta">Update to unstable version if available</string>
 	<string name="update_message">%s is available! Download it now!</string>
 	<string name="update">Update</string>
 	<string name="cancel">Cancel</string>
diff --git a/src/in/celest/xash3d/.ShortcutActivity.java.kate-swp b/src/in/celest/xash3d/.ShortcutActivity.java.kate-swp
deleted file mode 100644
index 175bf014ca65c8602941e7be798b20be50ea2713..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnQC^Xl?RUzI>4e16i%rZ*E^T}EE)5O>
a%5VU&G!V<U274lLnJ&z7#V5}g<O%?C1{9nC

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 57f41b1c..84c59a75 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -57,9 +57,12 @@ public class LauncherActivity extends Activity {
    // public final static String ARGV = "in.celest.xash3d.MESSAGE";
    	public final static int sdk = Integer.valueOf(Build.VERSION.SDK);
 	public final static String UPDATE_LINK = "https://api.github.com/repos/FWGS/xash3d-android-project/releases"; // releases/latest doesn't return prerelease and drafts
-	static EditText cmdArgs, resPath;
-	static ToggleButton useVolume, resizeWorkaround;
-	static CheckBox	checkUpdates, updateToBeta;
+	static EditText cmdArgs;
+	static EditText resPath;
+	static ToggleButton useVolume;
+	static ToggleButton resizeWorkaround;
+	static CheckBox	checkUpdates;
+	static CheckBox updateToBeta;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
 	static TextView tvResPath;
@@ -137,7 +140,7 @@ public class LauncherActivity extends Activity {
 
 		if(mPref.getBoolean("check_updates", true))
 		{
-			new CheckUpdate(true, updateToBeta.getBoolean()).execute(UPDATE_LINK);
+			new CheckUpdate(true, updateToBeta.isChecked()).execute(UPDATE_LINK);
 		}
 	}
 
@@ -309,10 +312,20 @@ public class LauncherActivity extends Activity {
 			if( releases == null )
 				return;
 			
-			for( JSONObject obj: releases )
+			for( int i = 0; i < releases.length(); i++ )
 			{
+				final JSONObject obj;
+				try 
+				{
+					obj = releases.getJSONObject(i);
+				}
+				catch(Exception e)
+				{
+					e.printStackTrace();
+					continue;
+				}
 				final String version, url, name;
-				final bool beta = obj.getBoolean("prerelease");
+				final boolean beta = obj.getBoolean("prerelease");
 				
 				if( beta && !mBeta )
 					continue;
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 23a8616b..900fb518 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.Toast;
-import in.celest.xash3d.hl.*;
+import in.celest.xash3d.hl.R;
 import android.widget.EditText;
 import android.widget.Button;
 import java.io.File;
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 4741adab..ca3c6f85 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -22,9 +22,10 @@ import android.widget.*;
 import android.view.inputmethod.*;
 
 import java.lang.*;
+import java.util.List;
 
 /**
- SDL Activity
+ Xash Activity
  */
 public class XashActivity extends Activity {
 
@@ -45,6 +46,22 @@ public class XashActivity extends Activity {
 	// Audio
 	private static Thread mAudioThread;
 	private static AudioTrack mAudioTrack;
+	
+	// Joystick constants
+	private final static byte JOY_HAT_CENTERED = 0; // bitmasks for hat current status
+	private final static byte JOY_HAT_UP       = 1;
+	private final static byte JOY_HAT_RIGHT    = 2;
+	private final static byte JOY_HAT_DOWN     = 4;
+	private final static byte JOY_HAT_LEFT     = 8;
+	
+	private final static byte JOY_AXIS_SIDE  = 0; // this represents default 
+	private final static byte JOY_AXIS_FWD   = 1; // engine binding: SFYPRL
+	private final static byte JOY_AXIS_YAW   = 2;
+	private final static byte JOY_AXIS_PITCH = 3;
+	private final static byte JOY_AXIS_RT    = 4;
+	private final static byte JOY_AXIS_LT    = 5;
+	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
+
 	// Load the .so
 	static {
 		System.loadLibrary("xash");
@@ -150,9 +167,9 @@ public class XashActivity extends Activity {
 	public static native void nativeString( String text );
 	public static native void nativeSetPause(int pause);
 
-	public static native void nativeHat(int id, byte hat, byte keycode, byte down);
+	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, byte down);
+	public static native void nativeJoyButton(int id, byte button, boolean down);
 	
 	// for future expansion
 	public static native void nativeBall(int id, byte ball, short xrel, short yrel);
@@ -225,84 +242,82 @@ public class XashActivity extends Activity {
 			keyCode == KeyEvent.KEYCODE_VOLUME_UP ) )
 			return false;
 			
-		int source = event.getSource();
-		boolean isGamePad  = (source & InputDevice.SOURCE_GAMEPAD)  == InputDevice.SOURCE_GAMEPAD;
-		boolean isJoystick = (source & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK;
-		boolean isDPad     = (source & InputDevice.SOURCE_DPAD)     == InputDevice.SOURCE_DPAD;
+		final int source = event.getSource();
+		final int action = event.getAction();
+		final boolean isGamePad  = (source & InputDevice.SOURCE_GAMEPAD)        == InputDevice.SOURCE_GAMEPAD;
+		final boolean isJoystick = (source & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK;
+		final boolean isDPad     = (source & InputDevice.SOURCE_DPAD)           == InputDevice.SOURCE_DPAD;
 		
+		// Engine will bind these to AUX${val} virtual keys
 		if( isGamePad || isJoystick )
 		{
-			byte value;
+			final int id = 0;
+			byte val = 15;
 			
 			switch( keyCode )
 			{
 			// main buttons. DONT CHANGE THIS!!!!111oneone
-			case KeyEvent.KEYCODE_BUTTON_A:      value = 0; break;
-			case KeyEvent.KEYCODE_BUTTON_B:	     value = 1; break;
-			case KeyEvent.KEYCODE_BUTTON_X:	     value = 2; break;
-			case KeyEvent.KEYCODE_BUTTON_Y:	     value = 3; break;
-			case KeyEvent.KEYCODE_BUTTON_L1:     value = 4;	break;
-			case KeyEvent.KEYCODE_BUTTON_R1:     value = 5;	break;
-			case KeyEvent.KEYCODE_BUTTON_SELECT: value = 6;	break;
-			case KeyEvent.KEYCODE_BUTTON_MODE:   value = 7; break;
-			case KeyEvent.KEYCODE_BUTTON_START:  value = 8; break;
-			case KeyEvent.KEYCODE_BUTTON_THUMBL: value = 9; break;
-			case KeyEvent.KEYCODE_BUTTON_THUMBR: value = 10; break;
+			case KeyEvent.KEYCODE_BUTTON_A:      val = 0; break;
+			case KeyEvent.KEYCODE_BUTTON_B:	     val = 1; break;
+			case KeyEvent.KEYCODE_BUTTON_X:	     val = 2; break;
+			case KeyEvent.KEYCODE_BUTTON_Y:	     val = 3; break;
+			case KeyEvent.KEYCODE_BUTTON_L1:     val = 4;	break;
+			case KeyEvent.KEYCODE_BUTTON_R1:     val = 5;	break;
+			case KeyEvent.KEYCODE_BUTTON_SELECT: val = 6;	break;
+			case KeyEvent.KEYCODE_BUTTON_MODE:   val = 7; break;
+			case KeyEvent.KEYCODE_BUTTON_START:  val = 8; break;
+			case KeyEvent.KEYCODE_BUTTON_THUMBL: val = 9; break;
+			case KeyEvent.KEYCODE_BUTTON_THUMBR: val = 10; break;
 			
 			// other
-			case KeyEvent.KEYCODE_BUTTON_C:  value = 11; break;
-			case KeyEvent.KEYCODE_BUTTON_Z:  value = 12; break;
-			case KeyEvent.KEYCODE_BUTTON_L2: value = 13; break;
-			case KeyEvent.KEYCODE_BUTTON_R2: value = 14; break;
+			case KeyEvent.KEYCODE_BUTTON_L2: val = 13; break;
+			case KeyEvent.KEYCODE_BUTTON_R2: val = 14; break;
+			case KeyEvent.KEYCODE_BUTTON_C:  val = 11; break;
+			case KeyEvent.KEYCODE_BUTTON_Z:  val = 12; break;
 			default: 
 				if( keyCode >= KeyEvent.KEYCODE_BUTTON_1 && keyCode <= KeyEvent.KEYCODE_BUTTON_16 )
 				{
-					value = keyCode - KeyEvent.KEYCODE_BUTTON_1 + 15;
+					val = (byte)(keyCode - KeyEvent.KEYCODE_BUTTON_1 + 15);
 				}
-				else if( KeyEvent.isGamePadButton(keyCode) )
+				else if( KeyEvent.isGamepadButton(keyCode) )
 				{
 					Log.d(TAG, "Unhandled GamePad button: " + KeyEvent.keyCodeToString(keyCode) );
 					return false;
 				}
 			}
+
 			if( event.getAction() == KeyEvent.ACTION_DOWN )
-				nativeJoyButton( 0, value, true );
+				nativeJoyButton( id, val, true );
 			else if( event.getAction() == KeyEvent.ACTION_UP )
-				nativeJoyButton( 0, value, false );
-				
+				nativeJoyButton( id, val, false );
+			else return false;
 			return true;
 		}
 		
 		if( isDPad )
 		{
-			int dpad;
-						
+			byte val;
+			final byte hat = 0;
+			final int id = 0;
 			switch( keyCode )
 			{
-			case KeyEvent.KEYCODE_DPAD_CENTER:
-				dpad = 0; break;
-			case KeyEvent.KEYCODE_DPAD_UP:
-				dpad = 1; break;
-			case KeyEvent.KEYCODE_DPAD_RIGHT:
-				dpad = 2; break;
-			case KeyEvent.KEYCODE_DPAD_LEFT:
-				dpad = 3; break;
-			case KeyEvent.KEYCODE_DPAD_DOWN:
-				dpad = 4; break;
+			case KeyEvent.KEYCODE_DPAD_CENTER: val = JOY_HAT_CENTERED; break;
+			case KeyEvent.KEYCODE_DPAD_UP:     val = JOY_HAT_UP;       break;
+			case KeyEvent.KEYCODE_DPAD_RIGHT:  val = JOY_HAT_RIGHT;    break;
+			case KeyEvent.KEYCODE_DPAD_DOWN:   val = JOY_HAT_DOWN;     break;
+			case KeyEvent.KEYCODE_DPAD_LEFT:   val = JOY_HAT_LEFT;     break;
 			default: return false;
 			}
 			
-			if( event.getAction() == KeyEvent.ACTION_DOWN )
-				nativeJoyButton( 0, 0, dpad, true );
-			else if( event.getAction() == KeyEvent.ACTION_UP )
-				nativeJoyButton( 0, 0, dpad, false );
+			if(action == KeyEvent.ACTION_DOWN)
+				nativeHat(id, hat, val, true);
+			else if(action == KeyEvent.ACTION_UP)
+				nativeHat(id, hat, val, false);
 			
 			return true;
 		}
-				
-		Log.d( TAG, "Keycode " + KeyEvent.keyCodeToString(keyCode) + 
-			". IsGamePadButton(" + KeyEvent.isGamePadButton(keyCode) + ")" );
-		if (event.getAction() == KeyEvent.ACTION_DOWN)
+		
+		if (action == KeyEvent.ACTION_DOWN)
 		{
 			if (event.isPrintingKey() || keyCode == 62)// space is printing too
 				XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
@@ -311,70 +326,79 @@ public class XashActivity extends Activity {
 
 			return true;
 		}
-		else if (event.getAction() == KeyEvent.ACTION_UP)
+		else if (action == KeyEvent.ACTION_UP)
 		{
-
 			XashActivity.nativeKey(0, keyCode);
 			return true;
 		}
 		return false;
 	}
 	
-	public static float performEngineAxisEvent( MotionEvent event, int axis, byte engineAxis, float prev )
+	private static float performEngineAxisEvent( float current, byte engineAxis, float prev, float flat )
 	{
-		final float current = event.getAxisValue( axis );
-		if( prev != current && engineAxis != 255 )
+		if( prev != current )
 		{
-			if( current < 0 )
-				nativeAxis( 0, engineAxis, (short)(current * -32768) );
-			else nativeAxis(0, engineAxis, (short)(current * 32767) );
+			final int id = 0;
+			final short SHRT_MAX = 32767;
+			if( current <= flat && current >= -flat )
+				current = 0;
+			
+			nativeAxis( id, engineAxis, (short)(current * SHRT_MAX) );
 		}
 		
 		return current;
 	}
 	
-	private static float prevLeftX, prevLeftY, prevRightX, prevRightY, prevLT, prevRT, prevHX, prevHY;
+	private static float performEngineHatEvent( float curr, boolean isXAxis, float prev )
+	{
+		if( prev != curr )
+		{
+			final int id = 0;
+			final byte hat = 0;
+			if( isXAxis )
+			{
+				     if( curr > 0 ) nativeHat( id, hat, JOY_HAT_RIGHT, true );
+				else if( curr < 0 ) nativeHat( id, hat, JOY_HAT_LEFT,  true );
+				// unpress previous if curr centered
+				else if( prev > 0 ) nativeHat( id, hat, JOY_HAT_RIGHT, false );
+				else if( prev < 0 ) nativeHat( id, hat, JOY_HAT_LEFT,  false );
+			}
+			else
+			{
+				     if( curr > 0 ) nativeHat( id, hat, JOY_HAT_DOWN, true );
+				else if( curr < 0 ) nativeHat( id, hat, JOY_HAT_UP,   true );
+				// unpress previous if curr centered
+				else if( prev > 0 ) nativeHat( id, hat, JOY_HAT_DOWN, false );
+				else if( prev < 0 ) nativeHat( id, hat, JOY_HAT_UP,   false );
+			}
+		}
+		return curr;
+	}
+	
 	public static boolean handleAxis( MotionEvent event )
 	{
-		
-		prevLeftX = performEngineAxisEvent(event, event.AXIS_X, 0, prevLeftX);
-		prevLeftY = performEngineAxisEvent(event, event.AXIS_Y, 1, prevLeftY);
-		prevRightX = performEngineAxisEvent(event, event.AXIS_Z, 2, prevRightX);
-		prevRightY = performEngineAxisEvent(event, event.AXIS_RZ, 3, prevRightY);
-		prevLT = performEngineAxisEvent(event, event.LTRIGGER, 4, prevLT);
-		prevRT = performEngineAxisEvent(event, event.RTRIGGER, 5, prevRT);
-		
-		// Because Android may map DPad to AXIS_HAT_X/Y, we need to check these again here
-		float HX = motionEvent.getAxisValue(MotionEvent.AXIS_HAT_X);
-		float HY = motionEvent.getAxisValue(MotionEvent.AXIS_HAT_Y);
-		
-		if(prevHX != HX)
+		// maybe I need to cache this...
+		for( InputDevice.MotionRange range: event.getDevice().getMotionRanges() )
 		{
-			if(HX == 1.0f)
-				nativeHat( 0, 0, 2, true );
-			else if(HX == -1.0f)
-				nativeHat( 0, 0, 3, true );
-			else
+			// 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() )
 			{
-				nativeHat( 0, 0, 2, false );
-				nativeHat( 0, 0, 3, false );
+			// typical axes
+			case MotionEvent.AXIS_X:   prevSide = performEngineAxisEvent(cur, JOY_AXIS_SIDE,  prevSide, dead); break;
+			case MotionEvent.AXIS_Y:   prevFwd  = performEngineAxisEvent(cur, JOY_AXIS_FWD,   prevFwd,  dead); break;
+			case MotionEvent.AXIS_Z:   prevYaw  = performEngineAxisEvent(cur, JOY_AXIS_YAW,   prevYaw,  dead); break;
+			case MotionEvent.AXIS_RZ:  prevPtch = performEngineAxisEvent(cur, JOY_AXIS_PITCH, prevPtch, dead); break;
+			case MotionEvent.AXIS_RTRIGGER:	prevLT = performEngineAxisEvent(cur, JOY_AXIS_RT, prevLT,   dead); break;
+			case MotionEvent.AXIS_LTRIGGER:	prevRT = performEngineAxisEvent(cur, JOY_AXIS_LT, prevRT,   dead); break;
+			// hats
+			case MotionEvent.AXIS_HAT_X: prevHX = performEngineHatEvent(cur, true, prevHX); break;
+			case MotionEvent.AXIS_HAT_Y: prevHY = performEngineHatEvent(cur, false, prevHY); break;
 			}
-			prevHX = HX;
 		}
 		
-		if( prevHY != HY )
-		{
-			if(HX == 1.0f)
-				nativeHat( 0, 0, 1, true );
-			else if(HX == -1.0f)
-				nativeHat( 0, 0, 4, true );
-			else
-			{
-				nativeHat( 0, 0, 1, false );
-				nativeHat( 0, 0, 4, false );
-			}
-			prevHY = HY;
-		}
+		return true;
 	}
 
 	static class ShowTextInputTask implements Runnable
@@ -416,7 +440,7 @@ public class XashActivity extends Activity {
 	}
 
 	/**
-	 * This method is called by SDL using JNI.
+	 * This method is called by engine using JNI.
 	 */
 	public static void showKeyboard( int show )
 	{
@@ -437,15 +461,15 @@ class XashMain implements Runnable {
 }
 
 /**
- SDLSurface. This is what we draw on, so we need to know when it's created
+ EngineSurface. This is what we draw on, so we need to know when it's created
  in order to do anything useful.
 
- Because of this, that's where we set up the SDL thread
+ Because of this, that's where we set up the Xash3D thread
  */
 class EngineSurface extends SurfaceView implements SurfaceHolder.Callback,
 View.OnKeyListener {
 
-	// This is what SDL runs in. It invokes SDL_main(), eventually
+	// This is what Xash3D runs in. It invokes main(), eventually
 	private Thread mEngThread;
 
 	// EGL private objects
@@ -652,10 +676,11 @@ View.OnKeyListener {
 	@Override 
 	public boolean onGenericMotionEvent(MotionEvent event)
 	{
-		if( (event.getSource & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK )
+		if( ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) || 
+			(event.getSource() & InputDevice.SOURCE_GAMEPAD) != 0 )
 			return XashActivity.handleAxis( event );
 		// TODO: Add it someday
-		// else if( (event.getSource & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
+		// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
 		//	return XashActivity.handleBall( event );
 		return super.onGenericMotionEvent( event );
 	}

From d2b0860577a4145d168ae6bdf36765ac26114cad Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sun, 31 Jul 2016 21:06:41 +0600
Subject: [PATCH 70/83] Swap pitch and yaw in joystick constants

---
 src/in/celest/xash3d/XashActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index ca3c6f85..1e429859 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -55,9 +55,9 @@ public class XashActivity extends Activity {
 	private final static byte JOY_HAT_LEFT     = 8;
 	
 	private final static byte JOY_AXIS_SIDE  = 0; // this represents default 
-	private final static byte JOY_AXIS_FWD   = 1; // engine binding: SFYPRL
-	private final static byte JOY_AXIS_YAW   = 2;
-	private final static byte JOY_AXIS_PITCH = 3;
+	private final static byte JOY_AXIS_FWD   = 1; // engine binding: SFPYRL
+	private final static byte JOY_AXIS_PITCH = 2;
+	private final static byte JOY_AXIS_YAW   = 3;
 	private final static byte JOY_AXIS_RT    = 4;
 	private final static byte JOY_AXIS_LT    = 5;
 	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;

From 7db489df981090705ea1ddd52d83e1bf6baad5e7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 09:28:06 +0000
Subject: [PATCH 71/83] Bump versions

---
 AndroidManifest.xml       | 2 +-
 res/values-ru/strings.xml | 3 +--
 res/values/strings.xml    | 2 +-
 test/AndroidManifest.xml  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 31fd6482..ee42a76a 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="0"
-	android:versionName="0.17.1"
+	android:versionName="0.18"
 	android:installLocation="auto">
 
 	<application android:label="@string/app_name"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 44b263b3..5e8fa27f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2,8 +2,7 @@
 <resources>
 	<!--<string name="app_name" translatable="false">Xash3D</string>
 	<string name="launcher_name" translatable="false">Xash3D</string>
-	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>
-	<string name="version_string" translatable="false">v0.17.1</string>-->
+	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>-->
 	
     <string name="launch_button">Запустить Xash3D</string>
     <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 742dae1d..839612eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name" translatable="false">Xash3D</string>
 	<string name="launcher_name" translatable="false">Xash3D</string>
 	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>
-	<string name="version_string" translatable="false">v0.17.1</string>
+	<string name="version_string" translatable="false">v0.18</string>
 
     <string name="launch_button">Launch Xash3D!</string>
     <string name="cmd_args_text">Command line arguments(experts only)</string>
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index e473d17a..d956b7b4 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -5,7 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="in.celest.xash3d.hl.test"
       android:versionCode="1"
-      android:versionName="0.17-beta.2"
+      android:versionName="0.18-beta"
       android:installLocation="auto">
 
     <!-- Create a Java class extending SDLActivity and place it in a

From 7a10caf3dffb967ca9ccda4387d983952083e261 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 09:40:56 +0000
Subject: [PATCH 72/83] Fix build

---
 src/in/celest/xash3d/LauncherActivity.java | 75 +++++++++++-----------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 84c59a75..89525011 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -318,49 +318,50 @@ public class LauncherActivity extends Activity {
 				try 
 				{
 					obj = releases.getJSONObject(i);
+
+					final String version, url, name;
+					final boolean beta = obj.getBoolean("prerelease");
+
+					if( beta && !mBeta )
+						continue;
+
+					version = obj.getString("tag_name");
+					url = obj.getString("html_url");
+					name = obj.getString("name");
+					Log.d("Xash", "Found: " + version +
+						", I: " + getString(R.string.version_string));
+
+					// this is an update
+					if( getString(R.string.version_string).compareTo(version) < 0 )
+					{
+						String dialog_message = String.format(getString(R.string.update_message), name);
+						AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
+						builder.setMessage(dialog_message)
+							.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
+							{
+								public void onClick(DialogInterface dialog, int id)
+								{
+									final Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
+									startActivity(intent);
+								}
+							})
+							.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
+								{ public void onClick(DialogInterface dialog, int id) {} } );
+						builder.create().show();
+					}
+					else if( !mSilent )
+					{
+						Toast.makeText(getBaseContext(), R.string.no_updates, Toast.LENGTH_SHORT).show();
+					}
+
+					// No need to check other releases, so we will stop here.
+					break;
 				}
 				catch(Exception e)
 				{
 					e.printStackTrace();
 					continue;
 				}
-				final String version, url, name;
-				final boolean beta = obj.getBoolean("prerelease");
-				
-				if( beta && !mBeta )
-					continue;
-					
-				version = obj.getString("tag_name");
-				url = obj.getString("html_url");
-				name = obj.getString("name");
-				Log.d("Xash", "Found: " + version +
-					", I: " + getString(R.string.version_string));
-					
-				// this is an update
-				if( getString(R.string.version_string).compareTo(version) < 0 )
-				{
-					String dialog_message = String.format(getString(R.string.update_message), name);
-					AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
-					builder.setMessage(dialog_message)
-						.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
-						{
-							public void onClick(DialogInterface dialog, int id) 
-							{
-								final Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
-								startActivity(intent);
-							}
-						})
-						.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
-							{ public void onClick(DialogInterface dialog, int id) {} } );
-					builder.create().show();
-				}
-				else if( !mSilent )
-				{
-					Toast.makeText(getBaseContext(), R.string.no_updates, Toast.LENGTH_SHORT).show();
-				}
-				
-				// No need to check other releases, so we will stop here.
-				break;
 			}
 		}
 	}

From 7dde5b83b1a357326efe9a1109d9c2a50aeef993 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 09:42:30 +0000
Subject: [PATCH 73/83] Allow unaligned access

---
 jni/Application.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 8d922173..9e105286 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -12,10 +12,10 @@ endif
 
 
 CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=256 -pipe
-CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC
+CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC -DHAVE_EFFICIENT_UNALIGNED_ACCESS
 #CFLAGS_OPT_ARMv5 :=-mcpu=arm1136jf-s -mtune=arm1136jf-s -mthumb -mfpu=vfp -pipe -mfloat-abi=softfp
 CFLAGS_OPT_ARMv5 := -march=armv5te -mthumb -msoft-float
-CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS
+CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS -DHAVE_EFFICIENT_UNALIGNED_ACCESS
 CFLAGS_HARDFP := -D_NDK_MATH_NO_SOFTFP=1 -mhard-float -mfloat-abi=hard -DLOAD_HARDFP -DSOFTFP_LINK
 APPLICATIONMK_PATH = $(call my-dir)
 

From c02a3167ca721af75dd5d893d6d5c68b6ae54240 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 09:51:14 +0000
Subject: [PATCH 74/83] Update submodules

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

diff --git a/jni/src/NanoGL/nanogl b/jni/src/NanoGL/nanogl
index 4f937221..fba28cff 160000
--- a/jni/src/NanoGL/nanogl
+++ b/jni/src/NanoGL/nanogl
@@ -1 +1 @@
-Subproject commit 4f937221b421f3c63856af69e4d620a7f8b0a6b0
+Subproject commit fba28cfff8c488b83b052b92a9f58678c90f2afe
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 1c21fb1d..32500def 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 1c21fb1dace7b943853c3332cf1a924723b51b44
+Subproject commit 32500def8697b557482aa11acc299002f341bbab
diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d
index 2c0f598c..29f4c35e 160000
--- a/jni/src/hlsdk-xash3d
+++ b/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit 2c0f598c6d7990b2e1ae1af6178aa4b9e6d82cf6
+Subproject commit 29f4c35e6e6433fb990526683b70f809605e7025

From ad5147a53fd60bfb1d5ff081fc169dae396051a8 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 11:27:51 +0000
Subject: [PATCH 75/83] Joystick compatibility mode

---
 src/in/celest/xash3d/LauncherActivity.java |  26 +++
 src/in/celest/xash3d/XashActivity.java     | 192 ++++++++++++++-------
 2 files changed, 159 insertions(+), 59 deletions(-)

diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 89525011..663c3ce8 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -121,6 +121,31 @@ public class LauncherActivity extends Activity {
 		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
 		adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
 		pixelSpinner.setAdapter(adapter);
+		Button selectFolderButton = ( Button ) findViewById( R.id.button_select );
+		selectFolderButton.setOnClickListener(new View.OnClickListener(){
+			   @Override
+			public void onClick(View v) {
+			selectFolder(v);
+				}
+		});
+		((Button)findViewById( R.id.button_launch )).setOnClickListener(new View.OnClickListener(){
+			   @Override
+			public void onClick(View v) {
+			startXash(v);
+				}
+		});
+		((Button)findViewById( R.id.button_shortcut )).setOnClickListener(new View.OnClickListener(){
+			   @Override
+			public void onClick(View v) {
+			createShortcut(v);
+				}
+		});
+		((Button)findViewById( R.id.button_about )).setOnClickListener(new View.OnClickListener(){
+			   @Override
+			public void onClick(View v) {
+			aboutXash(v);
+				}
+		});
 		useVolume.setChecked(mPref.getBoolean("usevolume",true));
 		checkUpdates.setChecked(mPref.getBoolean("check_updates",true));
 		updateToBeta.setChecked(mPref.getBoolean("check_betas", false));
@@ -142,6 +167,7 @@ public class LauncherActivity extends Activity {
 		{
 			new CheckUpdate(true, updateToBeta.isChecked()).execute(UPDATE_LINK);
 		}
+
 	}
 
 	void updatePath( String text )
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 1e429859..0f4c7fb7 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -32,12 +32,27 @@ public class XashActivity extends Activity {
 	// Main components
 	protected static XashActivity mSingleton;
 	protected static View mTextEdit;
-	private static EngineSurface mSurface;
+	public static EngineSurface mSurface;
 	public static String mArgv[];
 	public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
 	public static final String TAG = "XASH3D:XashActivity";
 	public static int mPixelFormat;
 	protected static ViewGroup mLayout;
+	public static JoystickHandler handler;
+
+	// Joystick constants
+	public final static byte JOY_HAT_CENTERED = 0; // bitmasks for hat current status
+	public final static byte JOY_HAT_UP       = 1;
+	public final static byte JOY_HAT_RIGHT    = 2;
+	public final static byte JOY_HAT_DOWN     = 4;
+	public final static byte JOY_HAT_LEFT     = 8;
+
+	public final static byte JOY_AXIS_SIDE  = 0; // this represents default
+	public final static byte JOY_AXIS_FWD   = 1; // engine binding: SFPYRL
+	public final static byte JOY_AXIS_PITCH = 2;
+	public final static byte JOY_AXIS_YAW   = 3;
+	public final static byte JOY_AXIS_RT    = 4;
+	public final static byte JOY_AXIS_LT    = 5;
 
 	// Preferences
 	public static SharedPreferences mPref = null;
@@ -46,21 +61,6 @@ public class XashActivity extends Activity {
 	// Audio
 	private static Thread mAudioThread;
 	private static AudioTrack mAudioTrack;
-	
-	// Joystick constants
-	private final static byte JOY_HAT_CENTERED = 0; // bitmasks for hat current status
-	private final static byte JOY_HAT_UP       = 1;
-	private final static byte JOY_HAT_RIGHT    = 2;
-	private final static byte JOY_HAT_DOWN     = 4;
-	private final static byte JOY_HAT_LEFT     = 8;
-	
-	private final static byte JOY_AXIS_SIDE  = 0; // this represents default 
-	private final static byte JOY_AXIS_FWD   = 1; // engine binding: SFPYRL
-	private final static byte JOY_AXIS_PITCH = 2;
-	private final static byte JOY_AXIS_YAW   = 3;
-	private final static byte JOY_AXIS_RT    = 4;
-	private final static byte JOY_AXIS_LT    = 5;
-	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
 
 	// Load the .so
 	static {
@@ -84,6 +84,10 @@ public class XashActivity extends Activity {
 		// landscapeSensor is not supported until API9
 		if( sdk < 9 )
 			setRequestedOrientation(0);
+		if( sdk < 12 )
+			handler = new JoystickHandler_stub();
+		else
+			handler = new JoystickHandler_v12();
 
 		// keep screen on
 		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -242,7 +246,7 @@ public class XashActivity extends Activity {
 			keyCode == KeyEvent.KEYCODE_VOLUME_UP ) )
 			return false;
 			
-		final int source = event.getSource();
+		final int source = XashActivity.handler.getSource(event);
 		final int action = event.getAction();
 		final boolean isGamePad  = (source & InputDevice.SOURCE_GAMEPAD)        == InputDevice.SOURCE_GAMEPAD;
 		final boolean isJoystick = (source & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK;
@@ -279,9 +283,9 @@ public class XashActivity extends Activity {
 				{
 					val = (byte)(keyCode - KeyEvent.KEYCODE_BUTTON_1 + 15);
 				}
-				else if( KeyEvent.isGamepadButton(keyCode) )
+				else if( XashActivity.handler.isGamepadButton(keyCode) )
 				{
-					Log.d(TAG, "Unhandled GamePad button: " + KeyEvent.keyCodeToString(keyCode) );
+					Log.d(TAG, "Unhandled GamePad button: " + XashActivity.handler.keyCodeToString(keyCode) );
 					return false;
 				}
 			}
@@ -334,7 +338,7 @@ public class XashActivity extends Activity {
 		return false;
 	}
 	
-	private static float performEngineAxisEvent( float current, byte engineAxis, float prev, float flat )
+	public static float performEngineAxisEvent( float current, byte engineAxis, float prev, float flat )
 	{
 		if( prev != current )
 		{
@@ -349,7 +353,7 @@ public class XashActivity extends Activity {
 		return current;
 	}
 	
-	private static float performEngineHatEvent( float curr, boolean isXAxis, float prev )
+	public static float performEngineHatEvent( float curr, boolean isXAxis, float prev )
 	{
 		if( prev != curr )
 		{
@@ -374,32 +378,6 @@ public class XashActivity extends Activity {
 		}
 		return curr;
 	}
-	
-	public static boolean handleAxis( MotionEvent event )
-	{
-		// maybe I need to cache this...
-		for( InputDevice.MotionRange range: event.getDevice().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
-			case MotionEvent.AXIS_X:   prevSide = performEngineAxisEvent(cur, JOY_AXIS_SIDE,  prevSide, dead); break;
-			case MotionEvent.AXIS_Y:   prevFwd  = performEngineAxisEvent(cur, JOY_AXIS_FWD,   prevFwd,  dead); break;
-			case MotionEvent.AXIS_Z:   prevYaw  = performEngineAxisEvent(cur, JOY_AXIS_YAW,   prevYaw,  dead); break;
-			case MotionEvent.AXIS_RZ:  prevPtch = performEngineAxisEvent(cur, JOY_AXIS_PITCH, prevPtch, dead); break;
-			case MotionEvent.AXIS_RTRIGGER:	prevLT = performEngineAxisEvent(cur, JOY_AXIS_RT, prevLT,   dead); break;
-			case MotionEvent.AXIS_LTRIGGER:	prevRT = performEngineAxisEvent(cur, JOY_AXIS_LT, prevRT,   dead); break;
-			// hats
-			case MotionEvent.AXIS_HAT_X: prevHX = performEngineHatEvent(cur, true, prevHX); break;
-			case MotionEvent.AXIS_HAT_Y: prevHY = performEngineHatEvent(cur, false, prevHY); break;
-			}
-		}
-		
-		return true;
-	}
 
 	static class ShowTextInputTask implements Runnable
 	{
@@ -672,18 +650,7 @@ View.OnKeyListener {
 	{
 		return XashActivity.handleKey( keyCode, event );
 	}
-	
-	@Override 
-	public boolean onGenericMotionEvent(MotionEvent event)
-	{
-		if( ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) || 
-			(event.getSource() & InputDevice.SOURCE_GAMEPAD) != 0 )
-			return XashActivity.handleAxis( event );
-		// TODO: Add it someday
-		// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
-		//	return XashActivity.handleBall( event );
-		return super.onGenericMotionEvent( event );
-	}
+
 }
 
 /* This is a fake invisible editor view that receives the input and defines the
@@ -883,3 +850,110 @@ class AndroidBug5497Workaround {
 	}
 
 }
+
+interface JoystickHandler
+{
+	public int getSource(KeyEvent event);
+	public int getSource(MotionEvent event);
+	public boolean handleAxis(MotionEvent event);
+	public boolean isGamepadButton(int keyCode);
+	public String keyCodeToString(int keyCode);
+	public void init();
+}
+class JoystickHandler_stub implements 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 implements JoystickHandler
+{
+
+
+	private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
+
+	public int getSource(KeyEvent event)
+	{
+		return event.getSource();
+	}
+	public int getSource(MotionEvent event)
+	{
+		return event.getSource();
+	}
+	public boolean handleAxis( MotionEvent event )
+	{
+		// maybe I need to cache this...
+		for( InputDevice.MotionRange range: event.getDevice().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
+			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;
+			case MotionEvent.AXIS_Z:   prevYaw  = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_YAW,   prevYaw,  dead); break;
+			case MotionEvent.AXIS_RZ:  prevPtch = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break;
+			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;
+	}
+	public boolean isGamepadButton(int keyCode)
+	{
+		return KeyEvent.isGamepadButton(keyCode);
+	}
+	public String keyCodeToString(int keyCode)
+	{
+		return KeyEvent.keyCodeToString(keyCode);
+	}
+	public void init()
+	{
+		XashActivity.mSurface.setOnGenericMotionListener(new MotionListener());
+	}
+
+	class MotionListener implements View.OnGenericMotionListener
+	{
+		@Override
+		public boolean onGenericMotion(View view, MotionEvent event)
+		{
+			if( ((XashActivity.handler.getSource(event) & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) ||
+				(XashActivity.handler.getSource(event) & InputDevice.SOURCE_GAMEPAD) != 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;
+		}
+	}
+
+}
+

From 0a35d461310624ec7eecf500f72e25b5da57d416 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 16:08:41 +0000
Subject: [PATCH 76/83] Forgot initialize handler

---
 src/in/celest/xash3d/XashActivity.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 0f4c7fb7..2a27b0f5 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -84,16 +84,19 @@ public class XashActivity extends Activity {
 		// landscapeSensor is not supported until API9
 		if( sdk < 9 )
 			setRequestedOrientation(0);
-		if( sdk < 12 )
-			handler = new JoystickHandler_stub();
-		else
-			handler = new JoystickHandler_v12();
 
 		// keep screen on
 		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
 		// Set up the surface
 		mSurface = new EngineSurface(getApplication());
+
+		if( sdk < 12 )
+			handler = new JoystickHandler_stub();
+		else
+			handler = new JoystickHandler_v12();
+		handler.init();
+
 		mLayout = new FrameLayout(this);
 		mLayout.addView(mSurface);
 		setContentView(mLayout);

From 063dc599b9a73e99af04c9162bd63d06c267b1f3 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 1 Aug 2016 19:11:11 +0000
Subject: [PATCH 77/83] Fallback to key event on gamepads

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

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 2a27b0f5..163fbd1e 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -254,7 +254,31 @@ public class XashActivity extends Activity {
 		final boolean isGamePad  = (source & InputDevice.SOURCE_GAMEPAD)        == InputDevice.SOURCE_GAMEPAD;
 		final boolean isJoystick = (source & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK;
 		final boolean isDPad     = (source & InputDevice.SOURCE_DPAD)           == InputDevice.SOURCE_DPAD;
-		
+
+		if( isDPad )
+		{
+			byte val;
+			final byte hat = 0;
+			final int id = 0;
+			Log.d(TAG, "DPAD button: " + keyCode );
+			switch( keyCode )
+			{
+			case KeyEvent.KEYCODE_DPAD_CENTER: val = JOY_HAT_CENTERED; break;
+			case KeyEvent.KEYCODE_DPAD_UP:     val = JOY_HAT_UP;       break;
+			case KeyEvent.KEYCODE_DPAD_RIGHT:  val = JOY_HAT_RIGHT;    break;
+			case KeyEvent.KEYCODE_DPAD_DOWN:   val = JOY_HAT_DOWN;     break;
+			case KeyEvent.KEYCODE_DPAD_LEFT:   val = JOY_HAT_LEFT;     break;
+			default: return false;
+			}
+
+			if(action == KeyEvent.ACTION_DOWN)
+				nativeHat(id, hat, val, true);
+			else if(action == KeyEvent.ACTION_UP)
+				nativeHat(id, hat, val, false);
+
+			return true;
+		}
+
 		// Engine will bind these to AUX${val} virtual keys
 		if( isGamePad || isJoystick )
 		{
@@ -291,6 +315,23 @@ public class XashActivity extends Activity {
 					Log.d(TAG, "Unhandled GamePad button: " + XashActivity.handler.keyCodeToString(keyCode) );
 					return false;
 				}
+				else
+				{
+					if (action == KeyEvent.ACTION_DOWN)
+					{
+						if (event.isPrintingKey() || keyCode == 62)// space is printing too
+							XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
+
+						XashActivity.nativeKey(1, keyCode);
+
+						return true;
+					}
+					else if (action == KeyEvent.ACTION_UP)
+					{
+						XashActivity.nativeKey(0, keyCode);
+						return true;
+					}
+				}
 			}
 
 			if( event.getAction() == KeyEvent.ACTION_DOWN )
@@ -300,30 +341,7 @@ public class XashActivity extends Activity {
 			else return false;
 			return true;
 		}
-		
-		if( isDPad )
-		{
-			byte val;
-			final byte hat = 0;
-			final int id = 0;
-			switch( keyCode )
-			{
-			case KeyEvent.KEYCODE_DPAD_CENTER: val = JOY_HAT_CENTERED; break;
-			case KeyEvent.KEYCODE_DPAD_UP:     val = JOY_HAT_UP;       break;
-			case KeyEvent.KEYCODE_DPAD_RIGHT:  val = JOY_HAT_RIGHT;    break;
-			case KeyEvent.KEYCODE_DPAD_DOWN:   val = JOY_HAT_DOWN;     break;
-			case KeyEvent.KEYCODE_DPAD_LEFT:   val = JOY_HAT_LEFT;     break;
-			default: return false;
-			}
-			
-			if(action == KeyEvent.ACTION_DOWN)
-				nativeHat(id, hat, val, true);
-			else if(action == KeyEvent.ACTION_UP)
-				nativeHat(id, hat, val, false);
-			
-			return true;
-		}
-		
+
 		if (action == KeyEvent.ACTION_DOWN)
 		{
 			if (event.isPrintingKey() || keyCode == 62)// space is printing too

From f6f2aede91d95a0361195c733121f8b7698a50b2 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 5 Aug 2016 15:10:56 +0600
Subject: [PATCH 78/83] Remove SDL2 submodule

---
 .gitmodules             | 3 ---
 jni/src/SDL2/SDL-mirror | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 mode change 160000 => 100644 jni/src/SDL2/SDL-mirror

diff --git a/.gitmodules b/.gitmodules
index 08e60d55..05c5a63d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "jni/src/NanoGL/nanogl"]
 	path = jni/src/NanoGL/nanogl
 	url = https://github.com/SDLash3D/nanogl
-[submodule "jni/src/SDL2/SDL-mirror"]
-	path = jni/src/SDL2/SDL-mirror
-	url = https://github.com/mittorn/SDL-mirror
 [submodule "jni/src/Xash3D/xash3d"]
 	path = jni/src/Xash3D/xash3d
 	url = https://github.com/SDLash3D/xash3d
diff --git a/jni/src/SDL2/SDL-mirror b/jni/src/SDL2/SDL-mirror
deleted file mode 160000
index 1f0b6ddc..00000000
--- a/jni/src/SDL2/SDL-mirror
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f0b6ddc873a99f1bec8a4556c86bd7b6d5a85e3
diff --git a/jni/src/SDL2/SDL-mirror b/jni/src/SDL2/SDL-mirror
new file mode 100644
index 00000000..38ec3fce
--- /dev/null
+++ b/jni/src/SDL2/SDL-mirror
@@ -0,0 +1 @@
+Place here SDL2 source code, if you want build SDL2 version of Xash3D Android. Note that this is neither maintained nor supported officially anymore.

From 774ee7cf38912cd70d97ae73854b0690fb1647f8 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 5 Aug 2016 15:22:27 +0600
Subject: [PATCH 79/83] Update engine version. Update URLs in submodules

---
 .gitmodules           | 14 ++++----------
 jni/src/Xash3D/xash3d |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 05c5a63d..7fab271e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,15 @@
-[submodule "jni/src/HLSDK/halflife"]
-	path = jni/src/HLSDK/halflife
-	url = https://github.com/SDLash3D/halflife
 [submodule "jni/src/NanoGL/nanogl"]
 	path = jni/src/NanoGL/nanogl
-	url = https://github.com/SDLash3D/nanogl
+	url = https://github.com/FWGS/nanogl
 [submodule "jni/src/Xash3D/xash3d"]
 	path = jni/src/Xash3D/xash3d
-	url = https://github.com/SDLash3D/xash3d
+	url = https://github.com/FWGS/xash3d
 [submodule "xash-extras"]
 	path = xash-extras
-	url = https://github.com/SDLash3D/xash-extras
-[submodule "jni/src/hlsdk-client"]
-	path = jni/src/hlsdk-client
-	url = https://github.com/SDLash3D/hlsdk-client
+	url = https://github.com/FWGS/xash-extras
 [submodule "jni/src/hlsdk-xash3d"]
 	path = jni/src/hlsdk-xash3d
-	url = https://github.com/SDLash3D/hlsdk-xash3d
+	url = https://github.com/FWGS/hlsdk-xash3d
 [submodule "src/org/json"]
 	path = src/org/json
 	url = https://github.com/stleary/JSON-java
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 32500def..f23f2725 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 32500def8697b557482aa11acc299002f341bbab
+Subproject commit f23f2725800b751ebac73dc15a8d16866e1abef4

From e75f120cf75382544517bde5263f8a85ce778bae Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 5 Aug 2016 19:16:01 +0600
Subject: [PATCH 80/83] Rework FPicker to use AsyncTask. Also change spaces to
 tabs.

---
 src/in/celest/xash3d/FPicker.java | 358 +++++++++++++++++-------------
 1 file changed, 205 insertions(+), 153 deletions(-)

diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index 815c66ae..e33d05a7 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -5,6 +5,7 @@ import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
 import android.os.Environment;
 import android.os.Bundle;
 import android.os.Build;
@@ -12,6 +13,9 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
@@ -37,175 +41,223 @@ public class FPicker extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if ( sdk >= 21 )
-            super.setTheme( 0x01030224 );
-        setContentView(R.layout.activity_fpicker);
-        String path = Environment.getExternalStorageDirectory().toString();
-        currentDir = new File(path);
-        ((Button)findViewById( R.id.button_fpicker_select )).setOnClickListener(new View.OnClickListener(){
-           	   @Override
-            public void onClick(View v) {
-			onFileClick(v);
-                }
-        });
-        fill(currentDir);
+		super.onCreate(savedInstanceState);
+		if ( sdk >= 21 )
+			super.setTheme( 0x01030224 );
+
+		setContentView(R.layout.activity_fpicker);
+		String path = Environment.getExternalStorageDirectory().toString();
+		currentDir = new File(path);
+		((Button)findViewById( R.id.button_fpicker_select )).setOnClickListener(new View.OnClickListener()
+		{
+			@Override
+			public void onClick(View v) 
+			{
+				onFileClick(v);
+			}
+		});
+		fill(currentDir);
     }
 
     private void fill(File folder)
     {
-        File[]dirs = folder.listFiles();
-        while( dirs == null )
-        {
-            folder = new File(folder.getParent());
-            if( folder == null )
-                return;
-            dirs = folder.listFiles();
-        }
-        this.setTitle("Current Dir: "+folder.getName());
-        List<Item> dir = new ArrayList<Item>();
+		new Fill(folder).execute();
+    }
+    
+    private class Fill extends AsyncTask<Void, Void, List<Item>> 
+    {
+		File folder;
+    
+		public Fill(File f)
+		{
+			folder = f;
+		}
+		
+		protected List<Item> doInBackground(Void... voids)
+		{
+			File[] dirs = folder.listFiles();
+			List<Item> dir = new ArrayList<Item>();
+			
+			while( dirs == null )
+			{
+				folder = new File(folder.getParent());
+				if( folder == null )
+					return dir;
+				dirs = folder.listFiles();
+			}
+		
 
-            for(File ff: dirs)
-            {
-                Date lastModDate = new Date(ff.lastModified());
-                DateFormat formater = DateFormat.getDateTimeInstance();
-                String date_modify = formater.format(lastModDate);
-                if(ff.isDirectory()){
-                boolean isXashDir=false;
-
-                    File[] fbuf = ff.listFiles();
-                    int buf = 0;
-                    if(fbuf != null&&fbuf.length<20){
-                        buf = fbuf.length;
-                        for (File valves: fbuf) {
-                            if (valves.isDirectory()) {
-                                if(valves.getName().contains("valve"))isXashDir=true;
-                            }
-                        }
+			for(File ff: dirs)
+			{
+				Date lastModDate = new Date(ff.lastModified());
+				DateFormat formater = DateFormat.getDateTimeInstance();
+				String date_modify = formater.format(lastModDate);
+				if(ff.isDirectory())
+				{
+					boolean isXashDir=false;
+					File[] fbuf = ff.listFiles();
+					int buf = 0;
+					if(fbuf != null&&fbuf.length<20)
+					{
+						buf = fbuf.length;
+						for (File valves: fbuf) 
+						{
+							if (valves.isDirectory() && valves.getName().contains("valve"))
+									isXashDir=true;
+						}
+					}
+					
+					String num_item = String.valueOf(buf);
+					if(buf == 0) 
+						num_item = "Some items";
+					else 
+						num_item +=" items";
+					if(isXashDir)
+					{
+						dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.ic_launcher));
+					}
+					else 
+					{
+						dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.folder));
                     }
-                    String num_item = String.valueOf(buf);
-                    if(buf == 0) num_item = "Some items";
-                    else num_item +=" items";
-                    if(isXashDir){
-                         dir.add(new Item(ff.getName(),num_item,date_modify,ff.getAbsolutePath(),R.drawable.ic_launcher));
-
-                    }else {
-                        dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.folder));
-                    }}
+				}
             }
+            
+			Collections.sort(dir);
 
-        Collections.sort(dir);
-        if(folder.getName().length()>1)
-            dir.add(0,new Item("..","Parent Directory","",folder.getParent(),R.drawable.folder));
-        adapter = new FileArrayAdapter(FPicker.this,R.layout.row,dir);
-        delta = (ListView)findViewById(R.id.FileView);
-        delta.setAdapter(adapter);
-        delta.setOnItemClickListener(new AdapterView.OnItemClickListener( ){
-            @Override
-            public void onItemClick(AdapterView<?> parent , View v, int position, long id) {
-            Item o = adapter.getItem(position);
-             currentDir = new File(o.getPath());
-             fill(currentDir);
+			if(folder.getName().length() > 1)
+				dir.add(0, new Item( "..", "Parent Directory", "", folder.getParent(), R.drawable.folder));
+				
+			return dir;
+		}
+		
+		protected void onPostExecute(List<Item> dir)
+		{
+			setTitle("Current Dir: "+folder.getName());
+			
+			adapter = new FileArrayAdapter(FPicker.this,R.layout.row,dir);
+			delta = (ListView)findViewById(R.id.FileView);
+			delta.setAdapter(adapter);
+			delta.setOnItemClickListener(new AdapterView.OnItemClickListener()
+			{
+				@Override
+				public void onItemClick(AdapterView<?> parent , View v, int position, long id) 
+				{
+					Item o = adapter.getItem(position);
+					currentDir = new File(o.getPath());
+					fill(currentDir);
+				}
+			});
 
-        }
-        });
+		}
     }
-    public void onFileClick(View v)
-    {
-        Toast.makeText(this, "Chosen path : " + currentDir, Toast.LENGTH_SHORT).show();
-        Intent intent = new Intent();
-        intent.putExtra("GetPath",currentDir.toString());
-        setResult(RESULT_OK, intent);
-        finish();
-    }
-
-
+    
+	public void onFileClick(View v)
+	{
+		Toast.makeText(this, "Chosen path : " + currentDir, Toast.LENGTH_SHORT).show();
+		Intent intent = new Intent();
+		intent.putExtra("GetPath",currentDir.toString());
+		setResult(RESULT_OK, intent);
+		finish();
+	}
 }
-class FileArrayAdapter extends ArrayAdapter<Item> {
 
-    private Context c;
-    private int id;
-    private List<Item>items;
+class FileArrayAdapter extends ArrayAdapter<Item> 
+{
+	private Context c;
+	private int id;
+	private List<Item>items;
 
-    public FileArrayAdapter(Context context, int textViewResourceId,
-                            List<Item> objects) {
-        super(context, textViewResourceId, objects);
-        c = context;
-        id = textViewResourceId;
-        items = objects;
-    }
-    public Item getItem(int i)
-    {
-        return items.get(i);
-    }
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        View v = convertView;
-        if (v == null) {
-            LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            v = vi.inflate(id, null);
-        }
+	public FileArrayAdapter(Context context, int textViewResourceId, List<Item> objects) 
+	{
+		super(context, textViewResourceId, objects);
+		c = context;
+		id = textViewResourceId;
+		items = objects;
+	}
+	
+	public Item getItem(int i)
+	{
+		return items.get(i);
+	}
+    
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		View v = convertView;
+		if (v == null) 
+		{
+			LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			v = vi.inflate(id, null);
+		}
+        
+		final Item finstance = items.get(position);
+		if (finstance != null) 
+		{
+			TextView filename = (TextView) v.findViewById(R.id.filename);
+			TextView fileitems = (TextView) v.findViewById(R.id.fileitems);
+			TextView filedate = (TextView) v.findViewById(R.id.filedate);
+			ImageView imageicon = (ImageView) v.findViewById(R.id.fd_Icon1);
 
+			Drawable image = c.getResources().getDrawable(finstance.getImage());
+			imageicon.setImageDrawable(image);
 
-        final Item finstance = items.get(position);
-        if (finstance != null) {
-            TextView filename = (TextView) v.findViewById(R.id.filename);
-            TextView fileitems = (TextView) v.findViewById(R.id.fileitems);
-            TextView filedate = (TextView) v.findViewById(R.id.filedate);
-            ImageView imageicon = (ImageView) v.findViewById(R.id.fd_Icon1);
-
-
-            Drawable image = c.getResources().getDrawable(finstance.getImage());
-            imageicon.setImageDrawable(image);
-
-            if(filename!=null)
-                filename.setText(finstance.getName());
-            if(fileitems!=null)
-                fileitems.setText(finstance.getData());
-            if(filedate!=null)
-                filedate.setText(finstance.getDate());
-        }
-        return v;
-    }
+			if(filename!=null)
+				filename.setText(finstance.getName());
+			if(fileitems!=null)
+				fileitems.setText(finstance.getData());
+			if(filedate!=null)
+				filedate.setText(finstance.getDate());
+		}
+		return v;
+	}
 }
+
 class Item implements Comparable<Item>{
-    private String name;
-    private String data;
-    private String date;
-    private String path;
-    private int image;
-
-    public Item(String n,String d, String dt, String p, int img)
-    {
-        name = n;
-        data = d;
-        date = dt;
-        path = p;
-        image = img;
-    }
-    public String getName()
-    {
-        return name;
-    }
-    public String getData()
-    {
-        return data;
-    }
-    public String getDate()
-    {
-        return date;
-    }
-    public String getPath()
-    {
-        return path;
-    }
-    public int getImage() {
-        return image;
-    }
-    public int compareTo(Item o) {
-        if(this.name != null)
-            return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
-        else
-            throw new IllegalArgumentException();
+	private String name;
+	private String data;
+	private String date;
+	private String path;
+	private int image;
+	
+	public Item(String n,String d, String dt, String p, int img)
+	{
+		name = n;
+		data = d;
+		date = dt;
+		path = p;
+		image = img;
+	}
+    
+	public String getName()
+	{
+		return name;
+	}
+    
+	public String getData()
+	{
+		return data;
     }
+    
+	public String getDate()
+	{
+		return date;
+	}
+	
+	public String getPath()
+	{
+		return path;
+	}
+    
+	public int getImage() 
+	{
+		return image;
+	}
+    
+	public int compareTo(Item o) 
+	{
+		if(this.name != null)
+			return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
+		else
+			throw new IllegalArgumentException();
+	}
 }

From 8133cd9d01bf9545864212a28b83c28c2c6fc7e8 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 5 Aug 2016 19:17:03 +0600
Subject: [PATCH 81/83] Implement Immediate Mode(sticky) on 4.4 or higher

---
 build.sh                                   |  4 +-
 project.properties                         |  2 +-
 res/layout/activity_launcher.xml           |  9 ++++
 res/values/strings.xml                     |  1 +
 src/in/celest/xash3d/LauncherActivity.java | 51 ++++++++++------------
 src/in/celest/xash3d/XashActivity.java     | 43 +++++++++++++++++-
 6 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/build.sh b/build.sh
index 5fc5fb03..c7ba575f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 V=0 XASH_SDL=1 -j 8 APP_CFLAGS="-w -Wl,--no-undefined" APP_LDFLAGS="-Wl,--no-undefined"
+ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 V=0 XASH_SDL=0 -j 8 APP_CFLAGS="-w -Wl,--no-undefined" APP_LDFLAGS="-Wl,--no-undefined"
 sh gen-version.sh default-release
 rm assets/extras.pak 2>/dev/null
 python2 makepak.py xash-extras assets/extras.pak
 ant release
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
 rm bin/xashdroid-release.apk
-/home/a1ba/.android/android-sdk-linux/build-tools/22.0.1/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk
+#/home/a1ba/.android/android-sdk-linux/build-tools/22.0.1/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk
diff --git a/project.properties b/project.properties
index c052cd8f..4ab12569 100644
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-13
+target=android-19
diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 2d0eb754..b83b2760 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -254,6 +254,15 @@
 								android:layout_marginRight="10dp"
 								android:layout_marginTop="10dp"
 								android:text="@string/update_to_beta" />
+							<CheckBox
+								android:id="@+id/immersive_mode"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_margin="10dp"
+								android:layout_marginLeft="10dp"
+								android:layout_marginRight="10dp"
+								android:layout_marginTop="10dp"
+								android:text="@string/immersive_mode" />
 							<TextView
 								android:id="@+id/textView7"
 								android:layout_marginBottom="10dp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 839612eb..2ff12d87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,4 +56,5 @@
 	<string name="cancel">Cancel</string>
 	<string name="no_updates">No updates was found</string>
 	<string name="checking_updates">Working...</string>
+	<string name="immersive_mode">Enable Immersive Mode(fullscreen, KitKat or higher)</string>
 </resources>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 663c3ce8..0d479b0a 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -13,6 +13,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowManager;
 
 import android.content.Intent;
 import android.content.ComponentName;
@@ -63,6 +64,7 @@ public class LauncherActivity extends Activity {
 	static ToggleButton resizeWorkaround;
 	static CheckBox	checkUpdates;
 	static CheckBox updateToBeta;
+	static CheckBox immersiveMode;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
 	static TextView tvResPath;
@@ -82,7 +84,9 @@ public class LauncherActivity extends Activity {
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		//super.setTheme( 0x01030005 );
 		if ( sdk >= 21 )
+		{
 			super.setTheme( 0x01030224 );
+		}
 		
 		setContentView(R.layout.activity_launcher);
 
@@ -101,14 +105,15 @@ public class LauncherActivity extends Activity {
 		tabHost.addTab(tabSpec);
 
 		mPref        = getSharedPreferences("engine", 0);
-		cmdArgs      = (EditText)findViewById(R.id.cmdArgs);
+		cmdArgs      = (EditText) findViewById(R.id.cmdArgs);
 		useVolume    = (ToggleButton) findViewById( R.id.useVolume );
 		resPath      = (EditText) findViewById( R.id.cmdPath );
-		checkUpdates = (CheckBox)findViewById(R.id.check_updates);
-		updateToBeta = (CheckBox)findViewById(R.id.check_betas);
-		pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
+		checkUpdates = (CheckBox)findViewById( R.id.check_updates );
+		updateToBeta = (CheckBox)findViewById( R.id.check_betas );
+		pixelSpinner = (Spinner) findViewById( R.id.pixelSpinner );
 		resizeWorkaround = (ToggleButton) findViewById( R.id.enableResizeWorkaround );
 		tvResPath    = (TextView) findViewById( R.id.textView_path );
+		immersiveMode = (CheckBox) findViewById( R.id.immersive_mode );
 		
 		final String[] list = {
 			"32 bit (RGBA8888)",
@@ -121,31 +126,6 @@ public class LauncherActivity extends Activity {
 		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
 		adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
 		pixelSpinner.setAdapter(adapter);
-		Button selectFolderButton = ( Button ) findViewById( R.id.button_select );
-		selectFolderButton.setOnClickListener(new View.OnClickListener(){
-			   @Override
-			public void onClick(View v) {
-			selectFolder(v);
-				}
-		});
-		((Button)findViewById( R.id.button_launch )).setOnClickListener(new View.OnClickListener(){
-			   @Override
-			public void onClick(View v) {
-			startXash(v);
-				}
-		});
-		((Button)findViewById( R.id.button_shortcut )).setOnClickListener(new View.OnClickListener(){
-			   @Override
-			public void onClick(View v) {
-			createShortcut(v);
-				}
-		});
-		((Button)findViewById( R.id.button_about )).setOnClickListener(new View.OnClickListener(){
-			   @Override
-			public void onClick(View v) {
-			aboutXash(v);
-				}
-		});
 		useVolume.setChecked(mPref.getBoolean("usevolume",true));
 		checkUpdates.setChecked(mPref.getBoolean("check_updates",true));
 		updateToBeta.setChecked(mPref.getBoolean("check_betas", false));
@@ -154,6 +134,15 @@ public class LauncherActivity extends Activity {
 		pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
 		resizeWorkaround.setChecked(mPref.getBoolean("enableResizeWorkaround", true));
 		
+		if( sdk >= 19 )
+		{
+			immersiveMode.setChecked(mPref.getBoolean("immersive_mode", true));
+		}
+		else
+		{
+			immersiveMode.setVisibility(View.GONE); // not available
+		}
+				
 		resPath.setOnFocusChangeListener( new View.OnFocusChangeListener()
 		{
 			@Override
@@ -188,6 +177,10 @@ public class LauncherActivity extends Activity {
 		editor.putInt("pixelformat", pixelSpinner.getSelectedItemPosition());
 		editor.putBoolean("enableResizeWorkaround",resizeWorkaround.isChecked());
 		editor.putBoolean("check_updates", checkUpdates.isChecked());
+		if( sdk >= 19 )
+			editor.putBoolean("immersive_mode", immersiveMode.isChecked());
+		else
+			editor.putBoolean("immersive_mode", false); // just in case...
 		editor.commit();
 		startActivity(intent);
     }
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 163fbd1e..ef4703ac 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -57,6 +57,8 @@ public class XashActivity extends Activity {
 	// Preferences
 	public static SharedPreferences mPref = null;
 	private static boolean mUseVolume;
+	private static boolean mEnableImmersive;
+	private static View mDecorView;
 
 	// Audio
 	private static Thread mAudioThread;
@@ -68,6 +70,7 @@ public class XashActivity extends Activity {
 	}
 
 	// Setup
+	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		Log.v(TAG, "onCreate()");
 		super.onCreate(savedInstanceState);
@@ -153,18 +156,41 @@ public class XashActivity extends Activity {
 		mUseVolume = mPref.getBoolean("usevolume", false);
 		if( mPref.getBoolean("enableResizeWorkaround", true) )
 			AndroidBug5497Workaround.assistActivity(this);
+		
+		// Immersive Mode is available only at >KitKat
+		mEnableImmersive = (sdk >= 19 && mPref.getBoolean("immersive_mode", true));
+		mDecorView = getWindow().getDecorView();
 	}
 
 	// Events
+	@Override
 	protected void onPause() {
 		Log.v(TAG, "onPause()");
 		super.onPause();
 	}
 
+	@Override
 	protected void onResume() {
 		Log.v(TAG, "onResume()");
 		super.onResume();
 	}
+	
+	@Override
+	public void onWindowFocusChanged(boolean hasFocus) 
+	{
+		super.onWindowFocusChanged(hasFocus);
+
+		if( mEnableImmersive && hasFocus ) 
+		{
+			mDecorView.setSystemUiVisibility(
+				View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+				| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+				| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+				| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
+				| View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
+				| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+		}
+	}	
 
 	public static native int nativeInit(Object arguments);
 	public static native void nativeQuit();
@@ -206,6 +232,11 @@ public class XashActivity extends Activity {
 	public static void toggleEGL(int toggle) {
 		mSurface.toggleEGL(toggle);
 	}
+	
+	public static boolean deleteGLContext() {
+		mSurface.ShutdownGL();
+		return true;
+	}
 
 	public static Context getContext() {
 		return mSingleton;
@@ -539,7 +570,6 @@ View.OnKeyListener {
 
 	// EGL functions
 	public boolean InitGL() {
-
 		try
 		{
 			EGL10 egl = (EGL10)EGLContext.getEGL();
@@ -664,6 +694,17 @@ View.OnKeyListener {
 			mEGLSurface = null;
 	   }
 	}
+	public void ShutdownGL()
+	{
+		mEGL.eglDestroyContext(mEGLDisplay, mEGLContext);
+		mEGLContext = null;
+		
+		mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
+		mEGLSurface = null;
+		
+		mEGL.eglTerminate(mEGLDisplay);
+		mEGLDisplay = null;
+	}
 
 
 	@Override

From ce2e4767adf509ef7cc2b1670d0d2fb0c9e7d623 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 5 Aug 2016 19:31:42 +0600
Subject: [PATCH 82/83] Swap yaw and pitch axes again

---
 src/in/celest/xash3d/XashActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index ef4703ac..8f28682f 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -976,8 +976,8 @@ class JoystickHandler_v12 implements JoystickHandler
 			// typical axes
 			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;
-			case MotionEvent.AXIS_Z:   prevYaw  = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_YAW,   prevYaw,  dead); break;
-			case MotionEvent.AXIS_RZ:  prevPtch = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break;
+			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;
 			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

From 3192fd851d8a7db1eca020c0a91789943c38f979 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Fri, 5 Aug 2016 19:33:19 +0600
Subject: [PATCH 83/83] 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 f23f2725..a114800c 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit f23f2725800b751ebac73dc15a8d16866e1abef4
+Subproject commit a114800ce16bbde98d083c0b63e8782d6bbbfa2f