diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp index 64c957a..8120954 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp @@ -4808,8 +4808,11 @@ Ghoul2 Insert End VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]); VectorCopy(axis[1], hiltEnt.axis[1]); VectorCopy(axis[0], hiltEnt.axis[2]); - VectorMA(hiltEnt.origin, 1.0f, hiltEnt.axis[2], hiltEnt.origin); + VectorMA(hiltEnt.origin, 1.2f, hiltEnt.axis[2], hiltEnt.origin); VectorCopy(hiltEnt.origin, hiltEnt.oldorigin); + for (auto & axi : hiltEnt.axis) + VectorScale(axi, 0.7f, axi); + cgi_R_AddRefEntityToScene(&hiltEnt); } @@ -6102,11 +6105,11 @@ Ghoul2 Insert End VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]); VectorCopy(axis[1], hiltEnt.axis[1]); VectorCopy(axis[0], hiltEnt.axis[2]); - VectorMA(hiltEnt.origin, 1.0f, hiltEnt.axis[2], hiltEnt.origin); + VectorMA(hiltEnt.origin, 1.2f, hiltEnt.axis[2], hiltEnt.origin); VectorCopy(hiltEnt.origin, hiltEnt.oldorigin); for (auto & axi : hiltEnt.axis) - VectorScale(axi, 0.85f, axi); + VectorScale(axi, 0.7f, axi); cgi_R_AddRefEntityToScene(&hiltEnt); diff --git a/assets/Kyle's_lightsaber_hilt_hd.pk3 b/assets/Kyle's_lightsaber_hilt_hd.pk3 deleted file mode 100644 index 35b83bf..0000000 Binary files a/assets/Kyle's_lightsaber_hilt_hd.pk3 and /dev/null differ diff --git a/assets/packaged_mods_credits.txt b/assets/packaged_mods_credits.txt index 04cedd3..8122959 100644 --- a/assets/packaged_mods_credits.txt +++ b/assets/packaged_mods_credits.txt @@ -1,6 +1,24 @@ The following excellent mods were included in the apk: + +============================================================================================================================= + + +TITLE: Vince Crusty and Elin's VR Fully Modeled Weapons Pack +AUTHORS: Elin and Vince Crusty +FILE NAME: z_Crusty_and_Elin_vr_weapons.pk3 +FILE SIZE: 1.0 MB +DATE RELEASED: 21 MAR 2023 + +DESCRIPTION: This mod replaces all the Jedi Outcast weapons with fully modeled weapons for use in VR + +THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS. + + +============================================================================================================================= + + Author: Grab @@ -20,38 +38,3 @@ Copyright: Grab - - -============================================================================================================================= - - -TITLE: KYLE'S LIGHTSABER HILT HD -AUTHORS: CPT. BROSKI / PUNISHER -FILE NAME: kyle's_lightsaber_hilt_hd.pk3 -FILE SIZE: 1.6 MB -DATE RELEASED: 21 JULY 2021 - -DESCRIPTION: This mod replaces Kyle's original lightsaber with a new model. -The model is based entirely on the in-game model, but it uses better shaders to shine. -INSTALL: Put the hilt_lightsaber_kyle's_hd.pk3 to your Jedi Outcast\GameData\base folder. -UNINSTALL: Remove the hilt_lightsaber_kyle's_hd.pk3 from your Jedi Outcast\GameData\base folder. -BUGS: none - -THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS. - - - - -============================================================================================================================= - - -TITLE: Vince Crusty and Elin's VR Fully Modeled Weapons Pack -AUTHORS: Elin and Vince Crusty -FILE NAME: z_Crusty_and_Elin_vr_weapons.pk3 -FILE SIZE: 1.0 MB -DATE RELEASED: 21 MAR 2023 - -DESCRIPTION: This mod replaces all the Jedi Outcast weapons with fully modeled weapons for use in VR - -THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS. - diff --git a/assets/z_Crusty_and_Elin_vr_weapons.pk3 b/assets/z_Crusty_and_Elin_vr_weapons.pk3 index 5114d91..fa793a7 100644 Binary files a/assets/z_Crusty_and_Elin_vr_weapons.pk3 and b/assets/z_Crusty_and_Elin_vr_weapons.pk3 differ diff --git a/java/com/drbeef/jkxr/GLES3JNIActivity.java b/java/com/drbeef/jkxr/GLES3JNIActivity.java index ddb0d44..a868cf1 100644 --- a/java/com/drbeef/jkxr/GLES3JNIActivity.java +++ b/java/com/drbeef/jkxr/GLES3JNIActivity.java @@ -215,10 +215,9 @@ import java.util.Vector; if (!new File("/sdcard/JKXR/JK2/base/no_copy").exists()) { copy_asset("/sdcard/JKXR/JK2/base", "packaged_mods_credits.txt", false); copy_asset("/sdcard/JKXR/JK2/base", "GGDynamicWeapons.pk3", false); - copy_asset("/sdcard/JKXR/JK2/base", "Kyle's_lightsaber_hilt_hd.pk3", false); //Weapon Models - copy_asset("/sdcard/JKXR/JK2/base", "z_Crusty_and_Elin_vr_weapons.pk3", false); + copy_asset("/sdcard/JKXR/JK2/base", "z_Crusty_and_Elin_vr_weapons.pk3", true); } //Copy mods to the demo folder if it exists, since the demo doesn't seem to be able to load mods from base @@ -228,15 +227,15 @@ import java.util.Vector; copy_asset("/sdcard/JKXR/JK2/jk2demo", "weapons_vr_jo.cfg", true); //Our assets - copy_asset("/sdcard/JKXR/JK2/jk2demo", "z_vr_assets.pk3", true); + copy_asset("/sdcard/JKXR/JK2/jk2demo", "z_vr_assets_base.pk3", true); + copy_asset("/sdcard/JKXR/JK2/jk2demo", "z_vr_assets_jko.pk3", true); //Bunch of cool mods and their credits - only copy if user wants them copy_asset("/sdcard/JKXR/JK2/jk2demo", "packaged_mods_credits.txt", false); copy_asset("/sdcard/JKXR/JK2/jk2demo", "GGDynamicWeapons.pk3", false); - copy_asset("/sdcard/JKXR/JK2/jk2demo", "Kyle's_lightsaber_hilt_hd.pk3", false); //Weapon Models - copy_asset("/sdcard/JKXR/JK2/jk2demo", "z_Crusty_and_Elin_vr_weapons.pk3", false); + copy_asset("/sdcard/JKXR/JK2/jk2demo", "z_Crusty_and_Elin_vr_weapons.pk3", true); } //Read these from a file and pass through