teambeef/rtcwquest
0
0
Fork 0
mirror of https://github.com/DrBeef/RTCWQuest.git synced 2025-04-23 15:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Numerous changes for beta

Browse source 
- Weapon offsets from VR_Bummser
- Various cvar changes from VR_Bummser
- Updated weapon models
- refactored laser sight and disabled laser sight on scoped weapons

Co-Authored-By: Grant Bagwell <general@grantbagwell.co.uk>
This commit is contained in:
Simon 2020-08-11 16:42:09 +01:00
parent 75f8187d6c
commit 6acbecac92
8 changed files with 60 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.rtcwquest"
android:versionCode="29"
android:versionName="0.24.0" android:installLocation="auto" >
android:versionCode="30"
android:versionName="0.25.0" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>

2
Projects/Android/jni/RTCWVR/RTCWVR_SurfaceView.c
View file

@ -1294,7 +1294,7 @@ void RTCWVR_Init()
vr_reloadtimeoutms = Cvar_Get( "vr_reloadtimeoutms", "200", CVAR_ARCHIVE);
vr_positional_factor = Cvar_Get( "vr_positional_factor", "12", CVAR_ARCHIVE);
vr_walkdirection = Cvar_Get( "vr_walkdirection", "0", CVAR_ARCHIVE);
vr_movement_multiplier = Cvar_Get( "vr_movement_multiplier", "0.8", CVAR_ARCHIVE);
vr_movement_multiplier = Cvar_Get( "vr_movement_multiplier", "0.7", CVAR_ARCHIVE);
vr_weapon_pitchadjust = Cvar_Get( "vr_weapon_pitchadjust", "-20.0", CVAR_ARCHIVE);
vr_lasersight = Cvar_Get( "vr_lasersight", "0", CVAR_LATCH);
vr_teleport = Cvar_Get( "vr_teleport", "0", CVAR_ARCHIVE);

85
Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
View file

