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

Merge remote-tracking branch 'origin/main' into contributions

Browse source
This commit is contained in:
Petr Bartos 2023-04-14 22:23:24 +02:00
commit 48c2486aad
7 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
View file

@ -297,7 +297,7 @@ void VR_Init()
vr_immersive_cinematics = Cvar_Get("vr_immersive_cinematics", "1", CVAR_ARCHIVE);
vr_screen_dist = Cvar_Get( "vr_screen_dist", "3.5", CVAR_ARCHIVE);
vr_weapon_velocity_trigger = Cvar_Get( "vr_weapon_velocity_trigger", "2.0", CVAR_ARCHIVE);
vr_force_velocity_trigger = Cvar_Get( "vr_force_velocity_trigger", "2.0", CVAR_ARCHIVE);
vr_force_velocity_trigger = Cvar_Get( "vr_force_velocity_trigger", "2.09", CVAR_ARCHIVE);
vr_force_distance_trigger = Cvar_Get( "vr_force_distance_trigger", "0.15", CVAR_ARCHIVE);
vr_two_handed_weapons = Cvar_Get ("vr_two_handed_weapons", "1", CVAR_ARCHIVE);
vr_force_motion_controlled = Cvar_Get ("vr_force_motion_controlled", "1", CVAR_ARCHIVE);

2
Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp
View file

@ -416,7 +416,7 @@ static cvarTable_t cvarTable[] = {
{ &cg_drawSnapshot, "cg_drawSnapshot", "0", CVAR_ARCHIVE },
{ &cg_drawAmmoWarning, "cg_drawAmmoWarning", "1", CVAR_ARCHIVE },
{ &cg_drawCrosshair, "cg_drawCrosshair", "4", CVAR_ARCHIVE },
{ &cg_drawCrosshairForce, "cg_drawCrosshairForce", "4", CVAR_ARCHIVE },
{ &cg_drawCrosshairForce, "cg_drawCrosshairForce", "9", CVAR_ARCHIVE },
{ &cg_dynamicCrosshair, "cg_dynamicCrosshair", "1", CVAR_ARCHIVE },
// NOTE : I also create this in UI_Init()
{ &cg_crosshairIdentifyTarget, "cg_crosshairIdentifyTarget", "1", CVAR_ARCHIVE },

21
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
View file

@ -1952,9 +1952,24 @@ static void CG_DrawCrosshair3D(int type) // 0 - force, 1 - weapons
ent.radius = w / 640 * xmax * trace.fraction * 2048 / 64.0f;
ent.customShader = hShader;
ent.shaderRGBA[0] = (type == 0 && !cg_forceCrosshair) ? 0 : 255;
ent.shaderRGBA[1] = (type == 0) ? 0 : 255;
ent.shaderRGBA[2] = 255;
if(type == 0 && !cg_forceCrosshair) //Not Active Force Crosshair
{
ent.shaderRGBA[0] = 255;
ent.shaderRGBA[1] = 180;
ent.shaderRGBA[2] = 180;
}
else if(type == 0) //Active Force Crosshair
{
ent.shaderRGBA[0] = 255;
ent.shaderRGBA[1] = 90;
ent.shaderRGBA[2] = 90;
}
else //Regular Crosshair
{
ent.shaderRGBA[0] = 255;
ent.shaderRGBA[1] = 255;
ent.shaderRGBA[2] = 255;
}
ent.shaderRGBA[3] = 255;
cgi_R_AddRefEntityToScene(&ent);

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp
View file

@ -399,7 +399,7 @@ static cvarTable_t cvarTable[] = {
{ &cg_drawSnapshot, "cg_drawSnapshot", "0", CVAR_ARCHIVE },
{ &cg_drawAmmoWarning, "cg_drawAmmoWarning", "1", CVAR_ARCHIVE },
{ &cg_drawCrosshair, "cg_drawCrosshair", "4", CVAR_ARCHIVE },
{ &cg_drawCrosshairForce, "cg_drawCrosshairForce", "4", CVAR_ARCHIVE },
{ &cg_drawCrosshairForce, "cg_drawCrosshairForce", "9", CVAR_ARCHIVE },
{ &cg_dynamicCrosshair, "cg_dynamicCrosshair", "1", CVAR_ARCHIVE },
{ &cg_crosshairIdentifyTarget, "cg_crosshairIdentifyTarget", "1", CVAR_ARCHIVE },
{ &cg_crosshairForceHint, "cg_crosshairForceHint", "1", CVAR_ARCHIVE|CVAR_SAVEGAME|CVAR_NORESTART },

2
Projects/Android/jni/OpenJK/codeJK2/game/g_combat.cpp
View file

@ -4995,7 +4995,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, vec3_
knockback = 0;
}
// figure momentum add, even if the damage won't be taken
if ( knockback && (!(dflags&DAMAGE_DEATH_KNOCKBACK) || g_TeamBeefDirectorsCut->integer == 1)) //&& targ->client
if ( knockback && (!(dflags&DAMAGE_DEATH_KNOCKBACK) || (g_TeamBeefDirectorsCut->integer == 1 && targ->s.number != 0))) //&& targ->client //GB not the player
{
G_ApplyKnockback( targ, newDir, knockback );
G_CheckKnockdown( targ, attacker, newDir, dflags, mod );

2
z_vr_assets_jko/ui/ingamesetup.menu
View file

@ -1673,7 +1673,7 @@
group video2
type ITEM_TYPE_SLIDER
text @MENUS0_VIDEO_BRIGHTNESS
cvarfloat "r_gamma" 0 0.8 1.2
cvarfloat "r_gamma" 1.15 0.8 1.5
rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 120

2
z_vr_assets_jko/ui/setup.menu
View file

@ -1774,7 +1774,7 @@
group video2
type ITEM_TYPE_SLIDER
text @MENUS0_VIDEO_BRIGHTNESS
cvarfloat "r_gamma" 0 0.8 1.2
cvarfloat "r_gamma" 1.15 0.8 1.5
rect 305 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 120