[nexuiz-commits] r6550 - in branches/nexuiz-2.0: . data/gfx data/qcsrc/menu/nexuiz data/qcsrc/server misc/tools
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Apr 21 12:38:44 EDT 2009
Author: div0
Date: 2009-04-21 12:38:44 -0400 (Tue, 21 Apr 2009)
New Revision: 6550
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/gfx/inv_weapon13.tga
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c
branches/nexuiz-2.0/data/qcsrc/server/bots.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r6544 | div0 | 2009-04-20 18:01:53 +0200 (Mon, 20 Apr 2009) | 2 lines
build script update
r6545 | m0rfar | 2009-04-20 18:55:19 +0200 (Mon, 20 Apr 2009) | 1 line
patch by terencehill: modified the TAG icon to be a bit more like other icons
r6546 | div0 | 2009-04-21 17:35:15 +0200 (Tue, 21 Apr 2009) | 2 lines
add a checkbox for r_coronas_occlusionqueries
r6547 | div0 | 2009-04-21 17:58:18 +0200 (Tue, 21 Apr 2009) | 4 lines
Try fixing bug on http://alientrap.org/forum/viewtopic.php?p=58125#58125 by no longer relying on the FL_NOTARGET flag.
Also, makes possible to fix the cheat "notarget" in the future by making bots and turrets actually honor that field.
r6548 | div0 | 2009-04-21 17:59:54 +0200 (Tue, 21 Apr 2009) | 2 lines
try to make "notarget" cheat work with bots
r6549 | div0 | 2009-04-21 18:03:54 +0200 (Tue, 21 Apr 2009) | 2 lines
more notarget fixes :P
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-04-21 16:03:54 UTC (rev 6549)
+++ branches/nexuiz-2.0/.patchsets 2009-04-21 16:38:44 UTC (rev 6550)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536,6541-6542
+revisions_applied = 1-6536,6541-6549
Modified: branches/nexuiz-2.0/data/gfx/inv_weapon13.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-04-21 16:03:54 UTC (rev 6549)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-04-21 16:38:44 UTC (rev 6550)
@@ -36,9 +36,11 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_glsl", "Use OpenGL 2.0 shaders (GLSL)"));
me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use occlusion queries"));
me.TR(me);
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Vertex Buffer Objects (VBOs)"));
me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Vertex Buffer Objects (VBOs)"));
+ me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 0.9, e = makeNexuizRadioButton(1, "gl_vbo", "0", "Off"));
me.TD(me, 1, 2.1, e = makeNexuizRadioButton(1, "gl_vbo", "1", "Vertex and Triangles"));
Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-04-21 16:03:54 UTC (rev 6549)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-04-21 16:38:44 UTC (rev 6550)
@@ -1930,6 +1930,8 @@
if(g_minstagib)
if(e.items & IT_STRENGTH)
return FALSE;
+ if(e.flags & FL_NOTARGET)
+ return FALSE;
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-04-21 16:03:54 UTC (rev 6549)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-04-21 16:38:44 UTC (rev 6550)
@@ -385,7 +385,7 @@
float distance;
float f;
- if(self.flags & FL_NOTARGET) // we don't need LOD for spectators
+ if(self.classname != "player")
return TRUE;
if(other.cvar_cl_playerdetailreduction <= 0)
@@ -1922,7 +1922,7 @@
if (self == self.enemy)
return 0;
- if(self.enemy.flags & FL_NOTARGET)
+ if(self.enemy.classname != "player")
return 0;
SpectateCopy(self.enemy);
@@ -1987,7 +1987,7 @@
if(cvar("g_campaign"))
campaign_bots_may_start = 1;
PutClientInServer();
- if(!(self.flags & FL_NOTARGET))
+ if(self.classname == "player")
bprint ("^4", self.netname, "^4 is playing now\n");
if(!cvar("g_campaign"))
centerprint(self,""); // clear MOTD
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc 2009-04-21 16:03:54 UTC (rev 6549)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc 2009-04-21 16:38:44 UTC (rev 6550)
@@ -349,6 +349,7 @@
.vector movement_old;
.float buttons_old;
.vector v_angle_old;
+.string lastclassname;
void Nixnex_GiveCurrentWeapon();
void SV_PlayerPhysics()
@@ -440,14 +441,14 @@
swampspd_mod = self.swamp_slowdown; //cvar("g_balance_swamp_moverate");
}
- if(self.flags & FL_NOTARGET)
+ if(self.classname != "player")
{
maxspd_mod = cvar("sv_spectator_speed_multiplier");
if(!self.spectatorspeed)
self.spectatorspeed = maxspd_mod;
if(self.impulse && self.impulse <= 19)
{
- if(self.lastflags & FL_NOTARGET)
+ if(self.lastclassname != "player")
{
if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18)
self.spectatorspeed = bound(1, self.spectatorspeed + 0.5, 5);
@@ -850,4 +851,5 @@
self.lastground = time;
self.lastflags = self.flags;
+ self.lastclassname = self.classname;
};
Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-04-21 16:03:54 UTC (rev 6549)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-04-21 16:38:44 UTC (rev 6550)
@@ -10,8 +10,8 @@
base=`pwd`
# customizable specific stuff
-netradiant_release=1.5.0-svn227
-basepk3=$base/data20080229.pk3 # 2.4
+netradiant_release=1.5.0-svn322
+basepk3=$base/data20090403.pk3 # 2.5
hotbasepk3= # hotfix
nexdir=$base/nexuiz
havocdir=$base/nexuiz/havoc
More information about the nexuiz-commits
mailing list