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

fixed a little bug in start server screen

Browse source 
added insellium in the credits properly
This commit is contained in:
q3rally 2021-03-21 12:07:19 +00:00
parent 981c2a91c8
commit 511e6d79f0
4 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/code/q3_ui/ui_credits.c
View file

@ -97,12 +97,13 @@ cr_line credits[] = { // edit this as necessary for your credits
{ "Thomas aka. 'To-mos'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Thomas aka. 'To-mos'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Eddy Valdez aka. 'thebigbuu'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Eddy Valdez aka. 'thebigbuu'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "'ailmanki' aka. 'peyote'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "'ailmanki' aka. 'peyote'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Artyom 'insellium' Fliskov", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "Art and Models", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "Art and Models", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "Jeff 'Stecki' Garstecki", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Jeff 'Stecki' Garstecki", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Per 'P3rlE' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Per 'P3rlE' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "'insellium'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Artyom 'insellium' Fliskov", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "'Steel Painter'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "'Steel Painter'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Thomas aka. 'To-mos'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Thomas aka. 'To-mos'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
@ -117,6 +118,7 @@ cr_line credits[] = { // edit this as necessary for your credits
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "Melanie aka. 'Toxicity'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Melanie aka. 'Toxicity'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Eddy Valdez aka. 'thebigbuu'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Eddy Valdez aka. 'thebigbuu'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Artyom 'insellium' Fliskov", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "Document Design and Layout", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "Document Design and Layout", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
@ -132,7 +134,7 @@ cr_line credits[] = { // edit this as necessary for your credits
{ "Mirco 'PaniC' Herrmann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Mirco 'PaniC' Herrmann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "Jeremiah aka. 'BETAMONKEY'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Jeremiah aka. 'BETAMONKEY'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "'Onai'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "'Onai'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "'insellium'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Artyom 'insellium' Fliskov", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },

4
engine/code/q3_ui/ui_rally_startserver.c
View file

@ -1562,7 +1562,7 @@ static void ServerOptions_LevelshotDraw( void *self ) {
// w = 256; // w = 256;
// x = b->generic.x - 100; // x = b->generic.x - 100;
// y = b->generic.y; // y = b->generic.y;
UI_FillRect( 325, 80, 256, 140, menu_back_color ); UI_FillRect( 325, 80, 256, 160, menu_back_color );
if (s_startserver.list.curvalue < 0 || s_startserver.list.curvalue >= s_startserver.nummaps) if (s_startserver.list.curvalue < 0 || s_startserver.list.curvalue >= s_startserver.nummaps)
return; return;
@ -1591,7 +1591,7 @@ static void ServerOptions_LevelshotDraw( void *self ) {
y += SMALLCHAR_HEIGHT; y += SMALLCHAR_HEIGHT;
UI_DrawString( x, y, author, UI_CENTER|UI_SMALLFONT, text_color_normal ); UI_DrawString( x, y, author, UI_CENTER|UI_SMALLFONT, text_color_normal );
y += SMALLCHAR_HEIGHT; y += SMALLCHAR_HEIGHT + 2;
UI_DrawString( x, y, gametype_items[gametype_remap2[s_serveroptions.gametype]], UI_CENTER|UI_SMALLFONT, text_color_normal ); UI_DrawString( x, y, gametype_items[gametype_remap2[s_serveroptions.gametype]], UI_CENTER|UI_SMALLFONT, text_color_normal );
x = b->generic.x; x = b->generic.x;

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" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.3.0_r311" #define PRODUCT_VERSION "v0.0.3.0_r317"
#endif #endif

22
q3rallycode.ppr
View file

@ -860,12 +860,28 @@ q3rallycode
[Open project files] [Open project files]
0=engine\code\qcommon\q_shared.h 0=engine\code\qcommon\q_shared.h
1=engine\code\q3_ui\ui_rally_startserver.c 1=engine\code\q3_ui\ui_rally_startserver.c
2=engine\code\q3_ui\ui_menu.c
3=engine\code\q3_ui\ui_startserver.c
4=engine\code\q3_ui\ui_rally_credits.c
5=engine\code\q3_ui\ui_credits.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\q3_ui\ui_rally_startserver.c Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=53 TopLine=53
Caret=39,70 Caret=39,70
[engine\code\q3_ui\ui_rally_startserver.c] [engine\code\q3_ui\ui_rally_startserver.c]
TopLine=853 TopLine=1574
Caret=40,868 Caret=27,1594
[engine\code\q3_ui\ui_menu.c]
TopLine=477
Caret=1,492
[engine\code\q3_ui\ui_startserver.c]
TopLine=436
Caret=1,451
[engine\code\q3_ui\ui_rally_credits.c]
TopLine=51
Caret=1,106
[engine\code\q3_ui\ui_credits.c]
TopLine=113
Caret=91,137