q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-21 19:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed bug where the laptime line switched one digit left instead of right when going over 10 minutes

Browse source 
fixed fullbright shader
version number upcount
This commit is contained in:
q3rally 2021-04-07 07:48:47 +00:00
parent 5f36034b3b
commit c42c0bdb40
5 changed files with 50 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
baseq3r/scripts/q3r_textures.shader
View file

@ -1434,9 +1434,18 @@ textures/q3r_dirt_grass/grass06
textures/q3r_dirt_grass/grass07
{
surfaceparm SURF_GRASS
surfaceparm dust
{
map textures/q3r_dirt_grass/grass07.tga
}
map $lightmap
rgbgen identity
}
{
map textures/q3r_dirt_grass/grass07.tga
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
alphaGen lightingSpecular
}
}
// ------------------------------------------------------------
@ -1578,8 +1587,16 @@ textures/q3r_dirt_grass/stones01
surfaceparm SURF_GRAVEL
surfaceparm dust
{
map textures/q3r_dirt_grass/stones01.tga
}
map $lightmap
rgbgen identity
}
{
map textures/q3r_dirt_grass/stones01.tga
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
alphaGen lightingSpecular
}
}
// ------------------------------------------------------------
@ -6278,8 +6295,17 @@ textures/q3r_dirt_grass/darkdirt01
{
surfaceparm SURF_DIRT
surfaceparm dust
{
map $lightmap
rgbgen identity
}
{
map textures/q3r_dirt_grass/darkdirt01.tga
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
alphaGen lightingSpecular
}
}

26
engine/code/cgame/cg_rally_hud.c
View file

@ -418,15 +418,16 @@ static float CG_DrawTimes( float y ) {
}
//
// Best Time
//
//
// Best Time
//
if ( cgs.gametype != GT_DERBY ){
time = getStringForTime( cent->bestLapTime );
Com_sprintf(s, sizeof(s), "B; %s", time);
x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
Com_sprintf(s, sizeof(s), "B: %s", time);
// x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
x = 636 - 96;
CG_FillRect ( x, y, 96, 18, bgColor );
x+= 8;
@ -435,9 +436,9 @@ static float CG_DrawTimes( float y ) {
y += TINYCHAR_HEIGHT + 4;
}
//
// Lap Time
//
//
// Lap Time
//
@ -445,11 +446,12 @@ static float CG_DrawTimes( float y ) {
time = getStringForTime(lapTime);
Com_sprintf(s, sizeof(s), "L: %s", time);
x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
CG_FillRect( x, y, 96, 18, bgColor );
x+= 8;
// x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
x = 636 - 96;
CG_FillRect( x, y, 96, 18, bgColor );
x+= 8;
y+= 4;
y+= 4;
CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
y += TINYCHAR_HEIGHT + 4;
}

2
engine/code/q3_ui/ui_atoms.c
View file

@ -1580,7 +1580,7 @@ void UI_Refresh( int realtime )
// draw cursor
// UI_SetColor( NULL );
//
// UI_DrawCursor( uis.cursorx-24, uis.cursory-24, 48, 48, uis.cursorModel );
UI_SetColor( NULL );

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack"
#ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.3.0_r352"
#define PRODUCT_VERSION "v0.0.3.0_r354"
#endif

12
q3rallycode.ppr
View file

@ -859,17 +859,13 @@ q3rallycode
engine\cross-make-mingw64.sh
[Open project files]
0=engine\code\qcommon\q_shared.h
1=engine\code\cgame\cg_rally_tools.c
2=engine\code\game\g_spawn.c
1=engine\code\cgame\cg_rally_hud.c
[Selected Project Files]
Main=
Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h]
TopLine=53
Caret=39,70
[engine\code\cgame\cg_rally_tools.c]
TopLine=639
Caret=1,644
[engine\code\game\g_spawn.c]
TopLine=722
Caret=1,737
[engine\code\cgame\cg_rally_hud.c]
TopLine=440
Caret=22,430