[nexuiz-commits] r6624 - in branches/nexuiz-2.0: . data data/maps data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Apr 30 14:20:36 EDT 2009


Author: div0
Date: 2009-04-30 14:20:35 -0400 (Thu, 30 Apr 2009)
New Revision: 6624

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/effectinfo.txt
   branches/nexuiz-2.0/data/maps/eggandbacon.waypoints.cache
   branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
Log:
r6601 | mand1nga | 2009-04-28 03:02:04 +0200 (Tue, 28 Apr 2009) | 1 line
Fix eggandbacon.waypoints.cache
r6622 | morphed | 2009-04-30 16:34:57 +0200 (Thu, 30 Apr 2009) | 1 line
less smoke on explosions
r6623 | div0 | 2009-04-30 20:17:31 +0200 (Thu, 30 Apr 2009) | 2 lines
use InitializeEntity for onslaught too


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-30 18:17:31 UTC (rev 6623)
+++ branches/nexuiz-2.0/.patchsets	2009-04-30 18:20:35 UTC (rev 6624)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536,6541-6549,6552-6567,6572-6577,6580-6582,6585-6587,6592-6593,6598-6598,6603-6620
+revisions_applied = 1-6536,6541-6549,6552-6567,6572-6577,6580-6582,6585-6587,6592-6593,6598-6598,6601-6601,6603-6623

Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt	2009-04-30 18:17:31 UTC (rev 6623)
+++ branches/nexuiz-2.0/data/effectinfo.txt	2009-04-30 18:20:35 UTC (rev 6624)
@@ -1269,7 +1269,7 @@
 count 20
 size 20 40
 sizeincrease 34
-alpha 500 600 556
+alpha 300 550 556
 velocityjitter 256 256 256
 airfriction 5
 color 0x000000 0x111111
@@ -1808,13 +1808,13 @@
 // fire effect which make bright dot inside
 effect hagar_explode
 notunderwater
-count 12
+count 10
 type smoke
 tex 48 55
 color 0xffe955 0xff5a00
 size 16 26
 sizeincrease 5
-alpha 128 256 456
+alpha 80 200 356
 bounce 1.5
 airfriction 8
 liquidfriction 8
@@ -1834,7 +1834,7 @@
 airfriction 12
 liquidfriction 8
 originjitter 8 8 8
-velocityjitter 256 256 256
+velocityjitter 286 286 286
 
 // smoke
 effect hagar_explode
@@ -1844,7 +1844,7 @@
 count 20
 size 20 40
 sizeincrease 20
-alpha 500 600 556
+alpha 200 500 600
 velocityjitter 244 244 244
 airfriction 5
 color 0x000000 0x111111
@@ -2031,7 +2031,7 @@
 count 64
 size 20 40
 sizeincrease 44
-alpha 400 500 456
+alpha 200 450 456
 velocityjitter 444 444 444
 airfriction 5
 color 0x000000 0x111111

Modified: branches/nexuiz-2.0/data/maps/eggandbacon.waypoints.cache
===================================================================
--- branches/nexuiz-2.0/data/maps/eggandbacon.waypoints.cache	2009-04-30 18:17:31 UTC (rev 6623)
+++ branches/nexuiz-2.0/data/maps/eggandbacon.waypoints.cache	2009-04-30 18:20:35 UTC (rev 6624)
@@ -3,6 +3,7 @@
 '-1773.3 -268.4 478.3'*'-1568.0 -256.0 122.0'
 '-1773.3 -268.4 478.3'*'-1568.0 -320.0 122.0'
 '-1773.3 -268.4 478.3'*'-1568.0 -192.0 122.0'
+'-1773.3 -268.4 478.3'*'-1768.0 -712.0 497.0'
 '-1773.3 -268.4 478.3'*'-1504.0 -384.0 122.0'
 '-1773.3 -268.4 478.3'*'-1773.3 -742.1 478.3'
 '-1773.3 -268.4 478.3'*'-1664.0 -576.0 122.0'
@@ -29,7 +30,7 @@
 '-1773.3 -268.4 478.3'*'-1568.0 320.0 122.0'
 '-1773.3 -268.4 478.3'*'-1376.0 256.0 122.0'
 '-1773.3 -268.4 478.3'*'-1632.0 384.0 122.0'
