[nexuiz-commits] r6660 - in trunk/data: models/onslaught qcsrc/server scripts textures

[DONOTREPLY at icculus.org]

Author: morphed
Date: 2009-05-04 09:51:27 -0400 (Mon, 04 May 2009)
New Revision: 6660

Added:
   trunk/data/models/onslaught/generator_dead.md3
   trunk/data/models/onslaught/generator_dmg1.md3
   trunk/data/models/onslaught/generator_dmg2.md3
   trunk/data/scripts/onslaught.shader
   trunk/data/textures/generator_shield.tga
   trunk/data/textures/ons_shield.tga
Removed:
   trunk/data/models/onslaught/reactor_dead.md3
   trunk/data/models/onslaught/reactor_dmg1.md3
   trunk/data/models/onslaught/reactor_dmg2.md3
   trunk/data/textures/shield.tga
   trunk/data/textures/shield_gloss.tga
   trunk/data/textures/shield_glow.tga
   trunk/data/textures/shield_norm.tga
   trunk/data/textures/shield_seamless(2nd texture).tga
   trunk/data/textures/shield_seamless(2nd texture)_gloss.tga
Modified:
   trunk/data/models/onslaught/controlpoint_shield.md3
   trunk/data/models/onslaught/generator_shield.md3
   trunk/data/qcsrc/server/mode_onslaught.qc
   trunk/data/textures/core_dmg1.tga
   trunk/data/textures/core_dmg1_glow.tga
   trunk/data/textures/core_dmg2.tga
   trunk/data/textures/core_dmg2_glow.tga
Log:
onslaught: more consistent generator model names (+ small code changes for that) , lower resolution of generators texture, new shield fx

Modified: trunk/data/models/onslaught/controlpoint_shield.md3
===================================================================
(Binary files differ)

Added: trunk/data/models/onslaught/generator_dead.md3
===================================================================
(Binary files differ)


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

Added: trunk/data/models/onslaught/generator_dmg1.md3
===================================================================
(Binary files differ)


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

Added: trunk/data/models/onslaught/generator_dmg2.md3
===================================================================
(Binary files differ)


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

Modified: trunk/data/models/onslaught/generator_shield.md3
===================================================================
(Binary files differ)

Deleted: trunk/data/models/onslaught/reactor_dead.md3
===================================================================
(Binary files differ)

Deleted: trunk/data/models/onslaught/reactor_dmg1.md3
===================================================================
(Binary files differ)

Deleted: trunk/data/models/onslaught/reactor_dmg2.md3
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2009-05-04 13:28:11 UTC (rev 6659)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2009-05-04 13:51:27 UTC (rev 6660)
@@ -417,11 +417,11 @@
 		onslaught_updatelinks();
 	}
 	if(self.health < cvar("g_onslaught_gen_health") * 0.75)
-		setmodel(self, "models/onslaught/reactor_dmg1.md3");
+		setmodel(self, "models/onslaught/generator_dmg1.md3");
 	if(self.health < cvar("g_onslaught_gen_health") * 0.35)
-		setmodel(self, "models/onslaught/reactor_dmg2.md3");
+		setmodel(self, "models/onslaught/generator_dmg2.md3");
 	if(self.health <= 0)
-		setmodel(self, "models/onslaught/reactor_dead.md3");
+		setmodel(self, "models/onslaught/generator_dead.md3");
 };
 
 // update links after a delay
@@ -600,9 +600,9 @@
 	local entity e;
 	precache_model("models/onslaught/generator.md3");
 	precache_model("models/onslaught/generator_shield.md3");
-	precache_model("models/onslaught/reactor_dmg1.md3");
-	precache_model("models/onslaught/reactor_dmg2.md3");
-	precache_model("models/onslaught/reactor_dead.md3");
+	precache_model("models/onslaught/generator_dmg1.md3");
+	precache_model("models/onslaught/generator_dmg2.md3");
+	precache_model("models/onslaught/generator_dead.md3");
 	precache_sound("onslaught/generator_decay.wav");
 	precache_sound("weapons/grenade_impact.wav");
 	precache_sound("weapons/rocket_impact.wav");

Added: trunk/data/scripts/onslaught.shader
===================================================================
--- trunk/data/scripts/onslaught.shader	                        (rev 0)
+++ trunk/data/scripts/onslaught.shader	2009-05-04 13:51:27 UTC (rev 6660)
@@ -0,0 +1,10 @@
+ons_shield
+{
+ {
+	map textures/ons_shield.tga
+	tcMod rotate 15
+	tcMod scale 0.3 0.3
+	tcMod scroll 0.03 0.001
+	tcGen environment
+ }
+}
\ No newline at end of file


Property changes on: trunk/data/scripts/onslaught.shader
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/data/textures/core_dmg1.tga
===================================================================
(Binary files differ)

Modified: trunk/data/textures/core_dmg1_glow.tga
===================================================================
(Binary files differ)

Modified: trunk/data/textures/core_dmg2.tga
===================================================================
(Binary files differ)

Modified: trunk/data/textures/core_dmg2_glow.tga
===================================================================
(Binary files differ)

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


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

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


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

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

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

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

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

Deleted: trunk/data/textures/shield_seamless(2nd texture).tga
===================================================================
(Binary files differ)

Deleted: trunk/data/textures/shield_seamless(2nd texture)_gloss.tga
===================================================================
(Binary files differ)