@ -3389,6 +3389,49 @@ void CG_AddPlayerFoot( refEntity_t *parent, playerState_t *ps, centity_t *cent )
}
void CG_LaserSight(const playerState_t *ps) {
if (trap_Cvar_VariableIntegerValue("vr_lasersight") != 0 &&
cgVR->backpackitemactive == 0 &&
cg.predictedPlayerState.stats[STAT_HEALTH] > 0 &&
!cgVR->screen &&
!cgVR->scopeengaged)
{
switch (ps->weapon)
{
case WP_KNIFE:
case WP_DYNAMITE:
case WP_GRENADE_LAUNCHER:
case WP_GRENADE_PINEAPPLE:
case WP_TESLA:
case WP_FLAMETHROWER:
case WP_FG42:
case WP_GARAND:
case WP_MAUSER:
break;
default:
{
vec3_t origin;
vec3_t endForward;
vec3_t angles;
clientInfo_t ci;
CG_CalculateVRWeaponPosition(0, origin, angles);
vec3_t forward, right, up;
AngleVectors(angles, forward, right, up);
trace_t trace;
VectorMA(origin, 8192, forward, endForward);
trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SOLID);
ci.health = 1;
ci.handicap = 128; // value out of 255 for alpha channel
VectorSet(ci.color, 1, 0, 0);
CG_RailTrail2(&ci, origin, trace.endpos);
}
}
}
}
/*
==============
CG_AddViewWeapon
@ -3587,47 +3630,7 @@ void CG_AddViewWeapon( playerState_t *ps ) {
CG_RailTrail2(&ci, origin, endUp);
}
if (trap_Cvar_VariableIntegerValue("vr_lasersight") != 0 &&
cgVR->backpackitemactive == 0 &&
cg.predictedPlayerState.stats[STAT_HEALTH] > 0 &&
!cgVR->screen &&
!cgVR->scopeengaged)
{
switch (ps->weapon)
{
case WP_KNIFE:
case WP_DYNAMITE:
case WP_GRENADE_LAUNCHER:
case WP_GRENADE_PINEAPPLE:
case WP_TESLA:
case WP_FLAMETHROWER:
//Not sure about these
//case WP_FG42:
//case WP_GARAND:
//case WP_MAUSER:
break;
default:
{
vec3_t origin;
vec3_t endForward;
vec3_t angles;
clientInfo_t ci;
CG_CalculateVRWeaponPosition(0, origin, angles);
vec3_t forward, right, up;
AngleVectors(angles, forward, right, up);
trace_t trace;
VectorMA(origin, 8192, forward, endForward);
trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SOLID);
ci.health = 1;
ci.handicap = 128; // value out of 255 for alpha channel
VectorSet(ci.color, 1, 0, 0);
CG_RailTrail2(&ci, origin, trace.endpos);
}
}
}
CG_LaserSight(ps);
cg.predictedPlayerEntity.lastWeaponClientFrame = cg.clientFrame;
}

2
Projects/Android/jni/rtcw/src/game/q_shared.h
View file

@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file
#define Q3_VERSION "RTCWQuest 0.24.0 (Wolf 1.41)"
#define Q3_VERSION "RTCWQuest 0.25.0 (Wolf 1.41)"
// ver 1.0.0 - release
// ver 1.0.1 - post-release work
// ver 1.1.0 - patch 1 (12/12/01)

2
Projects/Android/jni/rtcw/src/qcommon/common.c
View file

@ -1946,7 +1946,7 @@ void Com_SetRecommended( qboolean vidrestart ) {
Com_Printf( "Found minimum memory requirement\n" );
Cvar_Set( "s_khz", "11" );
if ( !goodVideo ) {
Cvar_Set( "r_lowMemTextureSize", "256" );
Cvar_Set( "r_lowMemTextureSize", "512" );
Cvar_Set( "r_lowMemTextureThreshold", "40.0" );
}
}

2
Projects/Android/jni/rtcw/src/renderer/tr_image.c
View file

@ -2540,7 +2540,7 @@ void R_SetColorMappings( void ) {
if ( r_intensity->value <= 1 ) {
ri.Cvar_Set( "r_intensity", "1" );
ri.Cvar_Set( "r_intensity", "1.25" );
}
if ( r_gamma->value < 0.5f ) {

8
Projects/Android/jni/rtcw/src/renderer/tr_init.c
View file

@ -1035,7 +1035,7 @@ void R_Register( void ) {
r_picmip = ri.Cvar_Get( "r_picmip", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_picmip2 = ri.Cvar_Get( "r_picmip2", "0", CVAR_ARCHIVE | CVAR_LATCH ); // used for character skins picmipping at a different level from the rest of the game
r_roundImagesDown = ri.Cvar_Get( "r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_lowMemTextureSize = ri.Cvar_Get( "r_lowMemTextureSize", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_lowMemTextureSize = ri.Cvar_Get( "r_lowMemTextureSize", "512", CVAR_ARCHIVE | CVAR_LATCH );
r_lowMemTextureThreshold = ri.Cvar_Get( "r_lowMemTextureThreshold", "15.0", CVAR_ARCHIVE | CVAR_LATCH );
r_rmse = ri.Cvar_Get( "r_rmse", "0.0", CVAR_ARCHIVE | CVAR_LATCH );
r_colorMipLevels = ri.Cvar_Get( "r_colorMipLevels", "0", CVAR_LATCH );
@ -1085,14 +1085,14 @@ void R_Register( void ) {
AssertCvarRange( r_displayRefresh, 0, 200, qtrue );
r_fullbright = ri.Cvar_Get( "r_fullbright", "0", CVAR_LATCH | CVAR_CHEAT );
r_mapOverBrightBits = ri.Cvar_Get( "r_mapOverBrightBits", "2", CVAR_LATCH );
r_intensity = ri.Cvar_Get( "r_intensity", "1", CVAR_LATCH );
r_intensity = ri.Cvar_Get( "r_intensity", "1.25", CVAR_LATCH );
r_singleShader = ri.Cvar_Get( "r_singleShader", "0", CVAR_CHEAT | CVAR_LATCH );
//
// archived variables that can change at any time
//
r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE );
r_lodbias = ri.Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE );
r_lodbias = ri.Cvar_Get( "r_lodbias", "-0.6", CVAR_ARCHIVE );
r_flares = ri.Cvar_Get( "r_flares", "1", CVAR_ARCHIVE );
r_znear = ri.Cvar_Get( "r_znear", "1.0", CVAR_CHEAT );
AssertCvarRange( r_znear, 0.001f, 200, qtrue );
@ -1109,7 +1109,7 @@ void R_Register( void ) {
r_finish = ri.Cvar_Get( "r_finish", "0", CVAR_ARCHIVE );
r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE );
r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE );
r_gamma = ri.Cvar_Get( "r_gamma", "1.07", CVAR_ARCHIVE );
r_gamma = ri.Cvar_Get( "r_gamma", "1.0", CVAR_ARCHIVE );
r_facePlaneCull = ri.Cvar_Get( "r_facePlaneCull", "1", CVAR_ARCHIVE );
r_railWidth = ri.Cvar_Get( "r_railWidth", "16", CVAR_ARCHIVE );

11
assets/weapons_vr.cfg
View file

@ -33,13 +33,14 @@
// 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 "0.42,-8.71,11.90,-20.71,-4.70,-4.40,0.00"
seta vr_weapon_adjustment_11 "0.42,-9.33,12.81,-23.33,0.60,-1.60,0.00"
seta vr_weapon_adjustment_3 "0.64,-8.12,9.66,-10.56,-2.30,-0.40,3.40"
seta vr_weapon_adjustment_12 "0.83,-7.59,9.76,-11.67,-2.50,-0.00,0.80"
seta vr_weapon_adjustment_18 "0.48,-7.71,12.42,-5.29,-5.90,1.10,-1.90"
seta vr_weapon_adjustment_1 "0.55,-4.89,8.12,-12.36,-28.60,10.80,-199.50"
seta vr_weapon_adjustment_2 "0.60,-9.30,10.60,-19.14,-4.80,-4.40,0.00"
seta vr_weapon_adjustment_3 "0.65,-8.24,5.51,-8.14,-4.00,0.40,3.40"
seta vr_weapon_adjustment_6 "0.60,-10.77,17.57,-21.73,0.00,1.60,0.00"
seta vr_weapon_adjustment_11 "0.57,-9.54,10.71,-22.90,1.70,-1.40,0.00"
seta vr_weapon_adjustment_12 "0.75,-7.63,7.41,-11.84,-2.80,0.00,0.00"
seta vr_weapon_adjustment_18 "0.50,-8.32,10.40,-4.28,-4.90,0.80,0.00"
seta vr_weapon_adjustment_7 "1.04,-5.51,6.65,-7.55,0.00,0.00,0.00"
seta vr_weapon_adjustment_9 "0.70,-5.01,6.81,13.25,0.00,0.00,0.00"
seta vr_weapon_adjustment_10 "0.75,-8.45,5.91,-11.39,0.00,0.00,0.00"