-'-1773.3 -268.4 478.3'*'-1440.0 320.0 122.0'
+'-1773.3 -742.1 478.3'*'-1768.0 -712.0 497.0'
 '-1773.3 -742.1 478.3'*'-1664.0 -576.0 122.0'
 '-1773.3 -742.1 478.3'*'-1600.0 -576.0 122.0'
 '-1773.3 -742.1 478.3'*'-1536.0 -576.0 122.0'
@@ -75,6 +76,7 @@
 '1767.7 142.1 472.1'*'1568.0 -256.0 122.0'
 '1767.7 142.1 472.1'*'1664.0 576.0 122.0'
 '1767.7 142.1 472.1'*'1344.0   0.0 122.0'
+'1767.7 142.1 472.1'*'1768.0 712.0 497.0'
 '1767.7 142.1 472.1'*'1768.3 720.2 472.1'
 '1767.7 142.1 472.1'*'1376.0 384.0 122.0'
 '1767.7 142.1 472.1'*'1600.0 576.0 122.0'
@@ -88,7 +90,7 @@
 '1767.7 142.1 472.1'*'1376.0 -256.0 122.0'
 '1767.7 142.1 472.1'*'1440.0 -320.0 122.0'
 '1767.7 142.1 472.1'*'1504.0 -384.0 122.0'
-'1767.7 142.1 472.1'*'1280.0 576.0 122.0'
+'1768.3 720.2 472.1'*'1768.0 712.0 497.0'
 '1768.3 720.2 472.1'*'1664.0 576.0 122.0'
 '1768.3 720.2 472.1'*'1600.0 576.0 122.0'
 '1768.3 720.2 472.1'*'1536.0 576.0 122.0'
@@ -1199,6 +1201,66 @@
 '-1768.0 712.0 498.0'*'-833.4 432.7  88.1'
 '-1768.0 712.0 498.0'*'-1440.0 -256.0 122.0'
 '-1768.0 712.0 498.0'*'-1376.0 -256.0 122.0'
