[Orxonox-commit 5934] r10593 - in data/trunk: images/effects materials

[fvultier at orxonox.net]

Author: fvultier
Date: 2015-09-24 13:25:08 +0200 (Thu, 24 Sep 2015)
New Revision: 10593

Added:
   data/trunk/images/effects/flare_energy.png
   data/trunk/images/effects/flare_energy.xcf
Modified:
   data/trunk/materials/Flares.material
   data/trunk/materials/TD_F1.material
Log:
Effects for the new Weapon (SpilitGun)

Added: data/trunk/images/effects/flare_energy.png
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/effects/flare_energy.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/images/effects/flare_energy.xcf
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/effects/flare_energy.xcf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: data/trunk/materials/Flares.material
===================================================================
--- data/trunk/materials/Flares.material	2015-09-24 11:23:47 UTC (rev 10592)
+++ data/trunk/materials/Flares.material	2015-09-24 11:25:08 UTC (rev 10593)
@@ -29,6 +29,7 @@
 			lighting off
 			depth_write off
 			scene_blend add
+			
 
 			texture_unit
 			{
@@ -38,6 +39,24 @@
 	}
 }
 
+material Flares/energyflare
+{
+	technique
+	{
+		pass
+		{
+			lighting on
+			depth_write off
+			scene_blend add
+
+			texture_unit
+			{
+				texture flare_energy.png
+			}
+		}
+	}
+}
+
 material Flares/ringflare
 {
 	technique

Modified: data/trunk/materials/TD_F1.material
===================================================================
--- data/trunk/materials/TD_F1.material	2015-09-24 11:23:47 UTC (rev 10592)
+++ data/trunk/materials/TD_F1.material	2015-09-24 11:25:08 UTC (rev 10593)
@@ -5,9 +5,10 @@
 	{
 		pass
 		{
-			ambient 0.8 0.8 0.8 1
-			diffuse 0.64 0.64 0.64 1
-			specular 0.5 0.5 0.5 1 1
+			ambient 0.7 0.7 0.7
+         		cull_hardware none
+         		scene_blend alpha_blend
+         		depth_write off
 
 			texture_unit
 			{