[Orxonox-commit 6560] r11200 - in data/trunk: images/overlay images/textures materials

[sagerj at orxonox.net]

Author: sagerj
Date: 2016-05-26 15:16:12 +0200 (Thu, 26 May 2016)
New Revision: 11200

Added:
   data/trunk/images/overlay/bar_icon_charge.png
Removed:
   data/trunk/images/textures/tutorialship.png
Modified:
   data/trunk/materials/Orxonox.material
Log:
new icon,new spaceship

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


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

Deleted: data/trunk/images/textures/tutorialship.png
===================================================================
(Binary files differ)

Modified: data/trunk/materials/Orxonox.material
===================================================================
--- data/trunk/materials/Orxonox.material	2016-05-26 13:13:51 UTC (rev 11199)
+++ data/trunk/materials/Orxonox.material	2016-05-26 13:16:12 UTC (rev 11200)
@@ -178,6 +178,24 @@
     }
 }
 
+material Orxonox/BarIconCharge
+{
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend alpha_blend
+            depth_check off
+
+            texture_unit
+            {
+                texture bar_icon_charge.png 2d 0 // no mipmapping
+            }
+        }
+    }
+}
+
 material Orxonox/BarIconHealth
 {
     technique