r5346 - in branches/nexuiz-2.0: . data data/models/weapons data/qcsrc/server data/textures modelsource

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Mon Dec 29 08:25:45 EST 2008


Author: div0
Date: 2008-12-29 08:25:45 -0500 (Mon, 29 Dec 2008)
New Revision: 5346

Added:
   branches/nexuiz-2.0/data/textures/crifleflashider.tga
   branches/nexuiz-2.0/data/textures/crifleflashider_bump.tga
   branches/nexuiz-2.0/data/textures/crifleflashider_gloss.tga
   branches/nexuiz-2.0/modelsource/modelsource-campingrifle.zip
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/build-compat-pack.sh
   branches/nexuiz-2.0/data/models/weapons/g_campingrifle.md3
   branches/nexuiz-2.0/data/models/weapons/v_campingrifle.md3
   branches/nexuiz-2.0/data/models/weapons/w_campingrifle.zym
   branches/nexuiz-2.0/data/qcsrc/server/extensions.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
   branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
   branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc
Log:
r5339 | div0 | 2008-12-28 23:56:13 +0100 (Sun, 28 Dec 2008) | 3 lines
always add MF_ROTATE for pickup weapons; makes all weapon models rotate, regardless of their flags
(this is so one can use zym files renamed to md3 as model files, to save space, as md3s are HUGE)
r5340 | div0 | 2008-12-29 10:19:56 +0100 (Mon, 29 Dec 2008) | 2 lines
set a (somewhat) working modelindex for shared entities
r5341 | div0 | 2008-12-29 10:24:24 +0100 (Mon, 29 Dec 2008) | 2 lines
oops, make WPs nodepthtest again
r5342 | div0 | 2008-12-29 10:31:25 +0100 (Mon, 29 Dec 2008) | 2 lines
DP_NULL_MODEL
r5343 | div0 | 2008-12-29 12:35:53 +0100 (Mon, 29 Dec 2008) | 2 lines
slightly updated crifle
r5344 | div0 | 2008-12-29 14:22:22 +0100 (Mon, 29 Dec 2008) | 2 lines
shot origin argh
r5345 | div0 | 2008-12-29 14:24:16 +0100 (Mon, 29 Dec 2008) | 2 lines
CR source

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/.patchsets	2008-12-29 13:25:45 UTC (rev 5346)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5337
+revisions_applied = 1-5345

Modified: branches/nexuiz-2.0/data/build-compat-pack.sh
===================================================================
--- branches/nexuiz-2.0/data/build-compat-pack.sh	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/build-compat-pack.sh	2008-12-29 13:25:45 UTC (rev 5346)
@@ -554,6 +554,9 @@
 	textures/campingrifle_pants.tga
 	textures/campingrifle_shirt.tga
 	textures/campingrifle.tga
+	textures/crifleflashider_bump.tga
+	textures/crifleflashider_gloss.tga
+	textures/crifleflashider.tga
 	textures/flags/flag_blue_cloth.tga
 	textures/flags/flag_blue_gloss.tga
 	textures/flags/flag_blue_glow.tga

Modified: branches/nexuiz-2.0/data/models/weapons/g_campingrifle.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/weapons/v_campingrifle.md3
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/weapons/w_campingrifle.zym
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/server/extensions.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/extensions.qh	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/qcsrc/server/extensions.qh	2008-12-29 13:25:45 UTC (rev 5346)
@@ -487,6 +487,15 @@
 //description:
 //MOVETYPE_BOUNCE but without gravity, and with full reflection (no speed loss like grenades have), in other words - bouncing laser bolts.
 
+//DP_NULL_MODEL
+//idea: Chris
+//darkplaces implementation: div0
+//definitions:
+//string dp_null_model = "null";
+//description:
+//setmodel(e, "null"); makes an entity invisible, have a zero bbox, but
+//networked. useful for shared CSQC entities.
+
 //DP_MOVETYPEFOLLOW
 //idea: id Software, LordHavoc (redesigned)
 //darkplaces implementation: LordHavoc

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2008-12-29 13:25:45 UTC (rev 5346)
@@ -600,11 +600,13 @@
 	self.SendFlags = 7;
 	if(!self.modelindex)
 	{
-		self.modelindex = 4.2;
-		self.origin += self.mins;
-		self.maxs = self.maxs - self.mins;
+		vector misave, masave;
+		misave = self.mins;
+		masave = self.maxs;
+		setmodel(self, "null");
+		setorigin(self, self.origin + misave);
+		setsize(self, '0 0 0', masave - misave);
 	}
