Changeset 8715

Timestamp:

Jun 27, 2011, 10:57:22 AM (13 years ago)

Author:

dafrick

Message:

Also adjusting in pool.

Location:

data/pool

Files:

• images/effects/AUTHORS (modified) (1 diff)
• images/effects/pickup/asterisk.png (moved) (moved from data/pool/images/effects/pickup/asterix.png)
• images/effects/pickup/asterisk.xcf (moved) (moved from data/pool/images/effects/pickup/asterix.xcf)
• images/effects/pickup/info.xml (modified) (1 diff)
• materials/asterisk.material (moved) (moved from data/pool/materials/Asterix.material) (2 diffs)

data/pool/images/effects/AUTHORS

@@ -32 +32 @@
 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

data/pool/images/effects/pickup/info.xml

@@ -1 +1 @@
 <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>

data/pool/materials/asterisk.material

@@ -1 @@
-material Asterix
+material asterisk
 {
         technique
@@ -11 +11 @@
                         texture_unit
                         {
-                                texture asterix.png
+                                texture asterisk.png
                         }
                 }