teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-10 06:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to the VC+Elin weapons pack

Browse source 
includes a sweet new saber hilt
This commit is contained in:
Simon 2023-03-30 21:44:36 +01:00
parent c4cc218f8b
commit 9877859676
6 changed files with 29 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp
View file

@ -4808,8 +4808,11 @@ Ghoul2 Insert End
VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]); VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]);
VectorCopy(axis[1], hiltEnt.axis[1]); VectorCopy(axis[1], hiltEnt.axis[1]);
VectorCopy(axis[0], hiltEnt.axis[2]); 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); VectorCopy(hiltEnt.origin, hiltEnt.oldorigin);
for (auto & axi : hiltEnt.axis)
VectorScale(axi, 0.7f, axi);
cgi_R_AddRefEntityToScene(&hiltEnt); cgi_R_AddRefEntityToScene(&hiltEnt);
} }
@ -6102,11 +6105,11 @@ Ghoul2 Insert End
VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]); VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]);
VectorCopy(axis[1], hiltEnt.axis[1]); VectorCopy(axis[1], hiltEnt.axis[1]);
VectorCopy(axis[0], hiltEnt.axis[2]); 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); VectorCopy(hiltEnt.origin, hiltEnt.oldorigin);
for (auto & axi : hiltEnt.axis) for (auto & axi : hiltEnt.axis)
VectorScale(axi, 0.85f, axi); VectorScale(axi, 0.7f, axi);
cgi_R_AddRefEntityToScene(&hiltEnt); cgi_R_AddRefEntityToScene(&hiltEnt);

BIN
assets/Kyle's_lightsaber_hilt_hd.pk3
View file

Binary file not shown.

53
assets/packaged_mods_credits.txt
View file

@ -1,6 +1,24 @@
The following excellent mods were included in the apk: 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: Author:
Grab Grab
@ -20,38 +38,3 @@ Copyright:
Grab 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.

BIN
assets/z_Crusty_and_Elin_vr_weapons.pk3
View file

Binary file not shown.

BIN
assets/z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3 Normal file
View file

Binary file not shown.

11
java/com/drbeef/jkxr/GLES3JNIActivity.java
View file

@ -242,16 +242,15 @@ import java.util.Vector;
if (!new File("/sdcard/JKXR/JK2/base/no_copy").exists()) { 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", "packaged_mods_credits.txt", false);
copy_asset("/sdcard/JKXR/JK2/base", "GGDynamicWeapons.pk3", 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 //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);
} }
//Bunch of cool mods and their credits - only copy if user wants them //Bunch of cool mods and their credits - only copy if user wants them
if (!new File("/sdcard/JKXR/JK3/base/no_copy").exists()) { if (!new File("/sdcard/JKXR/JK3/base/no_copy").exists()) {
//Weapon Models //Weapon Models
copy_asset("/sdcard/JKXR/JK3/base", "z_Crusty_and_Elin_vr_weapons.pk3", false); copy_asset("/sdcard/JKXR/JK3/base", "z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3", true);
} }
//Copy mods to the demo folder if demo assets exist, since the demo doesn't seem to be able to load mods from base //Copy mods to the demo folder if demo assets exist, since the demo doesn't seem to be able to load mods from base
@ -261,15 +260,15 @@ import java.util.Vector;
copy_asset("/sdcard/JKXR/JK2/jk2demo", "weapons_vr_jo.cfg", true); copy_asset("/sdcard/JKXR/JK2/jk2demo", "weapons_vr_jo.cfg", true);
//Our assets //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 //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", "packaged_mods_credits.txt", false);
copy_asset("/sdcard/JKXR/JK2/jk2demo", "GGDynamicWeapons.pk3", 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 //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 //Read these from a file and pass through