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

- changed master server to master.ioquake3.org

Browse source 
- uploaded new snapshot (r199) to svn
This commit is contained in:
q3rally 2017-12-12 19:31:51 +00:00
parent 2d44b223b5
commit 24d4683a62
42 changed files with 87 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/builds/release-linux-x86_64/baseq3r/cgame/cg_rally_hud.asm
View file

@ -3965,7 +3965,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 0
align 1
LABELV $480

4
engine/builds/release-linux-x86_64/baseq3r/game/g_main.asm
View file

@ -10378,8 +10378,8 @@ byte 1 68
byte 1 101
byte 1 99
byte 1 32
byte 1 32
byte 1 53
byte 1 49
byte 1 50
byte 1 32
byte 1 50
byte 1 48

18
engine/builds/release-linux-x86_64/baseq3r/ui/ui_menu.asm
View file

@ -1708,7 +1708,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99
@ -1724,12 +1724,12 @@ byte 1 32
byte 1 50
byte 1 48
byte 1 49
byte 1 54
byte 1 55
byte 1 32
byte 1 124
byte 1 32
byte 1 49
byte 1 52
byte 1 53
byte 1 32
byte 1 89
byte 1 101
@ -1737,12 +1737,12 @@ byte 1 97
byte 1 114
byte 1 115
byte 1 32
byte 1 110
byte 1 111
byte 1 119
byte 1 46
byte 1 46
byte 1 46
byte 1 102
byte 1 32
byte 1 81
byte 1 51
byte 1 82
byte 1 32
byte 1 124
byte 1 32
@ -1807,7 +1807,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99

26
engine/builds/release-linux-x86_64/baseq3r/ui/ui_rally_credits.asm
View file

@ -1059,7 +1059,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99
@ -1075,12 +1075,12 @@ byte 1 32
byte 1 50
byte 1 48
byte 1 49
byte 1 54
byte 1 55
byte 1 32
byte 1 124
byte 1 32
byte 1 49
byte 1 52
byte 1 53
byte 1 32
byte 1 89
byte 1 101
@ -1088,12 +1088,12 @@ byte 1 97
byte 1 114
byte 1 115
byte 1 32
byte 1 110
byte 1 111
byte 1 119
byte 1 46
byte 1 46
byte 1 46
byte 1 102
byte 1 32
byte 1 81
byte 1 51
byte 1 82
byte 1 32
byte 1 124
byte 1 32
@ -1479,15 +1479,7 @@ byte 1 0
align 1
LABELV $86
byte 1 81
byte 1 117
byte 1 97
byte 1 107
byte 1 101
byte 1 32
byte 1 73
byte 1 73
byte 1 73
byte 1 32
byte 1 51
byte 1 82
byte 1 97
byte 1 108

BIN
engine/builds/release-linux-x86_64/baseq3r/vm/cgame.qvm
View file

Binary file not shown.

BIN
engine/builds/release-linux-x86_64/baseq3r/vm/qagame.qvm
View file

Binary file not shown.

BIN
engine/builds/release-linux-x86_64/baseq3r/vm/ui.qvm
View file

Binary file not shown.

BIN
engine/builds/release-linux-x86_64/q3rally-server.x86_64
View file

Binary file not shown.

BIN
engine/builds/release-linux-x86_64/q3rally.x86_64
View file

Binary file not shown.

2
engine/builds/release-mingw32-x86/baseq3r/cgame/cg_rally_hud.asm
View file

@ -3965,7 +3965,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 0
align 1
LABELV $480

BIN
engine/builds/release-mingw32-x86/baseq3r/cgamex86.dll
View file

Binary file not shown.

4
engine/builds/release-mingw32-x86/baseq3r/game/g_main.asm
View file

@ -10378,8 +10378,8 @@ byte 1 68
byte 1 101
byte 1 99
byte 1 32
byte 1 32
byte 1 53
byte 1 49
byte 1 50
byte 1 32
byte 1 50
byte 1 48

BIN
engine/builds/release-mingw32-x86/baseq3r/qagamex86.dll
View file

Binary file not shown.

18
engine/builds/release-mingw32-x86/baseq3r/ui/ui_menu.asm
View file

@ -1708,7 +1708,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99
@ -1724,12 +1724,12 @@ byte 1 32
byte 1 50
byte 1 48
byte 1 49
byte 1 54
byte 1 55
byte 1 32
byte 1 124
byte 1 32
byte 1 49
byte 1 52
byte 1 53
byte 1 32
byte 1 89
byte 1 101
@ -1737,12 +1737,12 @@ byte 1 97
byte 1 114
byte 1 115
byte 1 32
byte 1 110
byte 1 111
byte 1 119
byte 1 46
byte 1 46
byte 1 46
byte 1 102
byte 1 32
byte 1 81
byte 1 51
byte 1 82
byte 1 32
byte 1 124
byte 1 32
@ -1807,7 +1807,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99

