diff --git a/baseq3r/levelshots/q3r_country01.jpg b/baseq3r/levelshots/q3r_country01.jpg index fb0c1167..dcdfcdb3 100644 Binary files a/baseq3r/levelshots/q3r_country01.jpg and b/baseq3r/levelshots/q3r_country01.jpg differ diff --git a/baseq3r/levelshots/q3r_country01_c.jpg b/baseq3r/levelshots/q3r_country01_c.jpg new file mode 100644 index 00000000..565a2544 Binary files /dev/null and b/baseq3r/levelshots/q3r_country01_c.jpg differ diff --git a/baseq3r/levelshots/q3r_country01_c.tga b/baseq3r/levelshots/q3r_country01_c.tga deleted file mode 100644 index 9fa58fd4..00000000 Binary files a/baseq3r/levelshots/q3r_country01_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_ctf_01.jpg b/baseq3r/levelshots/q3r_ctf_01.jpg index 37f39209..95ee161c 100644 Binary files a/baseq3r/levelshots/q3r_ctf_01.jpg and b/baseq3r/levelshots/q3r_ctf_01.jpg differ diff --git a/baseq3r/levelshots/q3r_ctf_01_c.jpg b/baseq3r/levelshots/q3r_ctf_01_c.jpg new file mode 100644 index 00000000..ff424374 Binary files /dev/null and b/baseq3r/levelshots/q3r_ctf_01_c.jpg differ diff --git a/baseq3r/levelshots/q3r_ctf_01_c.tga b/baseq3r/levelshots/q3r_ctf_01_c.tga deleted file mode 100644 index 5cda4a8a..00000000 Binary files a/baseq3r/levelshots/q3r_ctf_01_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_david4.jpg b/baseq3r/levelshots/q3r_david4.jpg index 94d2e63a..89872b67 100644 Binary files a/baseq3r/levelshots/q3r_david4.jpg and b/baseq3r/levelshots/q3r_david4.jpg differ diff --git a/baseq3r/levelshots/q3r_david4_c.jpg b/baseq3r/levelshots/q3r_david4_c.jpg new file mode 100644 index 00000000..cf3101c4 Binary files /dev/null and b/baseq3r/levelshots/q3r_david4_c.jpg differ diff --git a/baseq3r/levelshots/q3r_david4_c.tga b/baseq3r/levelshots/q3r_david4_c.tga deleted file mode 100644 index b555a1b8..00000000 Binary files a/baseq3r/levelshots/q3r_david4_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_demobowl.jpg b/baseq3r/levelshots/q3r_demobowl.jpg index ce937f88..2509d3f7 100644 Binary files a/baseq3r/levelshots/q3r_demobowl.jpg and b/baseq3r/levelshots/q3r_demobowl.jpg differ diff --git a/baseq3r/levelshots/q3r_demobowl_c.jpg b/baseq3r/levelshots/q3r_demobowl_c.jpg new file mode 100644 index 00000000..4818fd59 Binary files /dev/null and b/baseq3r/levelshots/q3r_demobowl_c.jpg differ diff --git a/baseq3r/levelshots/q3r_demobowl_c.tga b/baseq3r/levelshots/q3r_demobowl_c.tga deleted file mode 100644 index 33b91830..00000000 Binary files a/baseq3r/levelshots/q3r_demobowl_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_dirtyfun.jpg b/baseq3r/levelshots/q3r_dirtyfun.jpg index b77dd788..dff60b4a 100644 Binary files a/baseq3r/levelshots/q3r_dirtyfun.jpg and b/baseq3r/levelshots/q3r_dirtyfun.jpg differ diff --git a/baseq3r/levelshots/q3r_dirtyfun_c.jpg b/baseq3r/levelshots/q3r_dirtyfun_c.jpg new file mode 100644 index 00000000..aaff75d1 Binary files /dev/null and b/baseq3r/levelshots/q3r_dirtyfun_c.jpg differ diff --git a/baseq3r/levelshots/q3r_dirtyfun_c.tga b/baseq3r/levelshots/q3r_dirtyfun_c.tga deleted file mode 100644 index b9a8fec0..00000000 Binary files a/baseq3r/levelshots/q3r_dirtyfun_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_dm02.jpg b/baseq3r/levelshots/q3r_dm02.jpg index 2c4c16fd..13421e21 100644 Binary files a/baseq3r/levelshots/q3r_dm02.jpg and b/baseq3r/levelshots/q3r_dm02.jpg differ diff --git a/baseq3r/levelshots/q3r_dm02_c.jpg b/baseq3r/levelshots/q3r_dm02_c.jpg new file mode 100644 index 00000000..36ad4c65 Binary files /dev/null and b/baseq3r/levelshots/q3r_dm02_c.jpg differ diff --git a/baseq3r/levelshots/q3r_dm02_c.tga b/baseq3r/levelshots/q3r_dm02_c.tga deleted file mode 100644 index dd6bbc06..00000000 Binary files a/baseq3r/levelshots/q3r_dm02_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_lavafalls.jpg b/baseq3r/levelshots/q3r_lavafalls.jpg index f2ee6540..29dc7695 100644 Binary files a/baseq3r/levelshots/q3r_lavafalls.jpg and b/baseq3r/levelshots/q3r_lavafalls.jpg differ diff --git a/baseq3r/levelshots/q3r_lavafalls_c.jpg b/baseq3r/levelshots/q3r_lavafalls_c.jpg new file mode 100644 index 00000000..a52897c2 Binary files /dev/null and b/baseq3r/levelshots/q3r_lavafalls_c.jpg differ diff --git a/baseq3r/levelshots/q3r_lavafalls_c.tga b/baseq3r/levelshots/q3r_lavafalls_c.tga deleted file mode 100644 index fdda8ab9..00000000 Binary files a/baseq3r/levelshots/q3r_lavafalls_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_nightcity.jpg b/baseq3r/levelshots/q3r_nightcity.jpg index eb9fb541..717282e5 100644 Binary files a/baseq3r/levelshots/q3r_nightcity.jpg and b/baseq3r/levelshots/q3r_nightcity.jpg differ diff --git a/baseq3r/levelshots/q3r_nightcity_c.jpg b/baseq3r/levelshots/q3r_nightcity_c.jpg new file mode 100644 index 00000000..ead851fe Binary files /dev/null and b/baseq3r/levelshots/q3r_nightcity_c.jpg differ diff --git a/baseq3r/levelshots/q3r_nightcity_c.tga b/baseq3r/levelshots/q3r_nightcity_c.tga deleted file mode 100644 index c66db180..00000000 Binary files a/baseq3r/levelshots/q3r_nightcity_c.tga and /dev/null differ diff --git a/baseq3r/levelshots/q3r_sk1.jpg b/baseq3r/levelshots/q3r_sk1.jpg index 31edbe8d..540ae94b 100644 Binary files a/baseq3r/levelshots/q3r_sk1.jpg and b/baseq3r/levelshots/q3r_sk1.jpg differ diff --git a/baseq3r/levelshots/q3r_sk1_c.jpg b/baseq3r/levelshots/q3r_sk1_c.jpg new file mode 100644 index 00000000..02dc23b4 Binary files /dev/null and b/baseq3r/levelshots/q3r_sk1_c.jpg differ diff --git a/baseq3r/levelshots/q3r_sk1_c.tga b/baseq3r/levelshots/q3r_sk1_c.tga deleted file mode 100644 index 4b229f37..00000000 Binary files a/baseq3r/levelshots/q3r_sk1_c.tga and /dev/null differ diff --git a/engine/Makefile b/engine/Makefile index c7b59fd5..9eecd038 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -111,7 +111,7 @@ endif export CROSS_COMPILING ifndef VERSION -VERSION=v0.0.2.8 +VERSION=v0.0.3.0 endif ifndef CLIENTBIN diff --git a/engine/code/q3_ui/ui_credits.c b/engine/code/q3_ui/ui_credits.c index 6729e836..449aec21 100644 --- a/engine/code/q3_ui/ui_credits.c +++ b/engine/code/q3_ui/ui_credits.c @@ -79,7 +79,7 @@ cr_line credits[] = { // edit this as necessary for your credits { "Programming:", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "Steven 'Stonelance' Heijsters", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, -{ "Per 'Perle' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, +{ "Per 'P3rlE' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Eddy Valdez aka. 'TheBigBuu'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "ZTurtleMan from TurtleArena", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Eraser from EntityPlus", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, @@ -91,7 +91,7 @@ cr_line credits[] = { // edit this as necessary for your credits { "Simon 'System Krash' Batty", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Jonathan 'Amphetamine' Garrod", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Michael 'Cyberdemon' Kaminsky", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, -{ "Per 'Perle' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, +{ "Per 'P3rlE' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "'MysteriousPoetd' aka 'Poet'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "'OliverV'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Thomas aka. 'To-mos'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, @@ -119,14 +119,14 @@ cr_line credits[] = { // edit this as necessary for your credits { "Document Design and Layout", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "Richard Smith", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, -{ "Per 'Perle' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, +{ "Per 'P3rlE' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Mirco 'PaniC' Herrmann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "BETA Testing", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW|UI_PULSE, &color_headertext }, { "", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_blue }, { "To-Mos", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, { "Eddy Valdez aka. 'thebigbuu'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, -{ "Per 'Perle' Thormann", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, +{ "Per 'P3rlE' Thormann", 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 }, { "'Onai'", UI_CENTER|UI_SMALLFONT|UI_DROPSHADOW, &color_headertext }, diff --git a/engine/code/q3_ui/ui_rally_credits.c b/engine/code/q3_ui/ui_rally_credits.c index aea9b08d..9c998e6e 100644 --- a/engine/code/q3_ui/ui_rally_credits.c +++ b/engine/code/q3_ui/ui_rally_credits.c @@ -64,7 +64,7 @@ static void UI_Rally_CreditMenu_Draw( void ) { y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Steve \"Stone Lance\" Heijster", UI_CENTER|UI_SMALLFONT, color_white ); y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; - UI_DrawProportionalString( 320, y, "Per \"Perle\" Thormann", UI_CENTER|UI_SMALLFONT, color_white ); + UI_DrawProportionalString( 320, y, "Per \"P3rlE\" Thormann", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Art and Models:", UI_CENTER|UI_SMALLFONT, color_white ); @@ -72,6 +72,10 @@ static void UI_Rally_CreditMenu_Draw( void ) { UI_DrawProportionalString( 320, y, "Jeff \"Stecki\" Garstecki", UI_CENTER|UI_SMALLFONT, color_white ); y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "\"Steel Painter\"", UI_CENTER|UI_SMALLFONT, color_white ); + y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; + UI_DrawProportionalString( 320, y, "Per \"P3rlE\" Thormann", UI_CENTER|UI_SMALLFONT, color_white ); + y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; + UI_DrawProportionalString( 320, y, "\"insellium\"", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Maps:", UI_CENTER|UI_SMALLFONT, color_white ); @@ -86,7 +90,7 @@ static void UI_Rally_CreditMenu_Draw( void ) { y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Michael \"Cyberdemon\" Kaminsky", UI_CENTER|UI_SMALLFONT, color_white ); y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; - UI_DrawProportionalString( 320, y, "Per \"Perle\" Thormann", UI_CENTER|UI_SMALLFONT, color_white ); + UI_DrawProportionalString( 320, y, "Per \"P3rlE\" Thormann", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "SDK Document Design and Layout:", UI_CENTER|UI_SMALLFONT, color_white ); diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 20de9418..b52f50e5 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -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_r286" +#define PRODUCT_VERSION "v0.0.3.0_r287" #endif diff --git a/engine/make-linux-portable.local b/engine/make-linux-portable.local new file mode 100644 index 00000000..2ef974d9 --- /dev/null +++ b/engine/make-linux-portable.local @@ -0,0 +1 @@ +DIR=build/spearmint-sdl2-downloads diff --git a/q3rallycode.ppr b/q3rallycode.ppr index d6e29759..ebf81ca8 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -873,14 +873,19 @@ q3rallycode 12=engine\code\game\g_rally_rearweapon.c 13=engine\code\q3_ui\ui_rally_credits.c 14=engine\code\qcommon\q_shared.h +15=engine\code\ui\ui_main.c +16=engine\resync_svn.sh +17=engine\code\q3_ui\ui_rally_servers.c +18=engine\code\qcommon\qcommon.h +19=engine\code\game\g_utils.c [Selected Project Files] Main= Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\files.c] -TopLine=183 -Caret=129,192 +TopLine=3681 +Caret=1,3695 [engine\Makefile] -TopLine=100 +TopLine=1 Caret=17,114 [engine\code\q3_ui\ui_rally_startserver.c] TopLine=1228 @@ -901,8 +906,8 @@ Caret=1,670 TopLine=417 Caret=63,438 [engine\code\q3_ui\ui_credits.c] -TopLine=38 -Caret=1,64 +TopLine=115 +Caret=11,129 [engine\code\q3_ui\ui_rally_controls.c] TopLine=548 Caret=80,574 @@ -916,8 +921,23 @@ Caret=13,612 TopLine=211 Caret=1,225 [engine\code\q3_ui\ui_rally_credits.c] -TopLine=88 -Caret=65,102 +TopLine=79 +Caret=56,93 [engine\code\qcommon\q_shared.h] -TopLine=49 +TopLine=53 Caret=39,70 +[engine\code\ui\ui_main.c] +TopLine=3012 +Caret=1,3026 +[engine\resync_svn.sh] +TopLine=44 +Caret=1,58 +[engine\code\q3_ui\ui_rally_servers.c] +TopLine=1230 +Caret=1,1244 +[engine\code\qcommon\qcommon.h] +TopLine=253 +Caret=1,267 +[engine\code\game\g_utils.c] +TopLine=679 +Caret=1,693