r2680 - in branches/nexuiz-2.0/data: models qcsrc/server sound/misc textures

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-05-23 15:24:36 -0400 (Wed, 23 May 2007)
New Revision: 2680

Added:
   branches/nexuiz-2.0/data/models/hook.md3
   branches/nexuiz-2.0/data/sound/misc/spawn.ogg
   branches/nexuiz-2.0/data/textures/hook.tga
   branches/nexuiz-2.0/data/textures/hook_gloss.tga
   branches/nexuiz-2.0/data/textures/hook_glow.tga
   branches/nexuiz-2.0/data/textures/hook_norm.tga
Removed:
   branches/nexuiz-2.0/data/sound/misc/spawn.wav
Modified:
   branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/sound/misc/talk2.wav
Log:
merged from trunk: 2677-2679 (tzorks hook, larger hook, adjusted origin, spawn sound, talk2 sound)


Copied: branches/nexuiz-2.0/data/models/hook.md3 (from rev 2678, trunk/data/models/hook.md3)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2007-05-23 19:21:48 UTC (rev 2679)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2007-05-23 19:24:36 UTC (rev 2680)
@@ -150,15 +150,8 @@
 		org = org + dir*50; // get the beam out of the player's eyes
 	}
 
-	WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
-	WriteByte (MSG_BROADCAST, TE_BEAM);
-	WriteEntity (MSG_BROADCAST, self);
-	WriteCoord (MSG_BROADCAST, self.origin_x);
-	WriteCoord (MSG_BROADCAST, self.origin_y);
-	WriteCoord (MSG_BROADCAST, self.origin_z);
-	WriteCoord (MSG_BROADCAST, org_x);
-	WriteCoord (MSG_BROADCAST, org_y);
-	WriteCoord (MSG_BROADCAST, org_z);
+	makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0');
+	te_beam(self, self.origin + v_forward * (-9), org);
 }
 
 void GrapplingHookTouch (void)
@@ -226,7 +219,7 @@
 	missile.movetype = MOVETYPE_FLY;
 	missile.solid = SOLID_BBOX;
 
-	setmodel (missile, "models/ebomb.mdl"); // precision set below
+	setmodel (missile, "models/hook.md3"); // precision set below
 	setsize (missile, '-3 -3 -3', '3 3 3');
 	setorigin (missile, org);
 
@@ -242,7 +235,7 @@
 	missile.think = GrapplingHookThink;
 	missile.nextthink = time + 0.1;
 
-	missile.effects = EF_FULLBRIGHT | EF_ADDITIVE | EF_LOWPRECISION;
+	missile.effects = /*EF_FULLBRIGHT | EF_ADDITIVE |*/ EF_LOWPRECISION;
 
 	missile.health = cvar("g_balance_grapplehook_health");//120
 	missile.event_damage = GrapplingHook_Damage;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-05-23 19:21:48 UTC (rev 2679)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-05-23 19:24:36 UTC (rev 2680)
@@ -147,6 +147,7 @@
 	precache_model ("models/gibs/gib2.mdl");
 	precache_model ("models/gibs/gib3.mdl");
 	precache_model ("models/gibs/gib5.md3");
+	precache_model ("models/hook.md3");
 	precache_sound ("misc/armorimpact.wav");
 	precache_sound ("misc/bodyimpact1.wav");
 	precache_sound ("misc/bodyimpact2.wav");

Copied: branches/nexuiz-2.0/data/sound/misc/spawn.ogg (from rev 2678, trunk/data/sound/misc/spawn.ogg)
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/sound/misc/spawn.wav
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/sound/misc/talk2.wav
===================================================================
(Binary files differ)

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

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

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

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