From 38147dd7f2b503d13b5017aa8a25f46ad1c18d95 Mon Sep 17 00:00:00 2001 From: kote2345 Date: Tue, 12 Jul 2022 22:42:23 +0400 Subject: [PATCH 1/7] Add submodules --- .gitmodules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitmodules b/.gitmodules index 311813a..a31ac13 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,9 @@ [submodule "Projects/Android/jni/src/hlsdk-xash3d-opfor"] path = Projects/Android/jni/src/hlsdk-xash3d-opfor url = https://github.com/DrBeef/hlsdk-xash3d-opfor +[submodule "Projects/Android/jni/src/hlsdk-xash3d_aomdc"] + path = Projects/Android/jni/src/hlsdk-xash3d_aomdc + url = https://github.com/kote2345/hlsdk-xash3d_aomdc +[submodule "Projects/Android/jni/src/hlsdk-xash3d_theyhunger"] + path = Projects/Android/jni/src/hlsdk-xash3d_theyhunger + url = https://github.com/kote2345/hlsdk-xash3d_theyhunger From d77216d94d8120fa34ac650b26560c457e570eac Mon Sep 17 00:00:00 2001 From: kote2345 Date: Tue, 12 Jul 2022 22:59:42 +0400 Subject: [PATCH 2/7] Add submodules --- .gitmodules | 1 + Projects/Android/jni/src/hlsdk-xash3d_aomdc | 1 + Projects/Android/jni/src/hlsdk-xash3d_theyhunger | 1 + hlsdk-xash3d_aomdc | 1 + 4 files changed, 4 insertions(+) create mode 160000 Projects/Android/jni/src/hlsdk-xash3d_aomdc create mode 160000 Projects/Android/jni/src/hlsdk-xash3d_theyhunger create mode 160000 hlsdk-xash3d_aomdc diff --git a/.gitmodules b/.gitmodules index a31ac13..f536e68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,6 +5,7 @@ [submodule "Projects/Android/jni/src/hlsdk-xash3d-opfor"] path = Projects/Android/jni/src/hlsdk-xash3d-opfor url = https://github.com/DrBeef/hlsdk-xash3d-opfor + [submodule "Projects/Android/jni/src/hlsdk-xash3d_aomdc"] path = Projects/Android/jni/src/hlsdk-xash3d_aomdc url = https://github.com/kote2345/hlsdk-xash3d_aomdc diff --git a/Projects/Android/jni/src/hlsdk-xash3d_aomdc b/Projects/Android/jni/src/hlsdk-xash3d_aomdc new file mode 160000 index 0000000..54a0eee --- /dev/null +++ b/Projects/Android/jni/src/hlsdk-xash3d_aomdc @@ -0,0 +1 @@ +Subproject commit 54a0eee761a4dec5aec20278b5ec0d1f2dbf4c8c diff --git a/Projects/Android/jni/src/hlsdk-xash3d_theyhunger b/Projects/Android/jni/src/hlsdk-xash3d_theyhunger new file mode 160000 index 0000000..90ab0f9 --- /dev/null +++ b/Projects/Android/jni/src/hlsdk-xash3d_theyhunger @@ -0,0 +1 @@ +Subproject commit 90ab0f9bf2d02d58934b9cb01d0469e91b95e971 diff --git a/hlsdk-xash3d_aomdc b/hlsdk-xash3d_aomdc new file mode 160000 index 0000000..54a0eee --- /dev/null +++ b/hlsdk-xash3d_aomdc @@ -0,0 +1 @@ +Subproject commit 54a0eee761a4dec5aec20278b5ec0d1f2dbf4c8c From 45a54b296b5a66df74f895cbd1e56b693114b136 Mon Sep 17 00:00:00 2001 From: kote2345 Date: Tue, 12 Jul 2022 23:00:52 +0400 Subject: [PATCH 3/7] Delete hlsdk-xash3d_aomdc --- hlsdk-xash3d_aomdc | 1 - 1 file changed, 1 deletion(-) delete mode 160000 hlsdk-xash3d_aomdc diff --git a/hlsdk-xash3d_aomdc b/hlsdk-xash3d_aomdc deleted file mode 160000 index 54a0eee..0000000 --- a/hlsdk-xash3d_aomdc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 54a0eee761a4dec5aec20278b5ec0d1f2dbf4c8c From 828a97a822fec40dcd07ebb6c16b524c034ac085 Mon Sep 17 00:00:00 2001 From: kote2345 Date: Thu, 4 Aug 2022 22:27:37 +0400 Subject: [PATCH 4/7] Support They Hunger and Afraid of Monsters Director's Cut --- Projects/Android/jni/Application.mk | 2 +- .../drbeef/lambda1vr/GLES3JNIActivity.java | 63 ++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/Projects/Android/jni/Application.mk b/Projects/Android/jni/Application.mk index 51f5f11..8e03e58 100644 --- a/Projects/Android/jni/Application.mk +++ b/Projects/Android/jni/Application.mk @@ -30,7 +30,7 @@ HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ # step will error as we currently remove prebuilt artifacts on clean. APP_ALLOW_MISSING_DEPS=true -APP_MODULES := gl4es xash menu client server client_opfor server_opfor +APP_MODULES := gl4es xash menu client server client_opfor server_opfor client_aomdc server_aomdc client_theyhunger server_theyhunger APP_STL := c++_shared diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java index 05ab44a..1085155 100644 --- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java +++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java @@ -193,7 +193,7 @@ import static android.system.Os.setenv; copy_asset("/sdcard/xash/valve/", "sprites/pointer.tga", true); //Copy modified weapon models - This is the base set - if (!(new File("/sdcard/xash/" + game + "/models/no_copy").exists())) + if (!(new File("/sdcard/xash/" + game + "/models/no_copy").exists()) && !(game.equalsIgnoreCase("Hunger"))) { //Colt (A-16) copy_asset("/sdcard/xash/" + game + "/", "models/v_9mmar.mdl", true); @@ -417,6 +417,59 @@ import static android.system.Os.setenv; { copy_asset("/sdcard/xash/", "bshift/models/v_hand.mdl", true); } + + //Copy They Hunger specific models + if (game.equalsIgnoreCase("Hunger") && + !(new File("/sdcard/xash/" + game + "/models/no_copy").exists())) + { + //HL1 models + copy_asset("/sdcard/xash/" + game + "/", "/models/v_rpg.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_357.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_grenade.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_satchel.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_satchel_radio.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_tripmine.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_crossbow.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_gauss.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_squeak.mdl", true); + + //They Hunger models + copy_asset("/sdcard/xash/", "Hunger/models/v_9mmar.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_9mmhandgun.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_ap9.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_egon.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_hkg36.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_shotgun.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_shovel.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_taurus.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfac.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfc_medkit.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfc_sniper.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfc_spanner.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tnt.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_hand.mdl", true); + } + + //Copy Afraid of Monsters Director's Cut specific models + if (game.equalsIgnoreCase("AoMDC") && + !(new File("/sdcard/xash/" + game + "/models/no_copy").exists())) + { + //Afraid of Monsters Director's Cut models + copy_asset("/sdcard/xash/", "AoMDC/models/v_axe.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_beretta.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_deagle.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_glock.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_hammer.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_hand.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_kitchenknife.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_mp5k.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_p228.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_revolver.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_shotgun.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_spear.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_torch.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_uzi.mdl", true); + } //Set default environment try { @@ -434,6 +487,14 @@ import static android.system.Os.setenv; //Use pipewrench as backpack weapon in opposing force setenv("VR_BACKPACK_WEAPON", "weapon_pipewrench", true); } + else if (game.equalsIgnoreCase("aomdc")) + { + setenv("XASH3D_LIBSUFFIX", "_aomdc", true); + } + else if (game.equalsIgnoreCase("hunger")) + { + setenv("XASH3D_LIBSUFFIX", "_theyhunger", true); + } else { setenv("XASH3D_LIBSUFFIX", "", true); From 8de93c24301e6b33317da8d53b702491258dd7e1 Mon Sep 17 00:00:00 2001 From: kote2345 Date: Thu, 4 Aug 2022 23:45:54 +0400 Subject: [PATCH 5/7] Update submodules --- Projects/Android/jni/src/hlsdk-xash3d_aomdc | 2 +- Projects/Android/jni/src/hlsdk-xash3d_theyhunger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/Android/jni/src/hlsdk-xash3d_aomdc b/Projects/Android/jni/src/hlsdk-xash3d_aomdc index 54a0eee..3dd188b 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d_aomdc +++ b/Projects/Android/jni/src/hlsdk-xash3d_aomdc @@ -1 +1 @@ -Subproject commit 54a0eee761a4dec5aec20278b5ec0d1f2dbf4c8c +Subproject commit 3dd188b29f75fab6adad2b42e6eceba861177fe1 diff --git a/Projects/Android/jni/src/hlsdk-xash3d_theyhunger b/Projects/Android/jni/src/hlsdk-xash3d_theyhunger index 90ab0f9..beaa8bd 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d_theyhunger +++ b/Projects/Android/jni/src/hlsdk-xash3d_theyhunger @@ -1 +1 @@ -Subproject commit 90ab0f9bf2d02d58934b9cb01d0469e91b95e971 +Subproject commit beaa8bdaf3414968343c5273acf607cc32f92f14 From efff6b76c137fec87b7b396372f61823b1051cbd Mon Sep 17 00:00:00 2001 From: kote2345 Date: Sat, 6 Aug 2022 00:08:03 +0400 Subject: [PATCH 6/7] Add model gmgeneral --- java/com/drbeef/lambda1vr/GLES3JNIActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java index 1085155..5294282 100644 --- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java +++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java @@ -425,7 +425,6 @@ import static android.system.Os.setenv; //HL1 models copy_asset("/sdcard/xash/" + game + "/", "/models/v_rpg.mdl", true); copy_asset("/sdcard/xash/" + game + "/", "/models/v_357.mdl", true); - copy_asset("/sdcard/xash/" + game + "/", "/models/v_grenade.mdl", true); copy_asset("/sdcard/xash/" + game + "/", "/models/v_satchel.mdl", true); copy_asset("/sdcard/xash/" + game + "/", "/models/v_satchel_radio.mdl", true); copy_asset("/sdcard/xash/" + game + "/", "/models/v_tripmine.mdl", true); @@ -469,6 +468,7 @@ import static android.system.Os.setenv; copy_asset("/sdcard/xash/", "AoMDC/models/v_spear.mdl", true); copy_asset("/sdcard/xash/", "AoMDC/models/v_torch.mdl", true); copy_asset("/sdcard/xash/", "AoMDC/models/v_uzi.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/gmgeneral_display.aomdc", true); } //Set default environment From eb3c9a7585aba42a9ef3aeb3cf8d96c9ded1afc6 Mon Sep 17 00:00:00 2001 From: kote2345 Date: Sat, 6 Aug 2022 00:10:14 +0400 Subject: [PATCH 7/7] Update submodule --- Projects/Android/jni/src/hlsdk-xash3d_aomdc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Android/jni/src/hlsdk-xash3d_aomdc b/Projects/Android/jni/src/hlsdk-xash3d_aomdc index 3dd188b..64b4f7c 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d_aomdc +++ b/Projects/Android/jni/src/hlsdk-xash3d_aomdc @@ -1 +1 @@ -Subproject commit 3dd188b29f75fab6adad2b42e6eceba861177fe1 +Subproject commit 64b4f7c46d0d476828fe12e93e9be23436c92b12