From e5268bcf3f5116fd1e85bf02bb176009ea985846 Mon Sep 17 00:00:00 2001 From: Deic Date: Fri, 13 May 2016 22:49:45 +0200 Subject: [PATCH 1/5] fix TextView on dialog Links work now. --- src/in/celest/xash3d/LauncherActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java index 6d3f98bb..3b67e9d2 100644 --- a/src/in/celest/xash3d/LauncherActivity.java +++ b/src/in/celest/xash3d/LauncherActivity.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.app.Dialog; import android.os.Bundle; import android.os.Build; +import android.text.method.LinkMovementMethod; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -12,6 +13,7 @@ import android.widget.EditText; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.Button; +import android.widget.TextView; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; @@ -80,6 +82,8 @@ public class LauncherActivity extends Activity { dialog.setCancelable(true); dialog.show(); + TextView tView6 = (TextView) dialog.findViewById(R.id.textView6); + tView6.setMovementMethod(LinkMovementMethod.getInstance()); } }); } From 9e515756afd9e7fe775bf82a3176cc9dcfa52d47 Mon Sep 17 00:00:00 2001 From: Deic Date: Fri, 13 May 2016 22:51:21 +0200 Subject: [PATCH 2/5] remove useless arg --- res/layout/about.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/layout/about.xml b/res/layout/about.xml index 1332fd5e..26d7fe78 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -48,8 +48,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/about_links" android:id="@+id/textView6" - android:autoText="false" - android:autoLink="web" /> + android:autoText="false" /> Date: Fri, 22 Jul 2016 19:38:49 +0600 Subject: [PATCH 3/5] SDLash3D->Flying With Gauss --- res/values-de/strings.xml | 6 +++--- res/values-es/strings.xml | 6 +++--- res/values-fa/strings.xml | 6 +++--- res/values-ko/strings.xml | 8 ++++---- res/values-pt-rBR/strings.xml | 6 +++--- res/values-ru/strings.xml | 4 ++-- res/values-tr/strings.xml | 7 +++---- res/values-ua/strings.xml | 7 +++---- res/values-zh/strings.xml | 6 +++--- res/values/strings.xml | 9 +++------ 10 files changed, 30 insertions(+), 35 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index f5882234..8d641a28 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -20,8 +20,8 @@ Xash3D Android - SDLash3D steht in keinem Zusammenhang zu Valve oder einem ihrer Partners. All copyrights reserved to their respective owners. - Portierung auf Android by SDLash3D team: \n + Flying With Gauss steht in keinem Zusammenhang zu Valve oder einem ihrer Partners. All copyrights reserved to their respective owners. + Portierung auf Android by Flying With Gauss: \n • a1batross\n • mittorn \n • nicknekit.\n @@ -33,7 +33,7 @@ Spezieller Dank an:\n Folge uns auf: • VK • ModDB - • GitHub + • GitHub Über Xash3D Android mod Kurzbefehl ersellen (auswahl) diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 09303709..3cf4155e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -20,9 +20,9 @@ Xash3D Android - SDLash3D no está afiliado con Valve o cualquiera de sus socios. Todos los derechos reservados a sus respectivos dueños. + Flying With Gauss no está afiliado con Valve o cualquiera de sus socios. Todos los derechos reservados a sus respectivos dueños. v0.17.1 - Adaptación para Android por SDLash3D team: \n + Adaptación para Android por Flying With Gauss: \n • a1batross\n • mittorn \n • nicknekit.\n @@ -34,7 +34,7 @@ Especial agradecimiento a:\n Siguenos en: • VK • ModDB - • GitHub + • GitHub Acerca de Xash3D Android Crear acceso directo del mod (seleccionar) diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index d947e412..b80a7f8a 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -16,10 +16,10 @@ نام بسته مود (فقط برای حرفه ای ها): نام میانبر Xash3D Android - یا شرکای آن ندارد. تمامی حقوق کپی برای صاحبان هر کدام محفوظ است. Valve هیچ نسبتی با SDLash3D + یا شرکای آن ندارد. تمامی حقوق کپی برای صاحبان هر کدام محفوظ است. Valve هیچ نسبتی با Flying With Gauss v0.17.1 - :SDLash3D پورت شده به اندروید توسط تیم \n • a1batross\n • mittorn \n • nicknekit.\n تشکر ویژه از:\n • Xash3Dبرای موتور Uncle Mike\n • Half-Life برای Valve\n • libSDL2 توسعه دهندگان.\n - ما را دنبال کنید در : •VK•ModDB•GitHub + :Flying With Gauss پورت شده به اندروید توسط تیم \n • a1batross\n • mittorn \n • nicknekit.\n تشکر ویژه از:\n • Xash3Dبرای موتور Uncle Mike\n • Half-Life برای Valve\n • libSDL2 توسعه دهندگان.\n + ما را دنبال کنید در : •VK•ModDB•GitHub Xash3D Android درباره ایجاد میانبر مود (انتخاب) diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 7aeab5d8..775b0b59 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -18,8 +18,8 @@ 모드 패키지 이름(고급설정) 바로가기 이름 Xash3D 안드로이드 - 우리 SDLash3D는 밸브와 상업적으로 관련이 없습니다. 모든 저작권은 소유주로 보류되어있음을 알립니다.. - 안드로이드 이식 by SDLash3D팀: \n + 우리 Flying With Gauss는 밸브와 상업적으로 관련이 없습니다. 모든 저작권은 소유주로 보류되어있음을 알립니다.. + 안드로이드 이식 by Flying With Gauss: \n • a1batross\n • mittorn \n • nicknekit.\n @@ -32,9 +32,9 @@ 여기서 우리를: • VK • 모드디비 -• 깃허브 +• 깃허브 Xash3D 안드로이드 정보 바로가기 만들기 (선택) - \ No newline at end of file + diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 63694943..44c34e36 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -20,9 +20,9 @@ Xash3D Android - SDLash3D não é afiliado com a Valve ou qualquer um dos seus parceiros. Todos os direitos autorais reservados aos respectivos proprietários. + Flying With Gauss não é afiliado com a Valve ou qualquer um dos seus parceiros. Todos os direitos autorais reservados aos respectivos proprietários. v0.17.1 - Porta para android pelo time SDLash3D: \n + Porta para android pelo Flying With Gauss: \n • a1batross\n • mittorn \n • nicknekit.\n @@ -34,7 +34,7 @@ Agradecimentos especiais para:\n Siga-nos no: • VK • ModDB - • GitHub + • GitHub Sobre Android Xash3D Criar atalho para o mod (selecionar) diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 0fa5a456..924ea767 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -11,7 +11,7 @@ Каталог мода Пакет мода (только для экспертов) Название ярлыка - Порт на Android осуществлен командой SDLash3D:\n + Порт на Android осуществлен Flying With Gauss:\n • a1batross\n • mittorn\n • nicknekit\n @@ -22,7 +22,7 @@ • Beloko Games за поддержку сенсорного управления\n • Разработчикам libSDL2 О Xash3D Android - SDLash3D не связан с Valve или с любыми из их партнеров. Все авторские права принадлежат их соотвественным обладателям. + Flying With Gauss не связан с Valve или с любыми из их партнеров. Все авторские права принадлежат их соотвественным обладателям. Настройки Ярлык Xash3D (тест) Создать ярлык diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index a313ea30..e31e2397 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -18,10 +18,9 @@ Mod\'un paket adı (uzmanlar için) Kısayol adı - Xash3D Android - SDLash3D, Valve veya Valve\'ın herhangi bir partnerine bağlı değildir. Tüm telif hakları kendi sahiplerine aittir. - SDLash3D takımından Android Port\'u: \n + Flying With Gauss, Valve veya Valve\'ın herhangi bir partnerine bağlı değildir. Tüm telif hakları kendi sahiplerine aittir. + Flying With Gauss takımından Android Port\'u: \n • a1batross\n • mittorn \n • nicknekit.\n @@ -33,7 +32,7 @@ Bizi buralardan takip edin: • VK • ModDB - • GitHub + • GitHub Xash3D Android Hakkında Mod kısayolu oluştur (seç) diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml index 3b7a91f4..c24954a5 100644 --- a/res/values-ua/strings.xml +++ b/res/values-ua/strings.xml @@ -17,10 +17,9 @@ Пакет мода (тільки для експертів) Назва ярлика - Xash3D Android - SDLash3D не пов\'язаний з Valve або з будь-якими з їх партнерів. Всі авторські права належать їх відповідним власникам. - Порт на Android здійснений командою SDLash3D:\n + Flying With Gauss не пов\'язаний з Valve або з будь-якими з їх партнерів. Всі авторські права належать їх відповідним власникам. + Порт на Android здійснений Flying With Gauss:\n • a1batross\n • mittorn\n • nicknekit\n @@ -32,7 +31,7 @@ Слідуйте за нами в: • VK • ModDB - • GitHub + • GitHub О Xash3D Android Створити ярлик мода (вибрати) diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml index 0f72430c..7e893c68 100644 --- a/res/values-zh/strings.xml +++ b/res/values-zh/strings.xml @@ -38,11 +38,11 @@ Xash3D Android - SDLash3D不隶属于Valve或其合作伙伴。 版权归各自所有。 + Flying With Gauss不隶属于Valve或其合作伙伴。 版权归各自所有。 v0.17.1 - 由SDLash3D团队移植到Android系统，成员： \n + 由Flying With Gauss团队移植到Android系统，成员： \n • a1batross\n @@ -65,7 +65,7 @@ • ModDB - • GitHub + • GitHub 关于 Xash3D Android diff --git a/res/values/strings.xml b/res/values/strings.xml index ae4746be..8ce586af 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4,7 +4,6 @@ Xash3D Xash3D Xash3D (test) - Launch Xash3D! Command line arguments(experts only) Enable touch controls @@ -17,12 +16,10 @@ Mod directory Mod package name (experts only) Shortcut name - - Xash3D Android - SDLash3D is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners. + Flying With Gauss is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners. v0.17.1 - Port to Android by SDLash3D team: \n + Port to Android by Flying With Gauss: \n • a1batross\n • mittorn \n • nicknekit.\n @@ -34,7 +31,7 @@ Special thanks to:\n Follow us in: • VK • ModDB - • GitHub + • GitHub About Xash3D Android Create mod shortcut (select) From 100f89b0e7fc6e6d3de1cbae1594a50767f96894 Mon Sep 17 00:00:00 2001 From: a1batross Date: Fri, 5 Aug 2016 19:48:06 +0600 Subject: [PATCH 4/5] 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 a114800c..1b6ab504 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit a114800ce16bbde98d083c0b63e8782d6bbbfa2f +Subproject commit 1b6ab50478f7c9460bd5a699fc05d3c720a6a40d From 4fc4454a749581f62596f00859b3f655f25870a8 Mon Sep 17 00:00:00 2001 From: a1batross Date: Fri, 5 Aug 2016 19:53:14 +0600 Subject: [PATCH 5/5] [skip ci] Just disable XASH_SDL in debug buildscript --- debug.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug.sh b/debug.sh index d0e39e67..bdfa2b42 100755 --- a/debug.sh +++ b/debug.sh @@ -1,6 +1,6 @@ #!/bin/sh -ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" XASH_SDL=1 +ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" XASH_SDL=0 sh gen-version.sh default-debug rm assets/extras.pak 2>/dev/null python2 makepak.py xash-extras assets/extras.pak