26
engine/builds/release-mingw32-x86/baseq3r/ui/ui_rally_credits.asm
View file

@ -1059,7 +1059,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99
@ -1075,12 +1075,12 @@ byte 1 32
byte 1 50
byte 1 48
byte 1 49
byte 1 54
byte 1 55
byte 1 32
byte 1 124
byte 1 32
byte 1 49
byte 1 52
byte 1 53
byte 1 32
byte 1 89
byte 1 101
@ -1088,12 +1088,12 @@ byte 1 97
byte 1 114
byte 1 115
byte 1 32
byte 1 110
byte 1 111
byte 1 119
byte 1 46
byte 1 46
byte 1 46
byte 1 102
byte 1 32
byte 1 81
byte 1 51
byte 1 82
byte 1 32
byte 1 124
byte 1 32
@ -1479,15 +1479,7 @@ byte 1 0
align 1
LABELV $86
byte 1 81
byte 1 117
byte 1 97
byte 1 107
byte 1 101
byte 1 32
byte 1 73
byte 1 73
byte 1 73
byte 1 32
byte 1 51
byte 1 82
byte 1 97
byte 1 108

BIN
engine/builds/release-mingw32-x86/baseq3r/uix86.dll
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/baseq3r/vm/cgame.qvm
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/baseq3r/vm/qagame.qvm
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/baseq3r/vm/ui.qvm
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/q3rally-server.exe
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/q3rally.exe
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/renderer_opengl1_x86.dll
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86/renderer_opengl2_x86.dll
View file

Binary file not shown.

2
engine/builds/release-mingw32-x86_64/baseq3r/cgame/cg_rally_hud.asm
View file

@ -3965,7 +3965,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 0
align 1
LABELV $480

BIN
engine/builds/release-mingw32-x86_64/baseq3r/cgamex86_64.dll
View file

Binary file not shown.

4
engine/builds/release-mingw32-x86_64/baseq3r/game/g_main.asm
View file

@ -10378,8 +10378,8 @@ byte 1 68
byte 1 101
byte 1 99
byte 1 32
byte 1 32
byte 1 53
byte 1 49
byte 1 50
byte 1 32
byte 1 50
byte 1 48

BIN
engine/builds/release-mingw32-x86_64/baseq3r/qagamex86_64.dll
View file

Binary file not shown.

18
engine/builds/release-mingw32-x86_64/baseq3r/ui/ui_menu.asm
View file

@ -1708,7 +1708,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99
@ -1724,12 +1724,12 @@ byte 1 32
byte 1 50
byte 1 48
byte 1 49
byte 1 54
byte 1 55
byte 1 32
byte 1 124
byte 1 32
byte 1 49
byte 1 52
byte 1 53
byte 1 32
byte 1 89
byte 1 101
@ -1737,12 +1737,12 @@ byte 1 97
byte 1 114
byte 1 115
byte 1 32
byte 1 110
byte 1 111
byte 1 119
byte 1 46
byte 1 46
byte 1 46
byte 1 102
byte 1 32
byte 1 81
byte 1 51
byte 1 82
byte 1 32
byte 1 124
byte 1 32
@ -1807,7 +1807,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99

26
engine/builds/release-mingw32-x86_64/baseq3r/ui/ui_rally_credits.asm
View file

@ -1059,7 +1059,7 @@ byte 1 32
byte 1 114
byte 1 49
byte 1 57
byte 1 54
byte 1 57
byte 1 32
byte 1 40
byte 1 99
@ -1075,12 +1075,12 @@ byte 1 32
byte 1 50
byte 1 48
byte 1 49
byte 1 54
byte 1 55
byte 1 32
byte 1 124
byte 1 32
byte 1 49
byte 1 52
byte 1 53
byte 1 32
byte 1 89
byte 1 101
@ -1088,12 +1088,12 @@ byte 1 97
byte 1 114
byte 1 115
byte 1 32
byte 1 110
byte 1 111
byte 1 119
byte 1 46
byte 1 46
byte 1 46
byte 1 102
byte 1 32
byte 1 81
byte 1 51
byte 1 82
byte 1 32
byte 1 124
byte 1 32
@ -1479,15 +1479,7 @@ byte 1 0
align 1
LABELV $86
byte 1 81
byte 1 117
byte 1 97
byte 1 107
byte 1 101
byte 1 32
byte 1 73
byte 1 73
byte 1 73
byte 1 32
byte 1 51
byte 1 82
byte 1 97
byte 1 108

