diff --git a/.gitignore b/.gitignore index 378eac25..7bf0cfa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,13 @@ 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 diff --git a/engine/code/game/bg_physics.c b/engine/code/game/bg_physics.c index 3c43d2f4..53edcbca 100644 --- a/engine/code/game/bg_physics.c +++ b/engine/code/game/bg_physics.c @@ -1483,7 +1483,7 @@ static void PM_AccelerateAndMoveBody( car_t *car, carBody_t *sBody, carBody_t *t // damage stuff VectorSubtract(tBody->v, sBody->v, vec); impulseDamage = VectorLength(vec); - if (impulseDamage > 500.0f){ + if (impulseDamage > 400.0f){ // Com_Printf("impulseDamage %f\n", impulseDamage); pm->damage.damage += impulseDamage / 25.0f; } diff --git a/engine/code/q3_ui/ui_credits.c b/engine/code/q3_ui/ui_credits.c index d8b68c1f..cc4b276f 100644 --- a/engine/code/q3_ui/ui_credits.c +++ b/engine/code/q3_ui/ui_credits.c @@ -73,6 +73,8 @@ typedef struct 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 }, { "", 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 }, { "Eddy Valdez aka. 'thebigbuu'", 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 }, { "Art and Models", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "Jeff 'Stecki' Garstecki", 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 }, { "Thomas aka. 'To-mos'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "", 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 }, { "Melanie aka. 'Toxicity'", 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 }, { "Document Design and Layout", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "", 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 }, { "Jeremiah aka. 'BETAMONKEY'", 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 }, diff --git a/engine/code/q3_ui/ui_menu.c b/engine/code/q3_ui/ui_menu.c index 55204618..3d6053ea 100644 --- a/engine/code/q3_ui/ui_menu.c +++ b/engine/code/q3_ui/ui_menu.c @@ -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_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 " | 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_DrawString( 320, 400, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // END @@ -439,7 +439,7 @@ static void Main_MenuDraw( void ) { // 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( 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 ); // END } diff --git a/engine/code/q3_ui/ui_rally_credits.c b/engine/code/q3_ui/ui_rally_credits.c index 0d71d0ac..2d5f488b 100644 --- a/engine/code/q3_ui/ui_rally_credits.c +++ b/engine/code/q3_ui/ui_rally_credits.c @@ -104,7 +104,7 @@ static void UI_Rally_CreditMenu_Draw( void ) { 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 " | 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 ); }