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

Demo specific changes

Browse source
This commit is contained in:
Simon 2022-10-09 11:36:44 +01:00
parent 822c83365a
commit c40ea76933
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -47,3 +47,5 @@ assets/assets0.pk3
assets/GGDynamicWeapons.pk3
assets/Haps_Stormtrooper.pk3
assets/Kyle's_lightsaber_hilt_hd.pk3
assets/UltimateSounds_JK2.pk3
assets/z_bryar_ashura.pk3

5
Projects/Android/jni/OpenJK/code/client/cl_cin.cpp
View file

@ -1883,12 +1883,15 @@ static void PlayCinematic(const char *arg, const char *s, qboolean qbInGame)
{
psAudioFile = "music/cinematic_1";
#ifdef JK2_MODE
hCrawl = re.RegisterShaderNoMip( va("menu/video/tc_%d", sp_language->integer) );
hCrawl = re.RegisterShaderNoMip( "menu/video/tc_demo" );
/* hCrawl = re.RegisterShaderNoMip( va("menu/video/tc_%d", sp_language->integer) );
if(!hCrawl)
{
// failed, so go back to english
hCrawl = re.RegisterShaderNoMip( "menu/video/tc_0" );
}
*/
#else
hCrawl = re.RegisterShaderNoMip( va("menu/video/tc_%s",se_language->string) );
if (!hCrawl)

BIN
assets/vr_splash.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 69 KiB

17
assets/weapons_vr_ja.cfg
View file

@ -1,17 +0,0 @@
// Weapon offsets - This is the default for the weapon models
// put the weapon id at the end of the cvar name, so the knife is vr_weapon_adjustment_1
// Values are: scale,right,up,forward,pitch,yaw,roll
seta vr_weapon_adjustment_2 "1.0,-3.5,7.4,-12.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_3 "1.0,-3.5,7.4,-10.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_4 "1.0,-3.5,7.4,-6.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_5 "1.500,-2.747,5.707,-7.827,1.800,0.000,0.000"
seta vr_weapon_adjustment_6 "1.0,-3.5,7.0,-8.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_7 "1.0,-5.0,7.5,-10.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_8 "1.0,-5.0,8.0,-10.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_13 "1.5,-5.0,8.0,-10.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_9 "1.5,-4.0,7.5,-10.0,0.0,0.0,0.0"
seta vr_weapon_adjustment_10 "1.7,-4.5,8.0,-15.4,0.0,0.0,0.0"
seta vr_weapon_adjustment_11 "1.0,-6.0,6.0,-10.0,20.0,0.0,0.0"
seta vr_weapon_adjustment_12 "1.5,-5.0,7.0,-11.0,30.0,6.3,-12.0"

16
java/com/drbeef/jkquest/GLES3JNIActivity.java
View file

@ -169,16 +169,28 @@ import static android.system.Os.setenv;
//clear the contents of the base folder
for (File child : new File("/sdcard/JKQuest/Demo/base").listFiles()) {
if (child.isFile() && child.getName().contains("pk3"))
if (child.isFile() &&
child.getName().contains("pk3") &&
!child.getName().contains("z_npc_vr") // don't delete our npc mod as this might be tweaked
)
child.delete();
}
//Copy the command line params file
//Weapon offsets
copy_asset("/sdcard/JKQuest/Demo/base", "weapons_vr_jo.cfg", true);
//Demo
copy_asset("/sdcard/JKQuest/Demo/base", "assets0.pk3", false);
//Bunch of cool mods just for this
copy_asset("/sdcard/JKQuest/Demo/base", "GGDynamicWeapons.pk3", false);
copy_asset("/sdcard/JKQuest/Demo/base", "Haps_Stormtrooper.pk3", false);
copy_asset("/sdcard/JKQuest/Demo/base", "Kyle's_lightsaber_hilt_hd.pk3", false);
copy_asset("/sdcard/JKQuest/Demo/base", "UltimateSounds_JK2.pk3", false);
copy_asset("/sdcard/JKQuest/Demo/base", "z_bryar_ashura.pk3", false);
//Bummser's NPC tweaks
copy_asset("/sdcard/JKQuest/Demo/base", "z_npc_vr.pk3", false);
commandLineParams = "jo";