r5395 - in branches/nexuiz-2.0: . Docs data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-03 14:59:48 -0500 (Sat, 03 Jan 2009)
New Revision: 5395

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/Docs/basics.html
   branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
Log:
r5393 | esteel | 2009-01-03 16:53:10 +0100 (Sat, 03 Jan 2009) | 2 lines
also fix CR description in the html-file (it uses bullets, not cells)
r5394 | div0 | 2009-01-03 20:57:05 +0100 (Sat, 03 Jan 2009) | 2 lines
fix func_snow (now really)

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-01-03 19:57:05 UTC (rev 5394)
+++ branches/nexuiz-2.0/.patchsets	2009-01-03 19:59:48 UTC (rev 5395)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5391
+revisions_applied = 1-5394

Modified: branches/nexuiz-2.0/Docs/basics.html
===================================================================
--- branches/nexuiz-2.0/Docs/basics.html	2009-01-03 19:57:05 UTC (rev 5394)
+++ branches/nexuiz-2.0/Docs/basics.html	2009-01-03 19:59:48 UTC (rev 5395)
@@ -182,7 +182,7 @@
 <li>The minsta nex is the snipers wet dream.  Simiar to the nex but MUCH more powerful.  One hit, one kill, no kidding!  The secondary firemode is identical to the lasers primary shot.  Back in the glory days this gun was used soley in Minstagib to train steady aim and fast movement, now this gun can spread fear in every gamemode.  Cell ammo is also used by nex, crylink, hlac and electro.</li>
 </ul>
 <ul>
-<li>The Campingrifle is a kind of mixture of a sniper rifle and an assault gun.  It fires fast, medium-to-high damage, wall piercing projectiles and is fed with cell ammo.  The primary mode feels very much like a standard sniper rifle and is harder to use than the nex due to the projectile.  The secondary mode can be used to empty the whole magazine of bullets in an quick burst.  This firemode is less wallpiercing and has some spread to it but is deadly at mid-to-close range.  The magazine is reloaded automaticaly if you equip the rifle.  The machinegun uses the same bullet ammo as the camping rifle.</li>
+<li>The camping rifle is a kind of mixture of a sniper rifle and an assault gun.  It fires fast, medium-to-high damage, wall piercing projectiles and is fed with bullets ammo.  The primary mode feels very much like a standard sniper rifle and is harder to use than the nex due to the projectile ballistics.  The secondary mode can be used to empty the whole magazine of bullets in an quick burst.  This firemode is less wall piercing and has some spread to it but is deadly at mid-to-close range.  The magazine is reloaded automaticaly if you equip the rifle.  The machinegun uses the same bullet ammo as the camping rifle.</li>
 </ul>
 <ul>
 <li>The hagar can be compared to the plasma gun from Quake3.  It has a very high rate of fire, with moderate damage, and some splash damage.  The primary fire mode shoots small projectile missiles at high speed and an extraordinary rate of fire.  The secondary fire mode shoots the same missiles, but at a slower speed and rate of fire, and without the instant trigger.  This means that they will bounce once when hitting a floor or wall, giving you the opportunity to fire around corners, or double your chances to hit someone by spamming an area.  The hagar uses rocket ammo which is shared with the mortar, TAG and the rocket launcher.</li>

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2009-01-03 19:57:05 UTC (rev 5394)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2009-01-03 19:59:48 UTC (rev 5395)
@@ -732,7 +732,6 @@
 	self.movetype = MOVETYPE_NONE;
 	self.solid = SOLID_NOT;
 	SetBrushEntityModel();
-	self.model = "";
 	if (!self.cnt)
 		self.cnt = 12;
 	if (!self.count)