26 Apr 2011
This commit is contained in:
parent
773dbe4d28
commit
72e86d112d
|
@ -1,3 +1,7 @@
|
||||||
|
build 1540
|
||||||
|
|
||||||
|
Fixed many-many small and large bugs before final release
|
||||||
|
|
||||||
build 1529
|
build 1529
|
||||||
|
|
||||||
FS: add "fallback_dir" option
|
FS: add "fallback_dir" option
|
||||||
|
|
|
@ -697,8 +697,7 @@ enum
|
||||||
kRenderTransTexture, // src*a+dest*(1-a)
|
kRenderTransTexture, // src*a+dest*(1-a)
|
||||||
kRenderGlow, // src*a+dest -- No Z buffer checks
|
kRenderGlow, // src*a+dest -- No Z buffer checks
|
||||||
kRenderTransAlpha, // src*srca+dest*(1-srca)
|
kRenderTransAlpha, // src*srca+dest*(1-srca)
|
||||||
kRenderTransAdd, // src*a+dest
|
kRenderTransAdd // src*a+dest
|
||||||
kRenderTransInverse // src*(1-a)+dest*a
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
|
|
@ -1329,6 +1329,8 @@ void CL_ClearWorld( void )
|
||||||
cl.world->curstate.movetype = MOVETYPE_PUSH;
|
cl.world->curstate.movetype = MOVETYPE_PUSH;
|
||||||
cl.world->model = cl.worldmodel;
|
cl.world->model = cl.worldmodel;
|
||||||
cl.world->index = 0;
|
cl.world->index = 0;
|
||||||
|
|
||||||
|
clgame.ds.cullMode = GL_FRONT;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CL_InitEdicts( void )
|
void CL_InitEdicts( void )
|
||||||
|
@ -2908,12 +2910,6 @@ void TriRenderMode( int mode )
|
||||||
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
|
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
|
||||||
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
||||||
break;
|
break;
|
||||||
case kRenderTransInverse:
|
|
||||||
pglEnable( GL_BLEND );
|
|
||||||
pglDisable( GL_ALPHA_TEST );
|
|
||||||
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
|
|
||||||
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3059,13 +3055,13 @@ void TriCullFace( TRICULLSTYLE mode )
|
||||||
switch( mode )
|
switch( mode )
|
||||||
{
|
{
|
||||||
case TRI_FRONT:
|
case TRI_FRONT:
|
||||||
mode = GL_FRONT;
|
clgame.ds.cullMode = GL_FRONT;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
mode = GL_NONE;
|
clgame.ds.cullMode = GL_NONE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
GL_Cull( mode );
|
GL_Cull( clgame.ds.cullMode );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -2362,6 +2362,7 @@ void CL_UpdateFlashlight( cl_entity_t *pEnt )
|
||||||
float falloff;
|
float falloff;
|
||||||
pmtrace_t trace;
|
pmtrace_t trace;
|
||||||
dlight_t *dl;
|
dlight_t *dl;
|
||||||
|
int key;
|
||||||
|
|
||||||
if(( pEnt->index - 1 ) == cl.playernum )
|
if(( pEnt->index - 1 ) == cl.playernum )
|
||||||
{
|
{
|
||||||
|
@ -2396,8 +2397,12 @@ void CL_UpdateFlashlight( cl_entity_t *pEnt )
|
||||||
|
|
||||||
falloff *= falloff;
|
falloff *= falloff;
|
||||||
|
|
||||||
|
if( cl.maxclients == 1 )
|
||||||
|
key = cl.playernum + 1;
|
||||||
|
else key = pEnt->index;
|
||||||
|
|
||||||
// update flashlight endpos
|
// update flashlight endpos
|
||||||
dl = CL_AllocDlight( pEnt->index );
|
dl = CL_AllocDlight( key );
|
||||||
VectorCopy( trace.endpos, dl->origin );
|
VectorCopy( trace.endpos, dl->origin );
|
||||||
dl->die = cl.time + 0.01f; // die on next frame
|
dl->die = cl.time + 0.01f; // die on next frame
|
||||||
dl->color.r = 255 * falloff;
|
dl->color.r = 255 * falloff;
|
||||||
|
|
|
@ -210,6 +210,8 @@ typedef struct
|
||||||
int scissor_height;
|
int scissor_height;
|
||||||
qboolean scissor_test;
|
qboolean scissor_test;
|
||||||
|
|
||||||
|
int cullMode; // override CULL FACE from TriAPI
|
||||||
|
|
||||||
// holds text color
|
// holds text color
|
||||||
rgba_t textColor;
|
rgba_t textColor;
|
||||||
rgba_t spriteColor;
|
rgba_t spriteColor;
|
||||||
|
|
|
@ -333,12 +333,6 @@ void GL_SetRenderMode( int mode )
|
||||||
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
|
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
|
||||||
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
||||||
break;
|
break;
|
||||||
case kRenderTransInverse:
|
|
||||||
pglEnable( GL_BLEND );
|
|
||||||
pglDisable( GL_ALPHA_TEST );
|
|
||||||
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
|
|
||||||
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ static int R_RankForRenderMode( cl_entity_t *ent )
|
||||||
switch( ent->curstate.rendermode )
|
switch( ent->curstate.rendermode )
|
||||||
{
|
{
|
||||||
case kRenderTransTexture:
|
case kRenderTransTexture:
|
||||||
case kRenderTransInverse:
|
|
||||||
return 1; // draw second
|
return 1; // draw second
|
||||||
case kRenderTransAdd:
|
case kRenderTransAdd:
|
||||||
return 2; // draw third
|
return 2; // draw third
|
||||||
|
|
|
@ -651,7 +651,6 @@ void R_BlendLightmaps( void )
|
||||||
switch( RI.currententity->curstate.rendermode )
|
switch( RI.currententity->curstate.rendermode )
|
||||||
{
|
{
|
||||||
case kRenderTransTexture:
|
case kRenderTransTexture:
|
||||||
case kRenderTransInverse:
|
|
||||||
case kRenderTransColor:
|
case kRenderTransColor:
|
||||||
case kRenderTransAdd:
|
case kRenderTransAdd:
|
||||||
case kRenderGlow:
|
case kRenderGlow:
|
||||||
|
@ -1201,7 +1200,6 @@ void R_DrawBrushModel( cl_entity_t *e )
|
||||||
{
|
{
|
||||||
case kRenderTransAdd:
|
case kRenderTransAdd:
|
||||||
case kRenderTransTexture:
|
case kRenderTransTexture:
|
||||||
case kRenderTransInverse:
|
|
||||||
need_sort = true;
|
need_sort = true;
|
||||||
case kRenderGlow:
|
case kRenderGlow:
|
||||||
pglColor4ub( 255, 255, 255, e->curstate.renderamt );
|
pglColor4ub( 255, 255, 255, e->curstate.renderamt );
|
||||||
|
|
|
@ -382,7 +382,6 @@ void R_BlendLightmaps( void )
|
||||||
switch( RI.currententity->curstate.rendermode )
|
switch( RI.currententity->curstate.rendermode )
|
||||||
{
|
{
|
||||||
case kRenderTransTexture:
|
case kRenderTransTexture:
|
||||||
case kRenderTransInverse:
|
|
||||||
case kRenderTransColor:
|
case kRenderTransColor:
|
||||||
case kRenderTransAdd:
|
case kRenderTransAdd:
|
||||||
case kRenderGlow:
|
case kRenderGlow:
|
||||||
|
@ -1029,7 +1028,6 @@ void R_DrawBrushModel( cl_entity_t *e )
|
||||||
{
|
{
|
||||||
case kRenderTransAdd:
|
case kRenderTransAdd:
|
||||||
case kRenderTransTexture:
|
case kRenderTransTexture:
|
||||||
case kRenderTransInverse:
|
|
||||||
need_sort = true;
|
need_sort = true;
|
||||||
case kRenderGlow:
|
case kRenderGlow:
|
||||||
pglColor4ub( 255, 255, 255, e->curstate.renderamt );
|
pglColor4ub( 255, 255, 255, e->curstate.renderamt );
|
||||||
|
|
|
@ -890,10 +890,6 @@ void R_DrawSpriteModel( cl_entity_t *e )
|
||||||
pglEnable( GL_BLEND );
|
pglEnable( GL_BLEND );
|
||||||
pglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
|
pglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
|
||||||
break;
|
break;
|
||||||
case kRenderTransInverse:
|
|
||||||
pglEnable( GL_BLEND );
|
|
||||||
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
|
|
||||||
break;
|
|
||||||
case kRenderGlow:
|
case kRenderGlow:
|
||||||
case kRenderTransAdd:
|
case kRenderTransAdd:
|
||||||
pglEnable( GL_BLEND );
|
pglEnable( GL_BLEND );
|
||||||
|
|
|
@ -2200,9 +2200,9 @@ R_StudioSetupRenderer
|
||||||
*/
|
*/
|
||||||
static void R_StudioSetupRenderer( int rendermode )
|
static void R_StudioSetupRenderer( int rendermode )
|
||||||
{
|
{
|
||||||
g_iRenderMode = bound( 0, rendermode, kRenderTransInverse );
|
g_iRenderMode = bound( 0, rendermode, kRenderTransAdd );
|
||||||
pglShadeModel( GL_SMOOTH ); // enable gouraud shading
|
pglShadeModel( GL_SMOOTH ); // enable gouraud shading
|
||||||
GL_Cull( GL_FRONT );
|
if( clgame.ds.cullMode != GL_NONE ) GL_Cull( GL_FRONT );
|
||||||
|
|
||||||
// enable depthmask on studiomodels
|
// enable depthmask on studiomodels
|
||||||
if( glState.drawTrans ) pglDepthMask( GL_TRUE );
|
if( glState.drawTrans ) pglDepthMask( GL_TRUE );
|
||||||
|
|
|
@ -12,6 +12,8 @@ static char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
|
||||||
// returns days since Feb 13 2007
|
// returns days since Feb 13 2007
|
||||||
int Q_buildnum( void )
|
int Q_buildnum( void )
|
||||||
{
|
{
|
||||||
|
// do not touch this! Only author of Xash3D can increase buildnumbers!
|
||||||
|
#if 0
|
||||||
int m = 0, d = 0, y = 0;
|
int m = 0, d = 0, y = 0;
|
||||||
static int b = 0;
|
static int b = 0;
|
||||||
|
|
||||||
|
@ -35,4 +37,7 @@ int Q_buildnum( void )
|
||||||
b -= 38752; // Feb 13 2007
|
b -= 38752; // Feb 13 2007
|
||||||
|
|
||||||
return b;
|
return b;
|
||||||
|
#else
|
||||||
|
return 1540;
|
||||||
|
#endif
|
||||||
}
|
}
|
|
@ -65,7 +65,7 @@ typedef enum
|
||||||
#include "com_model.h"
|
#include "com_model.h"
|
||||||
#include "crtlib.h"
|
#include "crtlib.h"
|
||||||
|
|
||||||
#define XASH_VERSION 0.8f // engine current version
|
#define XASH_VERSION 0.85f // engine current version
|
||||||
|
|
||||||
// PERFORMANCE INFO
|
// PERFORMANCE INFO
|
||||||
#define MIN_FPS 0.1 // host minimum fps value for maxfps.
|
#define MIN_FPS 0.1 // host minimum fps value for maxfps.
|
||||||
|
|
|
@ -1314,7 +1314,10 @@ void Con_DrawInput( void )
|
||||||
if( host.key_overstrike && cursorChar )
|
if( host.key_overstrike && cursorChar )
|
||||||
{
|
{
|
||||||
// overstrike cursor
|
// overstrike cursor
|
||||||
GL_SetRenderMode( kRenderTransInverse );
|
pglEnable( GL_BLEND );
|
||||||
|
pglDisable( GL_ALPHA_TEST );
|
||||||
|
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
|
||||||
|
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
||||||
Con_DrawGenericChar( x + curPos, y, cursorChar, colorDefault );
|
Con_DrawGenericChar( x + curPos, y, cursorChar, colorDefault );
|
||||||
}
|
}
|
||||||
else Con_DrawCharacter( x + curPos, y, '_', colorDefault );
|
else Con_DrawCharacter( x + curPos, y, '_', colorDefault );
|
||||||
|
|
|
@ -1243,6 +1243,7 @@ edict_t *pfnFindEntityInSphere( edict_t *pStartEdict, const float *org, float fl
|
||||||
=================
|
=================
|
||||||
pfnFindClientInPVS
|
pfnFindClientInPVS
|
||||||
|
|
||||||
|
FIXME: this code is totally wrong. Get PF_checkclient from QW.
|
||||||
=================
|
=================
|
||||||
*/
|
*/
|
||||||
edict_t* pfnFindClientInPVS( edict_t *pEdict )
|
edict_t* pfnFindClientInPVS( edict_t *pEdict )
|
||||||
|
|
|
@ -27,65 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
static const char *uiCreditsDefault[] =
|
static const char *uiCreditsDefault[] =
|
||||||
{
|
{
|
||||||
"^3Xash3D",
|
|
||||||
"",
|
"",
|
||||||
"^3PROGRAMMING",
|
"Copyright XashXT Group 2011 (C)",
|
||||||
"Uncle Mike",
|
|
||||||
"",
|
|
||||||
"^3ART",
|
|
||||||
"Chorus",
|
|
||||||
"Small Link",
|
|
||||||
"The FiEctro",
|
|
||||||
"",
|
|
||||||
"^3LEVEL DESIGN",
|
|
||||||
"Scrama",
|
|
||||||
"Mitoh",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"^3SPECIAL THANKS",
|
|
||||||
"Chain Studios et al.",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"^3MUSIC",
|
|
||||||
"Dj Existence",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"^3THANKS TO",
|
|
||||||
"ID Software at all",
|
|
||||||
"Georg Destroy for icon graphics",
|
|
||||||
"LokiMb for fixed console font",
|
|
||||||
"Crazy Russian for HL-style menu buttons",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"^3Xash3D using some parts of:",
|
|
||||||
"Quake 1 (Id Software)",
|
|
||||||
"Quake 2 (Id Software)",
|
|
||||||
"Quake 3 (Id Software)",
|
|
||||||
"Half-Life (Valve Software)",
|
|
||||||
"Darkplaces (Darkplaces Team)",
|
|
||||||
"Quake 2 Evolved (Team Blur)",
|
|
||||||
"AVIKit (by randomnine)",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"Copyright XashXT Group 2010 (C)",
|
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in New Issue