r1904 - in branches/nexuiz-2.0/data: models/weapons textures

[savagex at icculus.org]

Author: savagex
Date: 2006-11-05 12:26:38 -0500 (Sun, 05 Nov 2006)
New Revision: 1904

Added:
   branches/nexuiz-2.0/data/textures/shotgun_bump.tga
   branches/nexuiz-2.0/data/textures/shotgun_gloss.tga
   branches/nexuiz-2.0/data/textures/shotgun_glow.tga
Removed:
   branches/nexuiz-2.0/data/textures/shotgun_bump.jpg
Modified:
   branches/nexuiz-2.0/data/models/weapons/g_shotgun.md3
   branches/nexuiz-2.0/data/models/weapons/v_shotgun.md3
   branches/nexuiz-2.0/data/models/weapons/w_shotgun.zym
   branches/nexuiz-2.0/data/textures/shotgun.tga
   branches/nexuiz-2.0/data/textures/shotgun_pants.tga
   branches/nexuiz-2.0/data/textures/shotgun_shirt.tga
Log:
merge new shotgun into branch


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

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

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

Modified: branches/nexuiz-2.0/data/textures/shotgun.tga
===================================================================
(Binary files differ)

Deleted: branches/nexuiz-2.0/data/textures/shotgun_bump.jpg
===================================================================
(Binary files differ)

Added: branches/nexuiz-2.0/data/textures/shotgun_bump.tga
===================================================================
(Binary files differ)


Property changes on: branches/nexuiz-2.0/data/textures/shotgun_bump.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/nexuiz-2.0/data/textures/shotgun_gloss.tga
===================================================================
(Binary files differ)


Property changes on: branches/nexuiz-2.0/data/textures/shotgun_gloss.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/nexuiz-2.0/data/textures/shotgun_glow.tga
===================================================================
(Binary files differ)


Property changes on: branches/nexuiz-2.0/data/textures/shotgun_glow.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/nexuiz-2.0/data/textures/shotgun_pants.tga
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/textures/shotgun_shirt.tga
===================================================================
(Binary files differ)