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

Update for credits & car damage

Browse source
This commit is contained in:
insellium 2023-12-10 05:44:50 +05:00
parent 528645fe86
commit 56383666bc
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -1 +1,13 @@
build build
baseq3r/cgamex86_64.dll
baseq3r/qagamex86_64.dll
baseq3r/uix86_64.dll
baseq3r/vm/cgame.qvm
baseq3r/vm/qagame.qvm
baseq3r/vm/ui.qvm
q3rally-server.x86_64.exe
q3rally.x86_64.exe
renderer_opengl1_x86_64.dll
renderer_opengl2_x86_64.dll
SDL264.dll
engine/Commands for cygwin compile.txt

2
engine/code/game/bg_physics.c
View file

@ -1483,7 +1483,7 @@ static void PM_AccelerateAndMoveBody( car_t *car, carBody_t *sBody, carBody_t *t
// damage stuff // damage stuff
VectorSubtract(tBody->v, sBody->v, vec); VectorSubtract(tBody->v, sBody->v, vec);
impulseDamage = VectorLength(vec); impulseDamage = VectorLength(vec);
if (impulseDamage > 500.0f){ if (impulseDamage > 400.0f){
// Com_Printf("impulseDamage %f\n", impulseDamage); // Com_Printf("impulseDamage %f\n", impulseDamage);
pm->damage.damage += impulseDamage / 25.0f; pm->damage.damage += impulseDamage / 25.0f;
} }

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

@ -73,6 +73,8 @@ typedef struct
cr_line credits[] = { // edit this as necessary for your credits cr_line credits[] = { // edit this as necessary for your credits
{ "Thank you for playing!", UI_CENTER|UI_BIGFONT|UI_DROPSHADOW, &color_headertext },
{ "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue },
{ "Q3Rally Team", UI_CENTER|UI_BIGFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "Q3Rally Team", UI_CENTER|UI_BIGFONT|UI_DROPSHADOW|UI_PULSE, &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 },
@ -97,13 +99,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 }, { "Denis 'insellium' Manylov", 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 },
{ "Artyom 'insellium' Fliskov", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Denis 'insellium' Manylov", 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 },
@ -118,7 +120,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 }, { "Denis 'insellium' Manylov", 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 },
@ -134,7 +136,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 },
{ "Artyom 'insellium' Fliskov", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Denis 'insellium' Manylov", 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_menu.c
View file

@ -431,7 +431,7 @@ static void Main_MenuDraw( void ) {
UI_DrawProportionalString( 320, 432, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, text_color_normal ); UI_DrawProportionalString( 320, 432, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, text_color_normal );
//UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); //UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal );
// UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2022 | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2022 | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
UI_DrawString( 320, 460, Q3_VERSION " | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); UI_DrawString( 320, 460, Q3_VERSION " | 2002 - 2024 | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
// UI_DrawProportionalString( 320, 372, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, color ); // UI_DrawProportionalString( 320, 372, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, color );
// UI_DrawString( 320, 400, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // UI_DrawString( 320, 400, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color );
// END // END
@ -439,7 +439,7 @@ static void Main_MenuDraw( void ) {
// STONELANCE // STONELANCE
//UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); //UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal );
// UI_DrawString( 365, 460, Q3_VERSION " (c) 2002 - 2022 | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawString( 365, 460, Q3_VERSION " (c) 2002 - 2022 | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
UI_DrawString( 365, 460, Q3_VERSION " | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); UI_DrawString( 365, 460, Q3_VERSION " | 2002 - 2024 | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
// UI_DrawString( 320, 450, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // UI_DrawString( 320, 450, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color );
// END // END
} }

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

@ -104,7 +104,7 @@ static void UI_Rally_CreditMenu_Draw( void ) {
y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
// UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2022 | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2022 | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
UI_DrawString( 320, y, Q3_VERSION " | 20th Anniversary | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); UI_DrawString( 320, y, Q3_VERSION " | 2002 - 2024 | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
} }