diff --git a/.gitignore b/.gitignore index a3e90fcc..ee4ba493 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,14 @@ -# Build data +.gradle/ build/ -build-xash3d-fwgs -build-hlsdk-xash3d -libs/armeabi* -libs/x86 -obj -bin -gen - -# Private info +.externalNativeBuild +.cxx/ +.idea/ local.properties - -# Builds -*.apk - -# VKontakte gives a shit when uploading APK -*.bin - -# Generated -android/assets/extras.pak -android/res/values/git-rev.xml -android/src/in/celest/xash3d/XashConfig.java -android/lib - -# Waf -build_current -*waf-*/ -*waf3-*/ -.lock-waf* -*.lastbuildstate -*.unsuccessfulbuild -__pycache__ -*.pyc +.project +.classpath +.gradle +.settings +release/ +*.hprof +.vscode/ +*.bak \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 80b81f0c..d3ba1cf3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,11 @@ -[submodule "xash-extras"] - path = xash-extras - url = https://github.com/FWGS/xash-extras -[submodule "jni/src/xash3d-fwgs"] - path = xash3d-fwgs - url = https://github.com/FWGS/xash3d-fwgs -[submodule "hlsdk-xash3d"] - path = hlsdk-xash3d - url = https://github.com/FWGS/hlsdk-xash3d +[submodule "hlsdk-portable"] + path = app/src/main/cpp/hlsdk-portable + url = https://github.com/FWGS/hlsdk-portable + branch = mobile_hacks [submodule "xash3d-fwgs"] - path = xash3d-fwgs + path = app/src/main/cpp/xash3d-fwgs url = https://github.com/FWGS/xash3d-fwgs +[submodule "SDL"] + path = app/src/main/cpp/SDL + url = https://github.com/libsdl-org/SDL + branch = release-2.24.1 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d7c4d854..00000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -language: android -android: - components: - - platform-tools - - build-tools-21.1.1 - - android-19 - - extra-android-support - -install: ant - - -addons: - apt: - packages: - - ant -jdk: oraclejdk8 - -notifications: - email: false - -before_install: - - wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin > /dev/null 2>/dev/null - - chmod +x android-ndk-r10e-linux-x86_64.bin && ./android-ndk-r10e-linux-x86_64.bin > /dev/null - - mv android-ndk-r10e android-ndk - - export PATH=`pwd`/android-ndk:`pwd`/android-sdk-linux/tools:`pwd`/android-sdk-linux/platform-tools:$PATH - - git submodule update --init --recursive -script: - - cp debug.keystore ~/.android/debug.keystore - - sh gen-version.sh travis build - - sh gen-config.sh test - - python2 makepak.py xash-extras assets/extras.pak - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - - ant debug -Dtest.version=1 - - cp bin/xashdroid-debug.apk xashdroid-armv7.apk - - 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=neon-vfpv4 -mcpu=cortex-a15 -ffast-math -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC -DHAVE_EFFICIENT_UNALIGNED_ACCESS" - - ant debug -Dtest.version=1 - - cp bin/xashdroid-debug.apk xashdroid-armv7-cortex-a7-a15.apk - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi" - - ant debug -Dtest.version=1 - - cp bin/xashdroid-debug.apk xashdroid-armv6.apk - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="x86" - - ant debug -Dtest.version=1 - - cp bin/xashdroid-debug.apk xashdroid-x86.apk - - 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 -Dtest.version=1 - - cp bin/xashdroid-debug.apk xashdroid-armv7-tegra2.apk - - 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 -Dtest.version=1 - - cp bin/xashdroid-debug.apk xashdroid-armv5.apk - -after_script: - - sh travis-upload.sh *.apk - - sh travis-deploy.sh android-optimized *.apk diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..adc90d98 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..53f6c9f6 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,218 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.5) + rexml + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.666.0) + aws-sdk-core (3.168.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.117.1) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.94.0) + faraday (1.10.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.2.6) + fastlane (2.211.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.31.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.9.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.16.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-playcustomapp_v1 (0.12.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.44.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.6.2) + jwt (2.5.0) + memoist (0.16.2) + mini_magick (4.11.0) + mini_mime (1.1.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.6.0) + public_suffix (5.0.0) + rake (13.0.6) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2-x64-mingw-ucrt) + unicode-display_width (1.8.0) + webrick (1.7.0) + word_wrap (1.0.0) + xcodeproj (1.22.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + x64-mingw-ucrt + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.3.26 diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml deleted file mode 100644 index 92f5ef3c..00000000 --- a/android/AndroidManifest.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/assets/License.txt b/android/assets/License.txt deleted file mode 100644 index ed2ae8aa..00000000 --- a/android/assets/License.txt +++ /dev/null @@ -1,4 +0,0 @@ -These PNG files are copyright to Emile Belanger. -They are permitted for use in SDLxash3D Android port, full copyright is owned by Emile Belanger. -Other use not permitted without permission from Emile Belanger. -emile.belanger@gmail.com \ No newline at end of file diff --git a/android/gen-config.sh b/android/gen-config.sh deleted file mode 100755 index 1294a3d0..00000000 --- a/android/gen-config.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -git update-index --assume-unchanged $XASH_CONFIG -PKG_TEST=false -CHECK_SIGNATURES=false -RELEASE=false -GP_VERSION=false -XASH_CONFIG=$1src/su/xash/engine/XashConfig.java -shift -case "$*" in -*test*) export PKG_TEST=true;; -esac -case "$*" in -*sign*) export CHECK_SIGNATURES=true; -esac -case "$*" in -*release*) export RELEASE=true;; -esac -case "$*" in -*gp*) export GP_VERSION=true;; -esac -_V="public static final boolean" -echo package su.xash.engine\; >$XASH_CONFIG -echo public class XashConfig { >>$XASH_CONFIG -echo $_V PKG_TEST = $PKG_TEST\; >>$XASH_CONFIG -echo $_V CHECK_SIGNATURES = $CHECK_SIGNATURES\; >>$XASH_CONFIG -echo $_V RELEASE = $RELEASE\; >>$XASH_CONFIG -echo $_V GP_VERSION = $GP_VERSION\; >>$XASH_CONFIG -echo } >>$XASH_CONFIG -cat $XASH_CONFIG diff --git a/android/gen-version.sh b/android/gen-version.sh deleted file mode 100755 index 59d44d17..00000000 --- a/android/gen-version.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -GIT_REV_XML=$1/res/values/git-rev.xml - -mkdir -p $(dirname $GIT_REV_XML) -git update-index --assume-unchanged $GIT_REV_XML - -echo '' > $GIT_REV_XML -echo '' >> $GIT_REV_XML -echo -n '' >> $GIT_REV_XML -echo -n 'Version information:\n' >> $GIT_REV_XML -git submodule --quiet foreach --recursive \ - 'echo -n \`basename $name`:\\ \ -`git log --abbrev-commit --pretty=oneline -1 | sed "s/\&/\&/g;s/>/\>/g;s/> $GIT_REV_XML -echo -n $USER@$(hostname) $(date +%H:%M:%S-%d-%m-%y) >> $GIT_REV_XML -echo '' >> $GIT_REV_XML -echo '' >> $GIT_REV_XML -cat $GIT_REV_XML diff --git a/android/res/drawable-anydpi-v26/ic_launcher.xml b/android/res/drawable-anydpi-v26/ic_launcher.xml deleted file mode 100644 index a418402f..00000000 --- a/android/res/drawable-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index c44c54c9..00000000 Binary files a/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_statusbar.png b/android/res/drawable-hdpi/ic_statusbar.png deleted file mode 100644 index eab8ef85..00000000 Binary files a/android/res/drawable-hdpi/ic_statusbar.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_statusbar.png b/android/res/drawable-mdpi/ic_statusbar.png deleted file mode 100644 index 99173cfd..00000000 Binary files a/android/res/drawable-mdpi/ic_statusbar.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 642fea13..00000000 Binary files a/android/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_statusbar.png b/android/res/drawable-xhdpi/ic_statusbar.png deleted file mode 100644 index a8020396..00000000 Binary files a/android/res/drawable-xhdpi/ic_statusbar.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 6558a319..00000000 Binary files a/android/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_statusbar.png b/android/res/drawable-xxhdpi/ic_statusbar.png deleted file mode 100644 index 54f94e30..00000000 Binary files a/android/res/drawable-xxhdpi/ic_statusbar.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/res/drawable-xxxhdpi/ic_launcher.png deleted file mode 100644 index 929bf516..00000000 Binary files a/android/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_statusbar.png b/android/res/drawable-xxxhdpi/ic_statusbar.png deleted file mode 100644 index df65c6aa..00000000 Binary files a/android/res/drawable-xxxhdpi/ic_statusbar.png and /dev/null differ diff --git a/android/res/drawable/circle_black.xml b/android/res/drawable/circle_black.xml deleted file mode 100644 index 0467bab8..00000000 --- a/android/res/drawable/circle_black.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/res/drawable/circle_white.xml b/android/res/drawable/circle_white.xml deleted file mode 100644 index aab6fa58..00000000 --- a/android/res/drawable/circle_white.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/res/drawable/empty.xml b/android/res/drawable/empty.xml deleted file mode 100644 index a60e6350..00000000 --- a/android/res/drawable/empty.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/android/res/drawable/folder.png b/android/res/drawable/folder.png deleted file mode 100644 index 36703b06..00000000 Binary files a/android/res/drawable/folder.png and /dev/null differ diff --git a/android/res/drawable/ic_launcher.png b/android/res/drawable/ic_launcher.png deleted file mode 100644 index f1b9bdc4..00000000 Binary files a/android/res/drawable/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable/ic_statusbar.png b/android/res/drawable/ic_statusbar.png deleted file mode 100644 index 99173cfd..00000000 Binary files a/android/res/drawable/ic_statusbar.png and /dev/null differ diff --git a/android/res/drawable/layout_sel_background.xml b/android/res/drawable/layout_sel_background.xml deleted file mode 100644 index 84714b27..00000000 --- a/android/res/drawable/layout_sel_background.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/android/res/drawable/page0.png b/android/res/drawable/page0.png deleted file mode 100644 index abf6b640..00000000 Binary files a/android/res/drawable/page0.png and /dev/null differ diff --git a/android/res/drawable/page1_en.png b/android/res/drawable/page1_en.png deleted file mode 100644 index a8a4e805..00000000 Binary files a/android/res/drawable/page1_en.png and /dev/null differ diff --git a/android/res/drawable/page2_en.png b/android/res/drawable/page2_en.png deleted file mode 100644 index acd1f60f..00000000 Binary files a/android/res/drawable/page2_en.png and /dev/null differ diff --git a/android/res/drawable/page3_en.png b/android/res/drawable/page3_en.png deleted file mode 100644 index 61b979d9..00000000 Binary files a/android/res/drawable/page3_en.png and /dev/null differ diff --git a/android/res/drawable/page4_en.png b/android/res/drawable/page4_en.png deleted file mode 100644 index de05798b..00000000 Binary files a/android/res/drawable/page4_en.png and /dev/null differ diff --git a/android/res/layout-v19/logo.xml b/android/res/layout-v19/logo.xml deleted file mode 100644 index 3c875863..00000000 --- a/android/res/layout-v19/logo.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml deleted file mode 100644 index 34a5b8f9..00000000 --- a/android/res/layout/about.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - -