Changeset 9311

Timestamp:

Jul 3, 2012, 11:46:06 PM (12 years ago)

Author:

dafrick

Message:

Working on images

Location:

data/pool/images

Files:

• effects/AUTHORS (modified) (1 diff)
• effects/TODO (added)
• effects/pickup/damageLarge.png (added)
• effects/pickup/damageMedium.png (added)
• effects/pickup/damageSmall.png (added)
• effects/pickup/info.xml (modified) (2 diffs)
• effects/planets/info.xml (modified) (1 diff)
• gui/AUTHORS (modified) (1 diff)
• overlay/AUTHORS (modified) (1 diff)
• overlay/console2.png (modified) (previous)
• overlay/console3.png (modified) (previous)
• skyboxes/AUTHORS (modified) (1 diff)

data/pool/images/effects/AUTHORS

@@ -34 +34 @@
 pickup/asterisk.png                          Damian Frick
 pickup/cross.png                             Damian Frick
+pickup/damageLarge.png                       lkevin
+pickup/damageMedium.png                      lkevin
+pickup/damageSmall.png                       lkevin
 pickup/eye.png                               Eric Beier and Benedict Simlinger
 pickup/shield.png                            Eric Beier and Benedict Simlinger

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

@@ -4 +4 @@
     <author for="3arrowsup.png, eye.png, shield.png">Eric Beier</author>
     <author for="3arrowsup.png, eye.png, shield.png">Benedict Simlinger</author>
+    <author for="damageLarge.png, damageMedium.png, damageSmall.png">lkevin</author>
     <dependency for="3arrowsup.png">/materials/3arrowsup.material</dependency>
     <dependency for="arrow.png">/materials/Arrow.material</dependency>
@@ -10 +11 @@
     <dependency for="eye.png">/materials/Eye.material</dependency>
     <dependency for="shield.png">/materials/Shield.material</dependency>
+    <dependency for="damageLarge.png">/materials/damageLarge.material</dependency>
+    <dependency for="damageMedium.png">/materials/damageMedium.material</dependency>
+    <dependency for="damageSmall.png">/materials/damageSmall.material</dependency>
 </info>

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

@@ -1 +1 @@
 <info>
-    <name>Pickup billboards</name>
-    <author for="arrow.png, asterix,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="asterix,png">/materials/Asterix.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>
+    <name>Planets</name>
+    <author for="blueplanet.png, brownplanet.png, greenplanet.png, greyplanet.png, redplanet.png, violetplanet.png, violetplanet2.png">Damian Frick</author>
+    <dependency for="blueplanet.png, brownplanet.png, greenplanet.png, greyplanet.png, redplanet.png, violetplanet.png, violetplanet2.png">>/materials/planets.material</dependency>
 </info>

data/pool/images/gui/AUTHORS

@@ -5 +5 @@
 FairChar.png                                     Reto Grieder?
 main_menu_1.jpg                                  Reto Grieder
+OrxonoxLook.png                                  Damian Frick
 pickup.png                                       Damian Frick, Eric Beier and Benedict Simlinger
 sleekspace.png                                   Seth Yastrov

data/pool/images/overlay/AUTHORS

@@ -9 +9 @@
 bar2.png                                     Felix Schulthess
 centeroverlay.png                            Michael Wirth
-console2.png                                 Felix Schulthess
-console3.png                                 Felix Schulthess
+console2.png                                 Felix Schulthess, Fabian Landau
+console3.png                                 Felix Schulthess, Fabian Landau
 console4.png                                 Felix Schulthess
 console5.png                                 Reto Grieder

data/pool/images/skyboxes/AUTHORS

@@ -2 +2 @@
 
 File                                        Author
+skybox1_bk.png                              Benjamin de Capitani
+skybox1_dn.png                              Benjamin de Capitani
+skybox1_fr.png                              Benjamin de Capitani
+skybox1_lf.png                              Benjamin de Capitani
+skybox1_rt.png                              Benjamin de Capitani
+skybox1_up.png                              Benjamin de Capitani
+skybox2_bk.png                              Benjamin de Capitani
+skybox2_dn.png                              Benjamin de Capitani
+skybox2_fr.png                              Benjamin de Capitani
+skybox2_lf.png                              Benjamin de Capitani
+skybox2_rt.png                              Benjamin de Capitani
+skybox2_up.png                              Benjamin de Capitani
+skybox3_bk.png                              Benjamin de Capitani
+skybox3_dn.png                              Benjamin de Capitani
+skybox3_fr.png                              Benjamin de Capitani
+skybox3_lf.png                              Benjamin de Capitani
+skybox3_rt.png                              Benjamin de Capitani
+skybox3_up.png                              Benjamin de Capitani
 skypanoramagen1_bk.jpg                      Fabian Landau?
 skypanoramagen1_dn.jpg                      Fabian Landau?