r3201 - in trunk/data: models/items qcsrc/server textures

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-20 16:39:44 -0500 (Sun, 20 Jan 2008)
New Revision: 3201

Added:
   trunk/data/models/items/g_armormedium.md3
   trunk/data/textures/electroskin_bump.tga
   trunk/data/textures/electroskin_gloss.tga
   trunk/data/textures/glaunch_bump.tga
   trunk/data/textures/glaunch_gloss.tga
   trunk/data/textures/hagar_gloss.tga
   trunk/data/textures/shard.tga
   trunk/data/textures/shard_gloss.tga
   trunk/data/textures/shard_glow.tga
   trunk/data/textures/shard_norm.tga
Removed:
   trunk/data/models/items/g_a25.md3_0.skin
   trunk/data/models/items/g_a25.md3_1.skin
   trunk/data/textures/hagar_spec.tga
   trunk/data/textures/lahalfskin.tga
   trunk/data/textures/lahalfskin_glow.tga
   trunk/data/textures/sahalfskin.tga
   trunk/data/textures/sahalfskin_glow.tga
Modified:
   trunk/data/models/items/g_a1.md3
   trunk/data/models/items/g_h100.md3
   trunk/data/qcsrc/server/t_items.qc
Log:
New models for health/armor by tZork, and new GL and Electro skins by ihasn


Modified: trunk/data/models/items/g_a1.md3
===================================================================
(Binary files differ)

Deleted: trunk/data/models/items/g_a25.md3_0.skin
===================================================================
--- trunk/data/models/items/g_a25.md3_0.skin	2008-01-20 17:59:59 UTC (rev 3200)
+++ trunk/data/models/items/g_a25.md3_0.skin	2008-01-20 21:39:44 UTC (rev 3201)
@@ -1,2 +0,0 @@
-objBox05,saskin.tga
-Tube02,laskin.tga

Deleted: trunk/data/models/items/g_a25.md3_1.skin
===================================================================
--- trunk/data/models/items/g_a25.md3_1.skin	2008-01-20 17:59:59 UTC (rev 3200)
+++ trunk/data/models/items/g_a25.md3_1.skin	2008-01-20 21:39:44 UTC (rev 3201)
@@ -1,2 +0,0 @@
-objBox05,sahalfskin.tga
-Tube02,lahalfskin.tga

Added: trunk/data/models/items/g_armormedium.md3
===================================================================
(Binary files differ)


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

Modified: trunk/data/models/items/g_h100.md3
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-01-20 17:59:59 UTC (rev 3200)
+++ trunk/data/qcsrc/server/t_items.qc	2008-01-20 21:39:44 UTC (rev 3201)
@@ -698,8 +698,7 @@
 		self.armorvalue = g_pickup_armormedium;
 	if(!self.max_armorvalue)
 		self.max_armorvalue = g_pickup_armormedium_max;
-	self.skin = 1; // "weaker" skin
-	StartItem ("models/items/g_a25.md3", "misc/armor25.wav", 30, "25 Armor", IT_ARMOR, 0, commodity_pickupevalfunc, 2000);
+	StartItem ("models/items/g_armormedium.md3", "misc/armor1.wav", 30, "25 Armor", IT_ARMOR, 0, commodity_pickupevalfunc, 2000);
 }
 
 void item_armor_large (void) {

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


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

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


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

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


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

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


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

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


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

Deleted: trunk/data/textures/hagar_spec.tga
===================================================================
(Binary files differ)

Deleted: trunk/data/textures/lahalfskin.tga
===================================================================
(Binary files differ)

Deleted: trunk/data/textures/lahalfskin_glow.tga
===================================================================
(Binary files differ)

Deleted: trunk/data/textures/sahalfskin.tga
===================================================================
(Binary files differ)

Deleted: trunk/data/textures/sahalfskin_glow.tga
===================================================================
(Binary files differ)

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


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

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


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

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


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

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


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