r4367 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-05 15:41:27 -0400 (Fri, 05 Sep 2008)
New Revision: 4367

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/changes-since-last-release
   branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc
Log:
r4364 | div0 | 2008-09-05 21:39:18 +0200 (Fri, 05 Sep 2008) | 2 lines
re-enable porto item on race, as it now is safe
r4366 | div0 | 2008-09-05 21:40:49 +0200 (Fri, 05 Sep 2008) | 2 lines
update changes list

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-09-05 19:40:49 UTC (rev 4366)
+++ branches/nexuiz-2.0/.patchsets	2008-09-05 19:41:27 UTC (rev 4367)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4363
+revisions_applied = 1-4366

Modified: branches/nexuiz-2.0/changes-since-last-release
===================================================================
--- branches/nexuiz-2.0/changes-since-last-release	2008-09-05 19:40:49 UTC (rev 4366)
+++ branches/nexuiz-2.0/changes-since-last-release	2008-09-05 19:41:27 UTC (rev 4367)
@@ -12,11 +12,14 @@
 game: crylink primary does 2 cells
 game: crylink weakened
 game: ctf flag touching when dead bug fixed
+game: cvar cl_weaponpriority* (custom weapon orders)
+game: cvar g_instagib REMOVED (no demand)
 game: cvar g_jump_grunt
 game: cvar g_maxplayers
 game: cvar g_spawn_furthest
 game: cvar g_spawnpoints_auto_move_out_of_solid
 game: cvar g_tourney*
+game: cvar g_weaponreplace_*
 game: cvar sv_gentle
 game: cvar sv_maxidle
 game: cvar sv_ready_restart_after_countdown
@@ -29,6 +32,7 @@
 game: hook detaches when teleporting
 game: hook jitter-less
 game: hook sky-attach bug fixed
+game: improved weapon system, new weapons Port-O-Launch and MinstaNex; now up to 24 weapons supported
 game: item respawn: 20s for 50health and 25armor
 game: lemmings countdown ;)
 game: log can get :time: events
@@ -50,6 +54,7 @@
 mapping: allow mins/maxs specification for brush entities instead of models (as alternative)
 mapping: automatic shader generator script
 mapping: entities.def updated
+mapping: entity func_breakable
 mapping: entity func_door: make DOOR_NOT_LINK work
 mapping: entity func_pointparticles
 mapping: entity func_sparks
@@ -58,7 +63,9 @@
 mapping: entity misc_follow
 mapping: entity misc_laser changed and improved
 mapping: entity trigger_flipflop, trigger_monoflip, trigger_multivibrator
+mapping: entity trigger_items
 mapping: field nottargeted overrides targetname checks in e.g. func_door (so it can be used for misc_follow without needing an extra trigger)
+mapping: field team on items
 mapping: mapname.cfg is deprecated. Use clientsettemp_for_type and cdtrack in mapname.mapinfo
 mapping: triggers now MUST be common/trigger; their exact shape now works (no longer their bbox)
 mapping: zeroradiant support, bugfix patchset updated

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc	2008-09-05 19:40:49 UTC (rev 4366)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc	2008-09-05 19:41:27 UTC (rev 4367)
@@ -144,14 +144,7 @@
 
 void spawnfunc_weapon_porto (void)
 {
-	if(g_race)
-	{
-		startitem_failed = TRUE;
-		remove(self);
-		return;
-	}
-	else
-		weapon_defaultspawnfunc(WEP_PORTO);
+	weapon_defaultspawnfunc(WEP_PORTO);
 }
 
 float w_porto(float req)