diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml index 55fb0f2..1681626 100644 --- a/Projects/Android/AndroidManifest.xml +++ b/Projects/Android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="21" + android:versionName="0.20.0" android:installLocation="auto" > diff --git a/Projects/Android/jni/rtcw/src/cgame/cg_draw.c b/Projects/Android/jni/rtcw/src/cgame/cg_draw.c index 9e27fe9..1c4d110 100644 --- a/Projects/Android/jni/rtcw/src/cgame/cg_draw.c +++ b/Projects/Android/jni/rtcw/src/cgame/cg_draw.c @@ -3603,7 +3603,7 @@ void CG_Teleport() { trace_t trace; VectorMA(origin, 256, forward, endForward); - trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SOLID); + trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SHOT); ci.health = 1; ci.handicap = 128; // value out of 255 for alpha channel diff --git a/Projects/Android/jni/rtcw/src/cgame/cg_main.c b/Projects/Android/jni/rtcw/src/cgame/cg_main.c index cd336de..2baf996 100644 --- a/Projects/Android/jni/rtcw/src/cgame/cg_main.c +++ b/Projects/Android/jni/rtcw/src/cgame/cg_main.c @@ -383,7 +383,7 @@ cvarTable_t cvarTable[] = { // END JOSEPH //----(SA) added - { &cg_particleDist, "cg_particleDist", "1024", CVAR_ARCHIVE }, + { &cg_particleDist, "cg_particleDist", "2048", CVAR_ARCHIVE }, { &cg_particleLOD, "cg_particleLOD", "0", CVAR_ARCHIVE }, { &cg_useSuggestedWeapons, "cg_useSuggestedWeapons", "1", CVAR_ARCHIVE }, //----(SA) added //----(SA) end diff --git a/Projects/Android/jni/rtcw/src/game/q_shared.h b/Projects/Android/jni/rtcw/src/game/q_shared.h index cdf997a..6958e0e 100644 --- a/Projects/Android/jni/rtcw/src/game/q_shared.h +++ b/Projects/Android/jni/rtcw/src/game/q_shared.h @@ -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.19.1 (Wolf 1.41)" +#define Q3_VERSION "RTCWQuest 0.20.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) diff --git a/Projects/Android/jni/rtcw/src/renderer/tr_init.c b/Projects/Android/jni/rtcw/src/renderer/tr_init.c index 3b63472..a45247d 100644 --- a/Projects/Android/jni/rtcw/src/renderer/tr_init.c +++ b/Projects/Android/jni/rtcw/src/renderer/tr_init.c @@ -1042,8 +1042,8 @@ void R_Register( void ) { AssertCvarRange( r_picmip, 0, 16, qtrue ); AssertCvarRange( r_picmip2, 0, 16, qtrue ); r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE | CVAR_LATCH ); - r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH ); - r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH ); + r_texturebits = ri.Cvar_Get( "r_texturebits", "32", CVAR_ARCHIVE | CVAR_LATCH ); + r_colorbits = ri.Cvar_Get( "r_colorbits", "32", CVAR_ARCHIVE | CVAR_LATCH ); r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH ); #if defined ( __linux__ ) r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH ); @@ -1058,7 +1058,7 @@ void R_Register( void ) { #else r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH ); #endif - r_depthbits = ri.Cvar_Get( "r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH ); + r_depthbits = ri.Cvar_Get( "r_depthbits", "24", CVAR_ARCHIVE | CVAR_LATCH ); r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "1", CVAR_ARCHIVE | CVAR_LATCH ); //----(SA) changed this to default to '1' for Drew r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH ); diff --git a/Projects/Android/jni/rtcw/src/renderer/tr_mesh.c b/Projects/Android/jni/rtcw/src/renderer/tr_mesh.c index c8701d3..e9e039e 100644 --- a/Projects/Android/jni/rtcw/src/renderer/tr_mesh.c +++ b/Projects/Android/jni/rtcw/src/renderer/tr_mesh.c @@ -339,6 +339,11 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) { lod = R_ComputeLOD( ent ); header = tr.currentModel->md3[lod]; + if (header == NULL) + { + //Fix issue with VENOM + return; + } // // cull the entire model if merged bounding box of both frames