[Orxonox-commit 4044] r8715 - in data/pool: images/effects images/effects/pickup materials

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-06-27 10:57:22 +0200 (Mon, 27 Jun 2011)
New Revision: 8715

Added:
   data/pool/images/effects/pickup/asterisk.png
   data/pool/images/effects/pickup/asterisk.xcf
   data/pool/materials/asterisk.material
Removed:
   data/pool/images/effects/pickup/asterix.png
   data/pool/images/effects/pickup/asterix.xcf
   data/pool/materials/Asterix.material
Modified:
   data/pool/images/effects/AUTHORS
   data/pool/images/effects/pickup/info.xml
Log:
Also adjusting in pool.


Modified: data/pool/images/effects/AUTHORS
===================================================================
--- data/pool/images/effects/AUTHORS	2011-06-27 08:56:47 UTC (rev 8714)
+++ data/pool/images/effects/AUTHORS	2011-06-27 08:57:22 UTC (rev 8715)
@@ -31,10 +31,10 @@
 mapgrid.png                                  Si Sun
 pickup/3arrowsup.png                         Eric Beier and Benedict Simlinger
 pickup/arrow.png                             Damian Frick
-pickup/asterix.png                           Damian Frick
+pickup/asterisk.png                          Damian Frick
 pickup/cross.png                             Damian Frick
 pickup/eye.png                               Eric Beier and Benedict Simlinger
-shield.png                                   Eric Beier and Benedict Simlinger
+pickup/shield.png                            Eric Beier and Benedict Simlinger
 planets/blueplanet.png                       Damian Frick
 planets/brownplanet.png                      Damian Frick
 planets/greenplanet.png                      Damian Frick

Copied: data/pool/images/effects/pickup/asterisk.png (from rev 8697, data/pool/images/effects/pickup/asterix.png)
===================================================================
(Binary files differ)

Copied: data/pool/images/effects/pickup/asterisk.xcf (from rev 8697, data/pool/images/effects/pickup/asterix.xcf)
===================================================================
(Binary files differ)

Deleted: data/pool/images/effects/pickup/asterix.png
===================================================================
(Binary files differ)

Deleted: data/pool/images/effects/pickup/asterix.xcf
===================================================================
(Binary files differ)

Modified: data/pool/images/effects/pickup/info.xml
===================================================================
--- data/pool/images/effects/pickup/info.xml	2011-06-27 08:56:47 UTC (rev 8714)
+++ data/pool/images/effects/pickup/info.xml	2011-06-27 08:57:22 UTC (rev 8715)
@@ -1,26 +1,12 @@
 <info>
-    <name>Spacestation parts</name>
-    <author>Mirko Kaiser</author>
-    <dependency>/materials/CuboidSpaceStation.material</dependency>
-    <dependency for="CuboidBody.mesh, CuboidConnBody.mesh, DoubleCuboidBody.mesh, satellitedish.mesh">/images/textures/babel-wall1a.jpg</dependency>
-    <dependency for="CuboidBody.mesh, CuboidConnBody.mesh, DoubleCuboidBody.mesh">/images/textures/babel-wall1b.jpg</dependency>
-    <dependency for="CuboidBody.mesh, CuboidConnBody.mesh, CuboidLandingZone.mesh, DoubleCuboidBody.mesh, satellitedish.mesh, SemiCircleCockpit.mesh, Thruster.mesh">/images/textures/babel-wall6a.jpg</dependency>
-    <dependency for="CuboidBody.mesh, CuboidConnBody.mesh, DoubleCuboidBody.mesh, satellitedish.mesh">/images/textures/babel-wall6b.jpg</dependency>
-    <dependency>/images/textures/babel-trim3b.jpg</dependency>
-    <dependency for="CuboidConnBody.mesh">/images/textures/CuboidConnectionBodyTop.jpg</dependency>
-    <dependency for="CuboidConnBody.mesh">/images/textures/CuboidConnectionBodySide.jpg</dependency>
-    <dependency for="satellitedish.mesh">/images/textures/dish.jpg</dependency>
-    <dependency for="satellitedish.mesh, SemiCircleCockpit.mesh, Thruster.mesh">/images/textures/thrust.jpg</dependency>
-    <dependency for="SemiCircleCockpit.mesh">/images/textures/CockpitNose.jpg</dependency>
-    <dependency for="SemiCircleCockpit.mesh">/images/textures/CockpitSide.png</dependency>
-    <dependency for="SolarPanel.mesh">/images/textures/seamless/sl_panel.jpg</dependency>
-    <screenshot for="CuboidBody.mesh">screenhots/CuboidBody.png</screenshot>
-    <screenshot for="CuboidConnBody.mesh">screenhots/CuboidConnBody.png</screenshot>
-    <screenshot for="CuboidConnection.mesh">screenhots/CuboidConnection.png</screenshot>
-    <screenshot for="CuboidLandingZone.mesh">screenhots/CuboidLandingZone.png</screenshot>
-    <screenshot for="DoubleCuboidBody.mesh">screenhots/DoubleCuboidBody.png</screenshot>
-    <screenshot for="satellitedish.mesh">screenhots/satellitedish.png</screenshot>
-    <screenshot for="SemiCircleCockpit.mesh">screenhots/SemiCircleCockpit.png</screenshot>
-    <screenshot for="SolarPanel.mesh">screenhots/SolarPanel.png</screenshot>
-    <screenshot for="Thruster.mesh">screenhots/Thruster.png</screenshot>
+    <name>Pickup billboards</name>
+    <author for="arrow.png, asterisk.png, cross.png">Damian Frick</author>
+    <author for="3arrowsup.png, eye.png, shield.png">Eric Beier</author>
+    <author for="3arrowsup.png, eye.png, shield.png">Benedict Simlinger</author>
+    <dependency for="3arrowsup.png">/materials/3arrowsup.material</dependency>
+    <dependency for="arrow.png">/materials/Arrow.material</dependency>
+    <dependency for="asterisk.png">/materials/asterisk.material</dependency>
+    <dependency for="cross.png">/materials/Cross.material</dependency>
+    <dependency for="eye.png">/materials/Eye.material</dependency>
+    <dependency for="shield.png">/materials/Shield.material</dependency>
 </info>

Deleted: data/pool/materials/Asterix.material
===================================================================
--- data/pool/materials/Asterix.material	2011-06-27 08:56:47 UTC (rev 8714)
+++ data/pool/materials/Asterix.material	2011-06-27 08:57:22 UTC (rev 8715)
@@ -1,17 +0,0 @@
-material Asterix
-{
-	technique
-	{
-		pass
-		{
-			lighting off
-			scene_blend add
-			depth_write off
-
-			texture_unit
-			{
-				texture asterix.png
-			}
-		}
-	}
-}

Copied: data/pool/materials/asterisk.material (from rev 8697, data/pool/materials/Asterix.material)
===================================================================
--- data/pool/materials/asterisk.material	                        (rev 0)
+++ data/pool/materials/asterisk.material	2011-06-27 08:57:22 UTC (rev 8715)
@@ -0,0 +1,17 @@
+material asterisk
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture asterisk.png
+			}
+		}
+	}
+}