diff --git a/.gitignore b/.gitignore index c80d889..6cca4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml build/intermediates/lint-cache/maven.google/master-index.xml build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml assets/AoMDC/models/gmgeneral_display.aomdc +/assets/background diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml index 18acd47..4e8dde7 100644 --- a/Projects/Android/AndroidManifest.xml +++ b/Projects/Android/AndroidManifest.xml @@ -2,8 +2,8 @@ diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c index ffaafb9..1771e96 100644 --- a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c +++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c @@ -139,7 +139,7 @@ Q_buildcommit will identify this build as release or "notset" */ const char *Q_buildcommit( void ) { - return "Lambda1VR-v1.7.2"; + return "Lambda1VR-v1.7.3"; } /* diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java index ec6f602..74c8998 100644 --- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java +++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java @@ -173,6 +173,21 @@ import static android.system.Os.setenv; copy_asset("/sdcard/xash/" + game + "/", "sprites/pointer.tga", true); copy_asset("/sdcard/xash/valve/", "sprites/pointer.tga", true); + //Menu Background + copy_asset("/sdcard/xash/valve/resource/", "background/800_1_a_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_1_b_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_1_c_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_1_d_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_2_a_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_2_b_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_2_c_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_2_d_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_3_a_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_3_b_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_3_c_loading.tga", true); + copy_asset("/sdcard/xash/valve/resource/", "background/800_3_d_loading.tga", true); + + //Copy modified weapon models - This is the base set if (!(new File("/sdcard/xash/" + game + "/models/no_copy").exists()) && !(game.equalsIgnoreCase("Hunger"))) {