mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-22 03:51:23 +00:00
Commit for upcoming v0.0.0.4 release.
This commit is contained in:
q3rally
parent
168339354f
commit
70a31b68d4
5 changed files with 228 additions and 178 deletions
|
|
@ -1,22 +1,21 @@
|
|||
/*
|
||||
===========================================================================
|
||||
Copyright (C) 1999-2005 Id Software, Inc.
|
||||
Copyright (C) 2002-2015 Q3Rally Team (Per Thormann - q3rally@gmail.com)
|
||||
|
||||
This file is part of q3rally source code.
|
||||
This file is part of Quake III Arena source code.
|
||||
|
||||
q3rally source code is free software; you can redistribute it
|
||||
Quake III Arena source code is free software; you can redistribute it
|
||||
and/or modify it under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the License,
|
||||
or (at your option) any later version.
|
||||
|
||||
q3rally source code is distributed in the hope that it will be
|
||||
Quake III Arena source code is distributed in the hope that it will be
|
||||
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with q3rally; if not, write to the Free Software
|
||||
along with Foobar; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
===========================================================================
|
||||
*/
|
||||
|
|
@ -38,44 +37,47 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#define INVENTORY_NAILGUN 15
|
||||
#define INVENTORY_PROXLAUNCHER 16
|
||||
#define INVENTORY_CHAINGUN 17
|
||||
//Q3Rally Code Start
|
||||
#define INVENTORY_FLAMETHROWER 18
|
||||
//Q3Rally Code END
|
||||
//ammo
|
||||
#define INVENTORY_SHELLS 19
|
||||
#define INVENTORY_BULLETS 20
|
||||
#define INVENTORY_GRENADES 21
|
||||
#define INVENTORY_CELLS 22
|
||||
#define INVENTORY_LIGHTNINGAMMO 23
|
||||
#define INVENTORY_ROCKETS 24
|
||||
#define INVENTORY_SLUGS 25
|
||||
#define INVENTORY_BFGAMMO 26
|
||||
#define INVENTORY_NAILS 27
|
||||
#define INVENTORY_MINES 28
|
||||
#define INVENTORY_BELT 29
|
||||
#define INVENTORY_SHELLS 18
|
||||
#define INVENTORY_BULLETS 19
|
||||
#define INVENTORY_GRENADES 20
|
||||
#define INVENTORY_CELLS 21
|
||||
#define INVENTORY_LIGHTNINGAMMO 22
|
||||
#define INVENTORY_ROCKETS 23
|
||||
#define INVENTORY_SLUGS 24
|
||||
#define INVENTORY_BFGAMMO 25
|
||||
#define INVENTORY_NAILS 26
|
||||
#define INVENTORY_MINES 27
|
||||
#define INVENTORY_BELT 28
|
||||
//powerups
|
||||
#define INVENTORY_HEALTH 30
|
||||
#define INVENTORY_TELEPORTER 31
|
||||
#define INVENTORY_MEDKIT 32
|
||||
#define INVENTORY_KAMIKAZE 33
|
||||
#define INVENTORY_PORTAL 34
|
||||
#define INVENTORY_INVULNERABILITY 35
|
||||
#define INVENTORY_QUAD 36
|
||||
#define INVENTORY_ENVIRONMENTSUIT 37
|
||||
#define INVENTORY_HASTE 38
|
||||
#define INVENTORY_INVISIBILITY 39
|
||||
#define INVENTORY_REGEN 40
|
||||
#define INVENTORY_FLIGHT 41
|
||||
#define INVENTORY_SCOUT 42
|
||||
#define INVENTORY_GUARD 43
|
||||
#define INVENTORY_DOUBLER 44
|
||||
#define INVENTORY_AMMOREGEN 45
|
||||
#define INVENTORY_HEALTH 29
|
||||
#define INVENTORY_TELEPORTER 30
|
||||
#define INVENTORY_MEDKIT 31
|
||||
#define INVENTORY_KAMIKAZE 32
|
||||
#define INVENTORY_PORTAL 33
|
||||
#define INVENTORY_INVULNERABILITY 34
|
||||
#define INVENTORY_QUAD 35
|
||||
#define INVENTORY_ENVIRONMENTSUIT 36
|
||||
#define INVENTORY_HASTE 37
|
||||
#define INVENTORY_INVISIBILITY 38
|
||||
#define INVENTORY_REGEN 39
|
||||
#define INVENTORY_FLIGHT 40
|
||||
#define INVENTORY_SCOUT 41
|
||||
#define INVENTORY_GUARD 42
|
||||
#define INVENTORY_DOUBLER 43
|
||||
#define INVENTORY_AMMOREGEN 44
|
||||
|
||||
#define INVENTORY_REDFLAG 45
|
||||
#define INVENTORY_BLUEFLAG 46
|
||||
#define INVENTORY_NEUTRALFLAG 47
|
||||
#define INVENTORY_REDCUBE 48
|
||||
#define INVENTORY_BLUECUBE 49
|
||||
//Elimination mod: Domination inventory
|
||||
#define INVENTORY_POINTWHITE 50
|
||||
#define INVENTORY_POINTRED 51
|
||||
#define INVENTORY_POINTBLUE 52
|
||||
|
||||
|
||||
#define INVENTORY_REDFLAG 46
|
||||
#define INVENTORY_BLUEFLAG 47
|
||||
#define INVENTORY_NEUTRALFLAG 48
|
||||
#define INVENTORY_REDCUBE 49
|
||||
#define INVENTORY_BLUECUBE 50
|
||||
//enemy stuff
|
||||
#define ENEMY_HORIZONTAL_DIST 200
|
||||
#define ENEMY_HEIGHT 201
|
||||
|
|
@ -108,53 +110,62 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#define MODELINDEX_PLASMAGUN 15
|
||||
#define MODELINDEX_BFG10K 16
|
||||
#define MODELINDEX_GRAPPLINGHOOK 17
|
||||
//Q3Rally Code Start
|
||||
#define MODELINDEX_FLAMETHROWER 18
|
||||
//Q3Rally Code END
|
||||
|
||||
#define MODELINDEX_SHELLS 19
|
||||
#define MODELINDEX_BULLETS 20
|
||||
#define MODELINDEX_GRENADES 21
|
||||
#define MODELINDEX_CELLS 22
|
||||
#define MODELINDEX_LIGHTNINGAMMO 23
|
||||
#define MODELINDEX_ROCKETS 24
|
||||
#define MODELINDEX_SLUGS 25
|
||||
#define MODELINDEX_BFGAMMO 26
|
||||
#define MODELINDEX_SHELLS 18
|
||||
#define MODELINDEX_BULLETS 19
|
||||
#define MODELINDEX_GRENADES 20
|
||||
#define MODELINDEX_CELLS 21
|
||||
#define MODELINDEX_LIGHTNINGAMMO 22
|
||||
#define MODELINDEX_ROCKETS 23
|
||||
#define MODELINDEX_SLUGS 24
|
||||
#define MODELINDEX_BFGAMMO 25
|
||||
|
||||
#define MODELINDEX_TELEPORTER 27
|
||||
#define MODELINDEX_MEDKIT 28
|
||||
#define MODELINDEX_QUAD 29
|
||||
#define MODELINDEX_ENVIRONMENTSUIT 30
|
||||
#define MODELINDEX_HASTE 31
|
||||
#define MODELINDEX_INVISIBILITY 32
|
||||
#define MODELINDEX_REGEN 33
|
||||
#define MODELINDEX_FLIGHT 34
|
||||
#define MODELINDEX_TELEPORTER 26
|
||||
#define MODELINDEX_MEDKIT 27
|
||||
#define MODELINDEX_QUAD 28
|
||||
#define MODELINDEX_ENVIRONMENTSUIT 29
|
||||
#define MODELINDEX_HASTE 30
|
||||
#define MODELINDEX_INVISIBILITY 31
|
||||
#define MODELINDEX_REGEN 32
|
||||
#define MODELINDEX_FLIGHT 33
|
||||
|
||||
#define MODELINDEX_REDFLAG 35
|
||||
#define MODELINDEX_BLUEFLAG 36
|
||||
#define MODELINDEX_REDFLAG 34
|
||||
#define MODELINDEX_BLUEFLAG 35
|
||||
|
||||
// mission pack only defines
|
||||
|
||||
#define MODELINDEX_KAMIKAZE 37
|
||||
#define MODELINDEX_PORTAL 38
|
||||
#define MODELINDEX_INVULNERABILITY 39
|
||||
#define MODELINDEX_KAMIKAZE 36
|
||||
#define MODELINDEX_PORTAL 37
|
||||
#define MODELINDEX_INVULNERABILITY 38
|
||||
|
||||
#define MODELINDEX_NAILS 40
|
||||
#define MODELINDEX_MINES 41
|
||||
#define MODELINDEX_BELT 42
|
||||
#define MODELINDEX_NAILS 39
|
||||
#define MODELINDEX_MINES 40
|
||||
#define MODELINDEX_BELT 41
|
||||
|
||||
#define MODELINDEX_SCOUT 43
|
||||
#define MODELINDEX_GUARD 44
|
||||
#define MODELINDEX_DOUBLER 45
|
||||
#define MODELINDEX_AMMOREGEN 46
|
||||
#define MODELINDEX_SCOUT 42
|
||||
#define MODELINDEX_GUARD 43
|
||||
#define MODELINDEX_DOUBLER 44
|
||||
#define MODELINDEX_AMMOREGEN 45
|
||||
|
||||
#define MODELINDEX_NEUTRALFLAG 47
|
||||
#define MODELINDEX_REDCUBE 48
|
||||
#define MODELINDEX_BLUECUBE 49
|
||||
#define MODELINDEX_NEUTRALFLAG 46
|
||||
#define MODELINDEX_REDCUBE 47
|
||||
#define MODELINDEX_BLUECUBE 48
|
||||
|
||||
#define MODELINDEX_NAILGUN 50
|
||||
#define MODELINDEX_PROXLAUNCHER 51
|
||||
#define MODELINDEX_CHAINGUN 52
|
||||
#define MODELINDEX_NAILGUN 49
|
||||
#define MODELINDEX_PROXLAUNCHER 50
|
||||
#define MODELINDEX_CHAINGUN 51
|
||||
|
||||
//Elimination mod: Double Domination and Standard Domination
|
||||
|
||||
#define MODELINDEX_POINTABLUE 52
|
||||
#define MODELINDEX_POINTBBLUE 53
|
||||
#define MODELINDEX_POINTARED 54
|
||||
#define MODELINDEX_POINTBRED 55
|
||||
#define MODELINDEX_POINTAWHITE 56
|
||||
#define MODELINDEX_POINTBWHITE 57
|
||||
#define MODELINDEX_POINTWHITE 58
|
||||
#define MODELINDEX_POINTRED 59
|
||||
#define MODELINDEX_POINTBLUE 60
|
||||
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -823,7 +823,6 @@ static void Controls_DrawKeyBinding( void *self )
|
|||
Q_strupr(name2);
|
||||
|
||||
strcat( name, " or " );
|
||||
strcat( name, 0 );
|
||||
strcat( name, name2 );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,9 +198,9 @@ typedef struct
|
|||
|
||||
const purePak_t com_purePaks[] =
|
||||
{
|
||||
{BASEGAME, "assets0", 2261118363u},
|
||||
{BASEGAME, "assets0", 3496770638u},
|
||||
{BASEGAME, "qvm", 153775135u},
|
||||
{BASEGAME, "textures", 449088338u},
|
||||
{BASEGAME, "textures", 25205174u},
|
||||
|
||||
|
||||
#if 0
|
||||
|
|
|
|||
|
|
@ -55,7 +55,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.4 r161"
|
||||
#define PRODUCT_VERSION "v0.0.0.4 r163"
|
||||
#endif
|
||||
|
||||
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
|
||||
|
|
|
|||
|
|
@ -860,15 +860,55 @@ q3rallycode
|
|||
0=engine\code\qcommon\q_shared.h
|
||||
1=engine\code\q3_ui\ui_rally_controls.c
|
||||
2=engine\code\game\inv.h
|
||||
3=engine\code\client\cl_main.c
|
||||
4=engine\code\qcommon\qcommon.h
|
||||
5=engine\code\server\sv_client.c
|
||||
6=engine\code\server\sv_init.c
|
||||
7=engine\code\zlib\zlib.h
|
||||
8=engine\misc\nsis\q3rally.nsi.in
|
||||
9=engine\misc\setup\setup.xml.in
|
||||
10=engine\Makefile
|
||||
11=engine\make-macosx-ub.sh
|
||||
12=engine\code\qcommon\files.c
|
||||
[Selected Project Files]
|
||||
Main=
|
||||
Selected=engine\code\qcommon\q_shared.h
|
||||
Selected=engine\code\qcommon\files.c
|
||||
[engine\code\qcommon\q_shared.h]
|
||||
TopLine=40
|
||||
Caret=39,58
|
||||
TopLine=16
|
||||
Caret=1,32
|
||||
[engine\code\q3_ui\ui_rally_controls.c]
|
||||
TopLine=778
|
||||
TopLine=780
|
||||
Caret=1,819
|
||||
[engine\code\game\inv.h]
|
||||
TopLine=1
|
||||
Caret=1,1
|
||||
[engine\code\client\cl_main.c]
|
||||
TopLine=1919
|
||||
Caret=1,1935
|
||||
[engine\code\qcommon\qcommon.h]
|
||||
TopLine=693
|
||||
Caret=1,709
|
||||
[engine\code\server\sv_client.c]
|
||||
TopLine=1240
|
||||
Caret=1,1254
|
||||
[engine\code\server\sv_init.c]
|
||||
TopLine=563
|
||||
Caret=1,579
|
||||
[engine\code\zlib\zlib.h]
|
||||
TopLine=1171
|
||||
Caret=1,1279
|
||||
[engine\misc\nsis\q3rally.nsi.in]
|
||||
TopLine=1
|
||||
Caret=1,13
|
||||
[engine\misc\setup\setup.xml.in]
|
||||
TopLine=51
|
||||
Caret=1,70
|
||||
[engine\Makefile]
|
||||
TopLine=2512
|
||||
Caret=1,2528
|
||||
[engine\make-macosx-ub.sh]
|
||||
TopLine=1
|
||||
Caret=1,8
|
||||
[engine\code\qcommon\files.c]
|
||||
TopLine=185
|
||||
Caret=34,201
|
||||
|
|
|
|||
Loading…
Reference in a new issue