BIN
engine/builds/release-mingw32-x86_64/baseq3r/uix86_64.dll
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/baseq3r/vm/cgame.qvm
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/baseq3r/vm/qagame.qvm
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/baseq3r/vm/ui.qvm
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/q3rally-server.x86_64.exe
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/q3rally.x86_64.exe
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/renderer_opengl1_x86_64.dll
View file

Binary file not shown.

BIN
engine/builds/release-mingw32-x86_64/renderer_opengl2_x86_64.dll
View file

Binary file not shown.

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

@ -435,7 +435,7 @@ static void Main_MenuDraw( void ) {
} else {
// 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 - 2016 | 14 Years now... | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal );
UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2017 | 15 Years of Q3R | 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
}

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

@ -56,7 +56,7 @@ static void UI_Rally_CreditMenu_Draw( void ) {
int y;
y = (380 - (22 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE)) / 2;
UI_DrawProportionalString( 320, y, "Quake III Rally is brought to you by:", UI_CENTER|UI_SMALLFONT, color_white );
UI_DrawProportionalString( 320, y, "Q3Rally is brought to you by:", UI_CENTER|UI_SMALLFONT, color_white );
y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
@ -99,7 +99,7 @@ static void UI_Rally_CreditMenu_Draw( void ) {
UI_DrawProportionalString( 320, y, "Cyberdemon, Killaz and skw|d", UI_CENTER|UI_SMALLFONT, color_white );
y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2016 | 14 Years now... | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal );
UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2017 | 15 Years of Q3R | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal );
}

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.0.8 r196"
#define PRODUCT_VERSION "v0.0.0.8 r199"
#endif
#ifndef PRODUCT_DATE

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

@ -264,7 +264,7 @@ extern int demo_protocols[];
#endif
// override on command line, config files etc.
#ifndef MASTER_SERVER_NAME
#define MASTER_SERVER_NAME "master.q3rally.com"
#define MASTER_SERVER_NAME "master.ioquake3.org"
#endif
#ifndef STANDALONE

66
q3rallycode.ppr
View file

@ -95,7 +95,7 @@ q3rallycode
engine\code\botlib\l_utils.h
engine\code\botlib\lcc.mak
engine\code\botlib\linux-i386.mak
+cgame
-cgame
engine\code\cgame\cg_atmospheric.c
engine\code\cgame\cg_consolecmds.c
engine\code\cgame\cg_draw.c
@ -859,53 +859,25 @@ q3rallycode
engine\cross-make-mingw64.sh
[Open project files]
0=engine\code\qcommon\q_shared.h
1=engine\code\qcommon\files.c
2=engine\code\game\g_combat.c
3=engine\code\game\g_mover.c
4=engine\code\game\g_spawn.c
5=engine\misc\nsis\Makefile
6=engine\Makefile
7=engine\code\cgame\cg_draw.c
8=engine\code\cgame\cg_local.h
9=engine\code\cgame\cg_main.c
10=engine\code\cgame\cg_rally_hud.c
11=engine\code\cgame\cg_view.c
1=engine\code\client\cl_main.c
2=engine\code\q3_ui\ui_rally_servers.c
3=engine\code\qcommon\qcommon.h
4=engine\code\server\sv_init.c
[Selected Project Files]
Main=
Selected=engine\code\cgame\cg_view.c
Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h]
TopLine=35
TopLine=55
Caret=39,70
[engine\code\qcommon\files.c]
TopLine=166
Caret=34,201
[engine\code\game\g_combat.c]
TopLine=919
Caret=1,935
[engine\code\game\g_mover.c]
TopLine=1878
Caret=1,1894
[engine\code\game\g_spawn.c]
TopLine=231
Caret=1,239
[engine\misc\nsis\Makefile]
TopLine=1
Caret=17,2
[engine\Makefile]
TopLine=102
Caret=17,114
[engine\code\cgame\cg_draw.c]
TopLine=3292
Caret=1,3306
[engine\code\cgame\cg_local.h]
TopLine=1934
Caret=1,1948
[engine\code\cgame\cg_main.c]
TopLine=1040
Caret=1,1054
[engine\code\cgame\cg_rally_hud.c]
TopLine=197
Caret=1,185
[engine\code\cgame\cg_view.c]
TopLine=748
Caret=1,760
[engine\code\client\cl_main.c]
TopLine=2535
Caret=1,2549
[engine\code\q3_ui\ui_rally_servers.c]
TopLine=1570
Caret=1,1584
[engine\code\qcommon\qcommon.h]
TopLine=224
Caret=1,267
[engine\code\server\sv_init.c]
TopLine=677
Caret=1,688