-	self.model = "net_entity";
 	if(!self.cnt)
 		self.cnt = particleeffectnum(self.mdl);
 	IFTARGETED
@@ -698,8 +700,7 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = rainsnow_SendEntity;
 	self.Version = 1;
-	self.modelindex = 1;
-	self.model = "net_entity";
+	setmodel(self, "null");
 };
 
 
@@ -739,8 +740,7 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = rainsnow_SendEntity;
 	self.Version = 1;
-	self.modelindex = 1;
-	self.model = "net_entity";
+	setmodel(self, "null");
 };
 
 
@@ -957,8 +957,7 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = laser_SendEntity;
 	self.SendFlags = 15;
-	self.modelindex = 1;
-	self.model = "net_entity";
+	setmodel(self, "null");
 	self.mangle = self.angles;
 
 	IFTARGETED

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2008-12-29 13:25:45 UTC (rev 5346)
@@ -1148,6 +1148,7 @@
 void precache()
 {
 	// gamemode related things
+	precache_model ("null");
 	precache_model ("models/misc/chatbubble.spr");
 	precache_model ("models/misc/teambubble.spr");
 	if (g_runematch)
@@ -1544,8 +1545,7 @@
 
 void Net_LinkEntity(entity e)
 {
-	e.model = "net_entity";
-	e.modelindex = 1;
+	setmodel(e, "null");
 	e.effects = EF_NODEPTHTEST | EF_LOWPRECISION;
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2008-12-29 13:25:45 UTC (rev 5346)
@@ -495,6 +495,8 @@
 		setsize (self, '-16 -16 0', '16 16 48');
 	else
 		setsize (self, '-16 -16 0', '16 16 32');
+	if(itemflags & FL_WEAPON)
+		self.modelflags |= MF_ROTATE;
 
 	if (self.classname != "droppedweapon") // if dropped, colormap is already set up nicely
 	if (itemflags & FL_WEAPON)

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc	2008-12-29 13:25:45 UTC (rev 5346)
@@ -25,7 +25,7 @@
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_nails -= pAmmo;
 
-	W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/campingrifle_fire.wav");
+	W_SetupShot (self, '32 8 -8', FALSE, 2, "weapons/campingrifle_fire.wav");
 	pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1);
 
 	if(self.BUTTON_ZOOM) // if zoomed, shoot from the eye

Modified: branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc	2008-12-29 13:24:16 UTC (rev 5345)
+++ branches/nexuiz-2.0/data/qcsrc/server/waypointsprites.qc	2008-12-29 13:25:45 UTC (rev 5346)
@@ -29,7 +29,7 @@
 {
 	if(o != e.origin)
 	{
-		e.origin = o;
+		setorigin(e, o);
 		e.SendFlags |= 128;
 	}
 }
@@ -244,8 +244,7 @@
 	wp.nextthink = time;
 	wp.effects = EF_NODEPTHTEST | EF_LOWPRECISION;
 	wp.model1 = spr;
-	wp.model = "net_entity";
-	wp.modelindex = 1;
+	setmodel(wp, "null");
 	wp.SendEntity = WaypointSprite_SendEntity;
 	wp.customizeentityforclient = WaypointSprite_Customize;
 	wp.waypointsprite_visible_for_player = WaypointSprite_visible_for_player;
@@ -287,7 +286,7 @@
 	vector ofs
 )
 {
-	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, self, 0, self, waypointsprite_deployed_personal, FALSE);
+	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, self, waypointsprite_deployed_personal, FALSE);
 }
 
 .entity waypointsprite_attached;

Copied: branches/nexuiz-2.0/data/textures/crifleflashider.tga (from rev 5345, trunk/data/textures/crifleflashider.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/crifleflashider_bump.tga (from rev 5345, trunk/data/textures/crifleflashider_bump.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/crifleflashider_gloss.tga (from rev 5345, trunk/data/textures/crifleflashider_gloss.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/modelsource/modelsource-campingrifle.zip (from rev 5345, trunk/modelsource/modelsource-campingrifle.zip)
===================================================================
(Binary files differ)




More information about the nexuiz-commits mailing list