[Orxonox-commit 6061] r10720 - in data/trunk: images/effects images/overlay materials

[fvultier at orxonox.net]

Author: fvultier
Date: 2015-10-29 23:26:28 +0100 (Thu, 29 Oct 2015)
New Revision: 10720

Added:
   data/trunk/images/effects/arrowdown.png
   data/trunk/images/effects/arrowup.png
Removed:
   data/trunk/images/effects/arrow.png
Modified:
   data/trunk/images/effects/damage.png
   data/trunk/images/overlay/WSHUD_MunitionSeparate.png
   data/trunk/images/overlay/WSHUD_MunitionShare.png
   data/trunk/images/overlay/WSHUD_MunitionStack.png
   data/trunk/images/overlay/WSHUD_Ready.png
   data/trunk/images/overlay/WSHUD_Reloading.png
   data/trunk/images/overlay/WSHUD_Replenish.png
   data/trunk/images/overlay/WSHUD_WM_EnergyDrink.png
   data/trunk/images/overlay/WSHUD_WM_FusionFire.png
   data/trunk/images/overlay/WSHUD_WM_GravityBombFire.png
   data/trunk/images/overlay/WSHUD_WM_HsW01.png
   data/trunk/images/overlay/WSHUD_WM_IceGun.png
   data/trunk/images/overlay/WSHUD_WM_LaserFire.png
   data/trunk/images/overlay/WSHUD_WM_LightningGun.png
   data/trunk/images/overlay/WSHUD_WM_RocketFire.png
   data/trunk/images/overlay/WSHUD_WM_SimpleRocketFire.png
   data/trunk/images/overlay/WSHUD_WM_SplitGun.png
   data/trunk/images/overlay/WSHUD_WM_Unknown.png
   data/trunk/materials/Pickups.material
Log:


Deleted: data/trunk/images/effects/arrow.png
===================================================================
(Binary files differ)

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


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

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


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

Modified: data/trunk/images/effects/damage.png
===================================================================
(Binary files differ)

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/images/overlay/WSHUD_MunitionStack.png
===================================================================
(Binary files differ)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: data/trunk/materials/Pickups.material
===================================================================
--- data/trunk/materials/Pickups.material	2015-10-29 19:02:23 UTC (rev 10719)
+++ data/trunk/materials/Pickups.material	2015-10-29 22:26:28 UTC (rev 10720)
@@ -106,7 +106,7 @@
 	}
 }
 
-material Arrow
+material ArrowUp
 {
 	technique
 	{
@@ -118,12 +118,30 @@
 
 			texture_unit
 			{
-				texture arrow.png
+				texture arrowup.png
 			}
 		}
 	}
 }
 
+material ArrowDown
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture arrowdown.png
+			}
+		}
+	}
+}
+
 material 3arrowsup
 {
 	technique
@@ -212,4 +230,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}