[Orxonox-commit 6064] r10723 - in data/trunk: images/effects images/overlay materials

fvultier at orxonox.net fvultier at orxonox.net
Fri Oct 30 19:51:05 CET 2015


Author: fvultier
Date: 2015-10-30 19:51:04 +0100 (Fri, 30 Oct 2015)
New Revision: 10723

Added:
   data/trunk/images/effects/icon_flash.png
Modified:
   data/trunk/images/overlay/WSHUD_MunitionSeparate.png
   data/trunk/images/overlay/WSHUD_MunitionShare.png
   data/trunk/materials/Pickups.material
Log:


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


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

Modified: data/trunk/images/overlay/WSHUD_MunitionSeparate.png
===================================================================
(Binary files differ)

Modified: data/trunk/images/overlay/WSHUD_MunitionShare.png
===================================================================
(Binary files differ)

Modified: data/trunk/materials/Pickups.material
===================================================================
--- data/trunk/materials/Pickups.material	2015-10-30 11:08:30 UTC (rev 10722)
+++ data/trunk/materials/Pickups.material	2015-10-30 18:51:04 UTC (rev 10723)
@@ -231,3 +231,21 @@
 		}
 	}
 }
+
+material Flash
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture icon_flash.png
+			}
+		}
+	}
+}




More information about the Orxonox-commit mailing list