r3439 - in trunk/data: models/gibs qcsrc/server textures

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Feb 27 03:22:14 EST 2008


Author: lordhavoc
Date: 2008-02-27 03:22:11 -0500 (Wed, 27 Feb 2008)
New Revision: 3439

Added:
   trunk/data/models/gibs/arm.md3
   trunk/data/models/gibs/chest.md3
   trunk/data/models/gibs/leg1.md3
   trunk/data/models/gibs/leg2.md3
   trunk/data/models/gibs/smallchest.md3
   trunk/data/textures/meat.tga
   trunk/data/textures/meat_gloss.tga
   trunk/data/textures/meat_norm.tga
Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/g_violence.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
implemented Morphed's new gibs


Added: trunk/data/models/gibs/arm.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/gibs/arm.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/gibs/chest.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/gibs/chest.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/gibs/leg1.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/gibs/leg1.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/gibs/leg2.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/gibs/leg2.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/gibs/smallchest.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/gibs/smallchest.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-02-27 06:02:41 UTC (rev 3438)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-02-27 08:22:11 UTC (rev 3439)
@@ -310,29 +310,38 @@
 		te_bloodshower (self.origin + self.mins, self.origin + self.maxs, 1200 * multiplier, 1000);
 
 		// make a meaty mess
-		TossGib (self, "models/gibs/eye.md3", self.origin, self.velocity,0);
-		TossGib (world, "models/gibs/bloodyskull.md3", self.origin, '0 0 600',0);
+		TossGib (self, "models/gibs/eye.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+		TossGib (world, "models/gibs/bloodyskull.md3", self.origin + self.view_ofs, self.velocity,0);
 
 		local float c;
 		c = 0;
 		while (c < multiplier)
 		{
 			c = c + 1;
-			TossGib (world, "models/gibs/gib1.md3", self.origin, self.velocity,0);
-			//TossGib (world, "models/gibs/gib2.md3", self.origin, self.velocity,0);
-			TossGib (world, "models/gibs/gib1.mdl", self.origin, self.velocity,0);
-			//TossGib (world, "models/gibs/gib3.md3", self.origin, self.velocity,0);
-			TossGib (world, "models/gibs/gib2.mdl", self.origin, self.velocity,0);
-			//TossGib (world, "models/gibs/gib4.md3", self.origin, self.velocity,0);
-			TossGib (world, "models/gibs/gib3.mdl", self.origin, self.velocity,0);
+			//TossGib (world, "models/gibs/gib1.md3", self.origin, self.velocity + randomvec() * 450,0);
+			//TossGib (world, "models/gibs/gib2.md3", self.origin, self.velocity + randomvec() * 450,0);
+			//TossGib (world, "models/gibs/gib3.md3", self.origin, self.velocity + randomvec() * 450,0);
+			//TossGib (world, "models/gibs/gib4.md3", self.origin, self.velocity + randomvec() * 450,0);
+			//TossGib (world, "models/gibs/gib5.md3", self.origin, self.velocity + randomvec() * 450,0);
+			//TossGib (world, "models/gibs/gib6.md3", self.origin, self.velocity + randomvec() * 450,0);
 
-			// these destory on impact
-			TossGib (world, "models/gibs/gib5.md3", self.origin, '-500 0 450',1);
-			//TossGib (world, "models/gibs/gib6.md3", self.origin, '0 500 450',1);
-			TossGib (world, "models/gibs/chunk.mdl", self.origin, '0 -500 450',1);
-			TossGib (world, "models/gibs/chunk.mdl", self.origin, '500 0 450',1);
-			TossGib (world, "models/gibs/chunk.mdl", self.origin, self.velocity,1);
-			TossGib (world, "models/gibs/chunk.mdl", self.origin, '0 0 450',1);
+			TossGib (world, "models/gibs/arm.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+			TossGib (world, "models/gibs/arm.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+			//TossGib (world, "models/gibs/arm.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+			//TossGib (world, "models/gibs/arm.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+			TossGib (world, "models/gibs/chest.md3", self.origin + self.view_ofs * 0.5, self.velocity + randomvec() * 150,0);
+			//TossGib (world, "models/gibs/smallchest.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+			TossGib (world, "models/gibs/smallchest.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
+			TossGib (world, "models/gibs/leg1.md3", self.origin + self.view_ofs * -0.2, self.velocity + randomvec() * 150,0);
+			TossGib (world, "models/gibs/leg2.md3", self.origin + self.view_ofs * -0.4, self.velocity + randomvec() * 150,0);
+			//TossGib (world, "models/gibs/leg1.md3", self.origin + self.view_ofs * -0.2, self.velocity + randomvec() * 150,0);
+			//TossGib (world, "models/gibs/leg2.md3", self.origin + self.view_ofs * -0.4, self.velocity + randomvec() * 150,0);
+
+			// these splat on impact
+			TossGib (world, "models/gibs/chunk.mdl", self.origin, self.velocity + randomvec() * 450,1);
+			TossGib (world, "models/gibs/chunk.mdl", self.origin, self.velocity + randomvec() * 450,1);
+			TossGib (world, "models/gibs/chunk.mdl", self.origin, self.velocity + randomvec() * 450,1);
+			TossGib (world, "models/gibs/chunk.mdl", self.origin, self.velocity + randomvec() * 450,1);
 		}
 
 		sound (self, CHAN_VOICE, "misc/gib.wav", 1, ATTN_NORM);

Modified: trunk/data/qcsrc/server/g_violence.qc
===================================================================
--- trunk/data/qcsrc/server/g_violence.qc	2008-02-27 06:02:41 UTC (rev 3438)
+++ trunk/data/qcsrc/server/g_violence.qc	2008-02-27 08:22:11 UTC (rev 3439)
@@ -84,8 +84,8 @@
 	if (destroyontouch == 1)
 		gib.touch = GibTouch;
 
-	gib.velocity = v + randomvec() * 450;
-	gib.avelocity = randomvec() * 300;
+	gib.velocity = v + randomvec();
+	gib.avelocity = randomvec() * vlen(gib.velocity);
 	gib.oldvelocity = gib.velocity;
 
 	SUB_SetFade (gib, time + 12 + random () * 4, 1);

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-02-27 06:02:41 UTC (rev 3438)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-02-27 08:22:11 UTC (rev 3439)
@@ -985,10 +985,16 @@
 	precache_model ("models/gibs/chunk.mdl");
 	precache_model ("models/gibs/eye.md3");
 	precache_model ("models/gibs/gib1.md3");
-	precache_model ("models/gibs/gib1.mdl");
-	precache_model ("models/gibs/gib2.mdl");
-	precache_model ("models/gibs/gib3.mdl");
+	precache_model ("models/gibs/gib2.md3");
+	precache_model ("models/gibs/gib3.md3");
+	precache_model ("models/gibs/gib4.md3");
 	precache_model ("models/gibs/gib5.md3");
+	precache_model ("models/gibs/gib6.md3");
+	precache_model ("models/gibs/smallchest.md3");
+	precache_model ("models/gibs/chest.md3");
+	precache_model ("models/gibs/arm.md3");
+	precache_model ("models/gibs/leg1.md3");
+	precache_model ("models/gibs/leg2.md3");
 	precache_model ("models/hook.md3");
 	precache_sound ("misc/armorimpact.wav");
 	precache_sound ("misc/bodyimpact1.wav");

Added: trunk/data/textures/meat.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/meat.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/meat_gloss.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/meat_gloss.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/meat_norm.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/meat_norm.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the nexuiz-commits mailing list