[nexuiz-commits] r7590 - in branches/nexuiz-2.0: . data/gfx data/gfx/hud data/models data/models/sprites data/models/weapons data/scripts data/sound/weapons data/textures

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-02 01:51:52 -0400 (Wed, 02 Sep 2009)
New Revision: 7590

Added:
   branches/nexuiz-2.0/data/gfx/crosshairfireball.tga
   branches/nexuiz-2.0/data/gfx/hud/inv_weapon15.tga
   branches/nexuiz-2.0/data/models/sphere/
   branches/nexuiz-2.0/data/models/sprites/wpn-fireball_frame0.tga
   branches/nexuiz-2.0/data/models/weapons/g_fireball.md3
   branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm
   branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm.framegroups
   branches/nexuiz-2.0/data/models/weapons/v_fireball.md3
   branches/nexuiz-2.0/data/scripts/fireball.shader
   branches/nexuiz-2.0/data/scripts/sphere.shader
   branches/nexuiz-2.0/data/sound/weapons/fireball_fire.wav
   branches/nexuiz-2.0/data/sound/weapons/fireball_fire2.wav
   branches/nexuiz-2.0/data/sound/weapons/fireball_fly.wav
   branches/nexuiz-2.0/data/sound/weapons/fireball_fly2.wav
   branches/nexuiz-2.0/data/sound/weapons/fireball_impact2.wav
   branches/nexuiz-2.0/data/sound/weapons/fireball_prefire2.wav
   branches/nexuiz-2.0/data/textures/fireball.tga
   branches/nexuiz-2.0/data/textures/fireball_gloss.tga
   branches/nexuiz-2.0/data/textures/fireball_glow.tga
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/models/sprites/make-sprites.sh
Log:
r7584 | div0 | 2009-09-01 16:02:50 -0400 (Tue, 01 Sep 2009) | 2 lines
[for 2.5.2] fireball weapon DATA
r7585 | div0 | 2009-09-01 16:04:59 -0400 (Tue, 01 Sep 2009) | 2 lines
needs HUD icon too
r7586 | div0 | 2009-09-01 16:05:50 -0400 (Tue, 01 Sep 2009) | 2 lines
fireball sounds
r7589 | div0 | 2009-09-02 01:51:22 -0400 (Wed, 02 Sep 2009) | 2 lines
slightly improved sounds for fireball


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-02 05:51:22 UTC (rev 7589)
+++ branches/nexuiz-2.0/.patchsets	2009-09-02 05:51:52 UTC (rev 7590)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7582
+revisions_applied = 1-7563,7565-7586,7589-7589

Copied: branches/nexuiz-2.0/data/gfx/crosshairfireball.tga (from rev 7586, trunk/data/gfx/crosshairfireball.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/gfx/hud/inv_weapon15.tga (from rev 7586, trunk/data/gfx/hud/inv_weapon15.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/sphere (from rev 7586, trunk/data/models/sphere)

Modified: branches/nexuiz-2.0/data/models/sprites/make-sprites.sh
===================================================================
--- branches/nexuiz-2.0/data/models/sprites/make-sprites.sh	2009-09-02 05:51:22 UTC (rev 7589)
+++ branches/nexuiz-2.0/data/models/sprites/make-sprites.sh	2009-09-02 05:51:52 UTC (rev 7590)
@@ -183,7 +183,7 @@
 sprite wpn-porto          "Port-O-Launch" 808080 000000 0.0 # grey
 sprite wpn-minstanex      "Minstanex"     80ffff 000000 0.0 # bright cyan
 sprite wpn-hookgun        "Hook"          008000 000000 0.0 # dark green
-sprite wpn-seeker         "Seeker"        ff8000 000000 0.0 # orange
+sprite wpn-fireball       "Fireball"      ff8000 000000 0.0 # orange
 sprite wpn-hlac           "HLAC"          00ff00 000000 0.0 # green
 sprite wpn-campingrifle   "Rifle"         80ff00 000000 0.0 # orange
 

Copied: branches/nexuiz-2.0/data/models/sprites/wpn-fireball_frame0.tga (from rev 7586, trunk/data/models/sprites/wpn-fireball_frame0.tga)
===================================================================
(Binary files differ)

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

Copied: branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm (from rev 7586, trunk/data/models/weapons/h_fireball.dpm)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm.framegroups (from rev 7586, trunk/data/models/weapons/h_fireball.dpm.framegroups)
===================================================================
--- branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm.framegroups	                        (rev 0)
+++ branches/nexuiz-2.0/data/models/weapons/h_fireball.dpm.framegroups	2009-09-02 05:51:52 UTC (rev 7590)
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload

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

Copied: branches/nexuiz-2.0/data/scripts/fireball.shader (from rev 7586, trunk/data/scripts/fireball.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/fireball.shader	                        (rev 0)
+++ branches/nexuiz-2.0/data/scripts/fireball.shader	2009-09-02 05:51:52 UTC (rev 7590)
@@ -0,0 +1,10 @@
+textures/fireball
+{
+	{
+		map textures/fireball
+		tcgen environment
+	}
+	{
+		map $lightmap
+	}
+}

Copied: branches/nexuiz-2.0/data/scripts/sphere.shader (from rev 7586, trunk/data/scripts/sphere.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/sphere.shader	                        (rev 0)
+++ branches/nexuiz-2.0/data/scripts/sphere.shader	2009-09-02 05:51:52 UTC (rev 7590)
@@ -0,0 +1,7 @@
+models/sphere/sphere
+{
+	cull none
+	{
+		map "models/sphere/sphere"
+	}
+}

Copied: branches/nexuiz-2.0/data/sound/weapons/fireball_fire.wav (from rev 7586, trunk/data/sound/weapons/fireball_fire.wav)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/weapons/fireball_fire2.wav (from rev 7586, trunk/data/sound/weapons/fireball_fire2.wav)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/weapons/fireball_fly.wav (from rev 7586, trunk/data/sound/weapons/fireball_fly.wav)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/weapons/fireball_fly2.wav (from rev 7586, trunk/data/sound/weapons/fireball_fly2.wav)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/weapons/fireball_impact2.wav (from rev 7586, trunk/data/sound/weapons/fireball_impact2.wav)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/weapons/fireball_prefire2.wav (from rev 7586, trunk/data/sound/weapons/fireball_prefire2.wav)
===================================================================
(Binary files differ)

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

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

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