[Orxonox-commit 4640] r9311 - in data/pool/images: effects effects/pickup effects/planets gui overlay skyboxes
dafrick at orxonox.net
dafrick at orxonox.net
Tue Jul 3 23:46:06 CEST 2012
Author: dafrick
Date: 2012-07-03 23:46:06 +0200 (Tue, 03 Jul 2012)
New Revision: 9311
Added:
data/pool/images/effects/TODO
data/pool/images/effects/pickup/damageLarge.png
data/pool/images/effects/pickup/damageMedium.png
data/pool/images/effects/pickup/damageSmall.png
Modified:
data/pool/images/effects/AUTHORS
data/pool/images/effects/pickup/info.xml
data/pool/images/effects/planets/info.xml
data/pool/images/gui/AUTHORS
data/pool/images/overlay/AUTHORS
data/pool/images/overlay/console2.png
data/pool/images/overlay/console3.png
data/pool/images/skyboxes/AUTHORS
Log:
Working on images
Modified: data/pool/images/effects/AUTHORS
===================================================================
--- data/pool/images/effects/AUTHORS 2012-07-03 21:36:48 UTC (rev 9310)
+++ data/pool/images/effects/AUTHORS 2012-07-03 21:46:06 UTC (rev 9311)
@@ -33,6 +33,9 @@
pickup/arrow.png Damian Frick
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
planets/blueplanet.png Damian Frick
Added: data/pool/images/effects/TODO
===================================================================
--- data/pool/images/effects/TODO (rev 0)
+++ data/pool/images/effects/TODO 2012-07-03 21:46:06 UTC (rev 9311)
@@ -0,0 +1 @@
+* Add info.xml
Added: data/pool/images/effects/pickup/damageLarge.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/pickup/damageLarge.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/pickup/damageMedium.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/pickup/damageMedium.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/pickup/damageSmall.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/pickup/damageSmall.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: data/pool/images/effects/pickup/info.xml
===================================================================
--- data/pool/images/effects/pickup/info.xml 2012-07-03 21:36:48 UTC (rev 9310)
+++ data/pool/images/effects/pickup/info.xml 2012-07-03 21:46:06 UTC (rev 9311)
@@ -3,10 +3,14 @@
<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>
+ <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>
<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>
+ <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>
Modified: data/pool/images/effects/planets/info.xml
===================================================================
--- data/pool/images/effects/planets/info.xml 2012-07-03 21:36:48 UTC (rev 9310)
+++ data/pool/images/effects/planets/info.xml 2012-07-03 21:46:06 UTC (rev 9311)
@@ -1,12 +1,5 @@
<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>
Modified: data/pool/images/gui/AUTHORS
===================================================================
--- data/pool/images/gui/AUTHORS 2012-07-03 21:36:48 UTC (rev 9310)
+++ data/pool/images/gui/AUTHORS 2012-07-03 21:46:06 UTC (rev 9311)
@@ -4,6 +4,7 @@
DriveIcons.png Reto Grieder?
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
TaharezGreenLook.png Lars "Taharez" Rinde
Modified: data/pool/images/overlay/AUTHORS
===================================================================
--- data/pool/images/overlay/AUTHORS 2012-07-03 21:36:48 UTC (rev 9310)
+++ data/pool/images/overlay/AUTHORS 2012-07-03 21:46:06 UTC (rev 9311)
@@ -8,8 +8,8 @@
bar2c.png Felix Schulthess
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
crosshair.png unknown
Modified: data/pool/images/overlay/console2.png
===================================================================
(Binary files differ)
Modified: data/pool/images/overlay/console3.png
===================================================================
(Binary files differ)
Modified: data/pool/images/skyboxes/AUTHORS
===================================================================
--- data/pool/images/skyboxes/AUTHORS 2012-07-03 21:36:48 UTC (rev 9310)
+++ data/pool/images/skyboxes/AUTHORS 2012-07-03 21:46:06 UTC (rev 9311)
@@ -1,6 +1,24 @@
Here we list the authors of all the media files in this directory (and possibly sub-directories). All files are released under the CC by-sa license which can be found in the LICENSE file in this directory, unless otherwise specified.
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?
skypanoramagen1_fr.jpg Fabian Landau?
More information about the Orxonox-commit
mailing list