diff --git a/.travis.yml b/.travis.yml index 9fca1f7c..b225882c 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 + - bash scripts/travis-upload.sh diff --git a/README.md b/README.md index 6b2981a7..600f3863 100644 --- a/README.md +++ b/README.md @@ -26,5 +26,5 @@ About all bugs please write to issues with your device and OS info. ### Developers -+ Just put into jni/src/XXXX/ a symlink to a repository. For example, for HLSDK it will be jni/src/HLSDK/halflife/ ++ For compiling, run `git submodule init && git submodule update`. Otherwise you will get an empty APK, without any libraries. + We use our SDL2 fork. See https://github.com/mittorn/SDL-mirror diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml new file mode 100644 index 00000000..09303709 --- /dev/null +++ b/res/values-es/strings.xml @@ -0,0 +1,41 @@ + + + + Xash3D + Xash3D + Xash3D (test) + + ¡Iniciar Xash3D! + Parámetros de línea de comandos(sólo expertos) + Activar controles táctiles + Usar botones de volumen + Ruta de los archivos del juego + Configurar controles + Acceso directo Xash3D + Acceso directo Xash3D_test + Guardar acceso directo + Directorio del mod + Nombre del paquete del mod (sólo expertos) + Nombre del acceso directo + + + Xash3D Android + SDLash3D 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 +• a1batross\n +• mittorn \n +• nicknekit.\n + +Especial agradecimiento a:\n +• Uncle Mike por Xash3D engine\n +• Valve por Half-Life\n +• Desarrolladores de libSDL2.\n +Siguenos en: + • VK + • ModDB + • 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 new file mode 100644 index 00000000..d947e412 --- /dev/null +++ b/res/values-fa/strings.xml @@ -0,0 +1,26 @@ + + + Xash3D + Xash3D + Xash3D (آزمایشی) + !Xash3Dاجرای + دستورات خط فرمان (فقط برای حرفه ای ها): + فعال کردن کنترل های لمسی + استفاده از دکمه های صدا + مسیر منابع بازی: + تنظیمات کنترل: + Xash3D میانبر + Xash3D_test shortcut + ذخیره میانبر + مسیر مود + نام بسته مود (فقط برای حرفه ای ها): + نام میانبر + Xash3D Android + یا شرکای آن ندارد. تمامی حقوق کپی برای صاحبان هر کدام محفوظ است. Valve هیچ نسبتی با SDLash3D + 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 + Xash3D Android درباره + ایجاد میانبر مود + (انتخاب) + diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml new file mode 100644 index 00000000..63694943 --- /dev/null +++ b/res/values-pt-rBR/strings.xml @@ -0,0 +1,41 @@ + + + + Xash3D + Xash3D + Xash3D (test) + + Iniciar Xash3D! + Argumentos de linha de comando(apenas expecialistas) + Habilitar controles de touch + Use as teclas de volume + Diretório para recursos do jogo + Configurações de controle + Atalho Xash3D + Atalho Xash3D_test + Salvar atalho + Diretório do Mod + Nome do pacote de Mod (apenas expecialistas) + Nome do atalho + + + Xash3D Android + SDLash3D 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 +• a1batross\n +• mittorn \n +• nicknekit.\n + +Agradecimentos especiais para:\n +• Uncle Mike pelo motor Xash3D\n +• Valve pelo Half-Life\n +• Desenvolvedores libSDL2.\n +Siga-nos no: + • VK + • ModDB + • GitHub + Sobre Android Xash3D + Criar atalho para o mod + (selecionar) + diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml new file mode 100644 index 00000000..0f72430c --- /dev/null +++ b/res/values-zh/strings.xml @@ -0,0 +1,77 @@ + + + + + + Xash3D + + Xash3D + + Xash3D (test) + + 启动 Xash3D! + + 命令行参数（高级） + + 启用触摸控制 + + 使用音量键 + + 游戏资源路径 + + 控制设置 + + Xash3D 快捷方式 + + Xash3D_test 快捷方式 + + 保存快捷方式 + + Mod 目录 + + Mod 资源包名字（高级） + + 快捷方式名字 + + + + + Xash3D Android + + SDLash3D不隶属于Valve或其合作伙伴。 版权归各自所有。 + + v0.17.1 + + 由SDLash3D团队移植到Android系统，成员： \n + +• a1batross\n + +• mittorn \n + +• nicknekit.\n + + +特别感谢：\n + +• Uncle Mike 制作的 Xash3D 引擎\n + +• Valve 制作的 《半条命》\n + +• libSDL2 开发商\n + + 联系我们： + + • VK + + • ModDB + + • GitHub + + 关于 Xash3D Android + + 创建mod快捷方式 + + (选择) + + + 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..251f9a73 --- /dev/null +++ b/scripts/travis-upload.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +# Upload travis generated APKs to the Transfer.sh and Yandex.Disk + +function getDaysSinceRelease +{ + printf %04d $(( ( $(date +'%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:" +echo "armv5: ${TRANSFERSH_ARMV5}" +echo "armv6: ${TRANSFERSH_ARMV6}" +echo "armv7: ${TRANSFERSH_ARMV7}" +echo "tegra2: ${TRANSFERSH_ARMV7TEGRA2}" +echo "x86: ${TRANSFERSH_X86}" + +# 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 +# $TRAVIS_BRANCH is predefined by Travis CI +function generateFileName_current +{ + echo "xash3d-current-$1-$TRAVIS_BRANCH.apk" +} + +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