[Orxonox-commit 6451] r11107 - in data/trunk: audio/sounds images/overlay materials

[fvultier at orxonox.net]

Author: fvultier
Date: 2016-02-04 23:50:17 +0100 (Thu, 04 Feb 2016)
New Revision: 11107

Added:
   data/trunk/audio/sounds/Reload_HsW01.ogg
   data/trunk/audio/sounds/Reload_IceGun.ogg
   data/trunk/audio/sounds/Reload_LaserFire.ogg
   data/trunk/audio/sounds/Reload_SplitGun.ogg
   data/trunk/audio/sounds/Weapon_EnergyDrink.ogg
   data/trunk/audio/sounds/Weapon_FlameGun.ogg
   data/trunk/audio/sounds/Weapon_FusionFire.ogg
   data/trunk/audio/sounds/Weapon_LaserFire.ogg
   data/trunk/audio/sounds/Weapon_SplitGun.ogg
   data/trunk/images/overlay/WSHUD_WM_FlameGun.png
Modified:
   data/trunk/materials/Orxonox.material
Log:
Some weapon fire and reload sounds.

Added: data/trunk/audio/sounds/Reload_HsW01.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Reload_HsW01.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Reload_IceGun.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Reload_IceGun.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Reload_LaserFire.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Reload_LaserFire.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Reload_SplitGun.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Reload_SplitGun.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Weapon_EnergyDrink.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Weapon_EnergyDrink.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Weapon_FlameGun.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Weapon_FlameGun.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Weapon_FusionFire.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Weapon_FusionFire.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Weapon_LaserFire.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Weapon_LaserFire.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/audio/sounds/Weapon_SplitGun.ogg
===================================================================
(Binary files differ)


Property changes on: data/trunk/audio/sounds/Weapon_SplitGun.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/images/overlay/WSHUD_WM_FlameGun.png
===================================================================
(Binary files differ)


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

Modified: data/trunk/materials/Orxonox.material
===================================================================
--- data/trunk/materials/Orxonox.material	2016-02-03 12:02:33 UTC (rev 11106)
+++ data/trunk/materials/Orxonox.material	2016-02-04 22:50:17 UTC (rev 11107)
@@ -629,6 +629,42 @@
     }
 }
 
+material Orxonox/LightOn
+{
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend alpha_blend
+            depth_check off
+
+            texture_unit
+            {
+                texture LightOn.png 2d 0 // no mipmapping
+            }
+        }
+    }
+}
+
+material Orxonox/LightOff
+{
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend alpha_blend
+            depth_check off
+
+            texture_unit
+            {
+                texture LightOff.png 2d 0 // no mipmapping
+            }
+        }
+    }
+}
+
 material Orxonox/WSHUD_Weapon
 {
     technique
@@ -827,6 +863,24 @@
     }
 }
 
+material Orxonox/WSHUD_WM_FlameGun
+{
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend alpha_blend
+            depth_check off
+
+            texture_unit
+            {
+                texture WSHUD_WM_FlameGun.png 2d 0 // no mipmapping
+            }
+        }
+    }
+}
+
 material Orxonox/WSHUD_WM_SplitGun
 {
     technique