+'1768.0 712.0 497.0'*'1768.3 720.2 472.1'
+'1768.0 712.0 497.0'*'1664.0 576.0 122.0'
+'1768.0 712.0 497.0'*'1600.0 576.0 122.0'
+'1768.0 712.0 497.0'*'1536.0 576.0 122.0'
+'1768.0 712.0 497.0'*'1472.0 576.0 122.0'
+'1768.0 712.0 497.0'*'1632.0 384.0 122.0'
+'1768.0 712.0 497.0'*'1504.0 384.0 122.0'
+'1768.0 712.0 497.0'*'1767.7 142.1 472.1'
+'1768.0 712.0 497.0'*'1568.0 320.0 122.0'
+'1768.0 712.0 497.0'*'1568.0 256.0 122.0'
+'1768.0 712.0 497.0'*'1280.0 576.0 122.0'
+'1768.0 712.0 497.0'*'1376.0 384.0 122.0'
+'1768.0 712.0 497.0'*'1440.0 320.0 122.0'
+'1768.0 712.0 497.0'*'1568.0 192.0 122.0'
+'1768.0 712.0 497.0'*'1440.0 256.0 122.0'
+'1768.0 712.0 497.0'*'1376.0 256.0 122.0'
+'1768.0 712.0 497.0'*'1440.0 192.0 122.0'
+'1768.0 712.0 497.0'*'1408.0  64.0 122.0'
+'1768.0 712.0 497.0'*'1472.0   0.0 122.0'
+'1768.0 712.0 497.0'*'1408.0   0.0 122.0'
+'1768.0 712.0 497.0'*'1344.0   0.0 122.0'
+'1768.0 712.0 497.0'*'1408.0 -64.0 122.0'
+'1768.0 712.0 497.0'*'1568.0 -192.0 122.0'
+'1768.0 712.0 497.0'*'1440.0 -192.0 122.0'
+'1768.0 712.0 497.0'*'819.8 569.8  88.1'
+'1768.0 712.0 497.0'*'1568.0 -256.0 122.0'
+'1768.0 712.0 497.0'*'1504.0 -256.0 122.0'
+'1768.0 712.0 497.0'*'1440.0 -256.0 122.0'
+'1768.0 712.0 497.0'*'835.7 277.9  88.1'
+'1768.0 712.0 497.0'*'1376.0 -256.0 122.0'
+'-1768.0 -712.0 497.0'*'-1773.3 -742.1 478.3'
+'-1768.0 -712.0 497.0'*'-1664.0 -576.0 122.0'
+'-1768.0 -712.0 497.0'*'-1600.0 -576.0 122.0'
+'-1768.0 -712.0 497.0'*'-1773.3 -268.4 478.3'
+'-1768.0 -712.0 497.0'*'-1536.0 -576.0 122.0'
+'-1768.0 -712.0 497.0'*'-1472.0 -576.0 122.0'
+'-1768.0 -712.0 497.0'*'-1632.0 -384.0 122.0'
+'-1768.0 -712.0 497.0'*'-1504.0 -384.0 122.0'
+'-1768.0 -712.0 497.0'*'-1568.0 -320.0 122.0'
+'-1768.0 -712.0 497.0'*'-1568.0 -256.0 122.0'
+'-1768.0 -712.0 497.0'*'-1280.0 -576.0 122.0'
+'-1768.0 -712.0 497.0'*'-1376.0 -384.0 122.0'
+'-1768.0 -712.0 497.0'*'-1440.0 -320.0 122.0'
+'-1768.0 -712.0 497.0'*'-1568.0 -192.0 122.0'
+'-1768.0 -712.0 497.0'*'-1440.0 -256.0 122.0'
+'-1768.0 -712.0 497.0'*'-1376.0 -256.0 122.0'
+'-1768.0 -712.0 497.0'*'-1440.0 -192.0 122.0'
+'-1768.0 -712.0 497.0'*'-1773.3  75.0 478.3'
+'-1768.0 -712.0 497.0'*'-1408.0 -64.0 122.0'
+'-1768.0 -712.0 497.0'*'-1472.0   0.0 122.0'
+'-1768.0 -712.0 497.0'*'-1408.0   0.0 122.0'
+'-1768.0 -712.0 497.0'*'-1344.0   0.0 122.0'
+'-1768.0 -712.0 497.0'*'-1408.0  64.0 122.0'
+'-1768.0 -712.0 497.0'*'-1568.0 192.0 122.0'
+'-1768.0 -712.0 497.0'*'-1440.0 192.0 122.0'
+'-1768.0 -712.0 497.0'*'-1568.0 256.0 122.0'
+'-1768.0 -712.0 497.0'*'-790.9 -586.6  88.1'
+'-1768.0 -712.0 497.0'*'-1504.0 256.0 122.0'
+'-1768.0 -712.0 497.0'*'-1440.0 256.0 122.0'
+'-1768.0 -712.0 497.0'*'-1376.0 256.0 122.0'
 '1232.0 -416.0  96.0'*'1781.8 -416.0 526.5'
 '-1232.0 416.0  96.0'*'-1781.8 416.0 526.5'
 '1504.0 -256.0 122.0'*'1440.0 -256.0 122.0'

Modified: branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-04-30 18:17:31 UTC (rev 6623)
+++ branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-04-30 18:20:35 UTC (rev 6624)
@@ -627,6 +627,7 @@
 	e.team = self.team;
 	self.think = onslaught_generator_delayed;
 	self.nextthink = time + 0.2;
+	InitializeEntity(self, onslaught_generator_delayed, INITPRIO_LAST);
 
 	WaypointSprite_SpawnFixed(string_null, e.origin + '0 0 1' * e.maxs_z, self, sprite);
 	WaypointSprite_UpdateRule(self.sprite, COLOR_TEAM2, SPRITERULE_TEAMPLAY);
@@ -976,7 +977,6 @@
 	}
 	if (self.target == "" || self.target2 == "")
 		objerror("target and target2 must be set\n");
-	self.think = onslaught_link_delayed;
-	self.nextthink = time + 0.1;
+	InitializeEntity(self, onslaught_link_delayed, INITPRIO_FINDTARGET);
 	Net_LinkEntity(self, FALSE, 0, onslaught_link_send);
 };



More information about the nexuiz-commits mailing list