[Orxonox-commit 3525] r8211 - in data/pool: images/effects images/effects/pickup images/effects/planets images/effects/primitives materials
dafrick at orxonox.net
dafrick at orxonox.net
Fri Apr 8 07:52:55 CEST 2011
Author: dafrick
Date: 2011-04-08 07:52:54 +0200 (Fri, 08 Apr 2011)
New Revision: 8211
Added:
data/pool/images/effects/pickup/
data/pool/images/effects/pickup/3arrowsup.png
data/pool/images/effects/pickup/TODO
data/pool/images/effects/pickup/arrow.png
data/pool/images/effects/pickup/arrow.xcf
data/pool/images/effects/pickup/asterix.png
data/pool/images/effects/pickup/asterix.xcf
data/pool/images/effects/pickup/cross.png
data/pool/images/effects/pickup/cross.xcf
data/pool/images/effects/pickup/eye.png
data/pool/images/effects/pickup/info.xml
data/pool/images/effects/pickup/shield.png
data/pool/images/effects/planets/
data/pool/images/effects/planets/blueplanet.png
data/pool/images/effects/planets/blueplanet.xcf
data/pool/images/effects/planets/blueplanetTexture.xcf
data/pool/images/effects/planets/brownplanet.png
data/pool/images/effects/planets/brownplanet.xcf
data/pool/images/effects/planets/greenplanet.png
data/pool/images/effects/planets/greenplanet.xcf
data/pool/images/effects/planets/greenplanetTexture.xcf
data/pool/images/effects/planets/greyplanet.png
data/pool/images/effects/planets/greyplanet.xcf
data/pool/images/effects/planets/greyplanetTexture.xcf
data/pool/images/effects/planets/info.xml
data/pool/images/effects/planets/redplanet.png
data/pool/images/effects/planets/redplanet.xcf
data/pool/images/effects/planets/redplanetTexture.xcf
data/pool/images/effects/planets/rings.xcf
data/pool/images/effects/planets/rings2.xcf
data/pool/images/effects/planets/violetplanet.png
data/pool/images/effects/planets/violetplanet.xcf
data/pool/images/effects/planets/violetplanet2.png
data/pool/images/effects/planets/violetplanet2.xcf
data/pool/images/effects/primitives/
data/pool/images/effects/primitives/info.xml
data/pool/images/effects/primitives/sphere.png
data/pool/images/effects/primitives/sphere.xcf
data/pool/materials/planets.material
Removed:
data/pool/images/effects/3arrowsup.png
data/pool/images/effects/arrow.png
data/pool/images/effects/asterix.png
data/pool/images/effects/cross.png
data/pool/images/effects/eye.png
data/pool/images/effects/shield.png
data/pool/images/effects/sphere.png
Modified:
data/pool/images/effects/AUTHORS
Log:
Adding planets to pool. Also added some other image source.
Deleted: data/pool/images/effects/3arrowsup.png
===================================================================
(Binary files differ)
Modified: data/pool/images/effects/AUTHORS
===================================================================
--- data/pool/images/effects/AUTHORS 2011-04-07 22:18:28 UTC (rev 8210)
+++ data/pool/images/effects/AUTHORS 2011-04-08 05:52:54 UTC (rev 8211)
@@ -1,9 +1,7 @@
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
-3arrowsup.png Eric Beier and Benedict Simlinger
-arrow.png Damian Frick
-asterix.png Damian Frick
+
atmosphere.png Felix Schulthess
atmospheretype1.png Marian Runo
atmospheretype2.png Marian Runo
@@ -16,10 +14,8 @@
bigflame.png unknown
bigflare1.png Fabian Landau
clouds.png Benjamin de Capitani
-cross.png Damian Frick
explosion3.png Fabian Landau
explosion.png unknown
-eye.png Eric Beier and Benedict Simlinger
flare2_1.png David Gassner
flare2.png unknown
flare.png Felix Schulthess
@@ -33,10 +29,23 @@
LightningBall_7.png Joël Smely
LightningBall_8.png Joël Smely
mapgrid.png Si Sun
+pickup/3arrowsup.png Eric Beier and Benedict Simlinger
+pickup/arrow.png Damian Frick
+pickup/asterix.png Damian Frick
+pickup/cross.png Damian Frick
+pickup/eye.png Eric Beier and Benedict Simlinger
+shield.png Eric Beier and Benedict Simlinger
+planets/blueplanet.png Damian Frick
+planets/brownplanet.png Damian Frick
+planets/greenplanet.png Damian Frick
+planets/greyplanet.png Damian Frick
+planets/redplanet.png Damian Frick
+planets/violetplanet2.png Damian Frick
+planets/violetplanet.png Damian Frick
+primitives/sphere.png Damian Frick
ring_flare2.png unknown
ring_flare.png unknown
Sepia1D.png Fabian Landau?
-shield.png Eric Beier and Benedict Simlinger
smoke2.png Fabian Landau
smoke3.png Fabian Landau
smoke4.png Gion-Andri Cantieni
Deleted: data/pool/images/effects/arrow.png
===================================================================
(Binary files differ)
Deleted: data/pool/images/effects/asterix.png
===================================================================
(Binary files differ)
Deleted: data/pool/images/effects/cross.png
===================================================================
(Binary files differ)
Deleted: data/pool/images/effects/eye.png
===================================================================
(Binary files differ)
Copied: data/pool/images/effects/pickup/3arrowsup.png (from rev 8167, data/pool/images/effects/3arrowsup.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/pickup/TODO
===================================================================
--- data/pool/images/effects/pickup/TODO (rev 0)
+++ data/pool/images/effects/pickup/TODO 2011-04-08 05:52:54 UTC (rev 8211)
@@ -0,0 +1,2 @@
+* Add missing .xcf files.
+* Move everything into one material file?
Copied: data/pool/images/effects/pickup/arrow.png (from rev 8167, data/pool/images/effects/arrow.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/pickup/arrow.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/pickup/arrow.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: data/pool/images/effects/pickup/asterix.png (from rev 8167, data/pool/images/effects/asterix.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/pickup/asterix.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/pickup/asterix.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: data/pool/images/effects/pickup/cross.png (from rev 8167, data/pool/images/effects/cross.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/pickup/cross.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/pickup/cross.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: data/pool/images/effects/pickup/eye.png (from rev 8167, data/pool/images/effects/eye.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/pickup/info.xml
===================================================================
--- data/pool/images/effects/pickup/info.xml (rev 0)
+++ data/pool/images/effects/pickup/info.xml 2011-04-08 05:52:54 UTC (rev 8211)
@@ -0,0 +1,26 @@
+<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>
+</info>
Copied: data/pool/images/effects/pickup/shield.png (from rev 8167, data/pool/images/effects/shield.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/planets/blueplanet.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/blueplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/blueplanet.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/blueplanet.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/blueplanetTexture.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/blueplanetTexture.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/brownplanet.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/brownplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/brownplanet.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/brownplanet.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/greenplanet.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/greenplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/greenplanet.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/greenplanet.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/greenplanetTexture.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/greenplanetTexture.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/greyplanet.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/greyplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/greyplanet.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/greyplanet.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/greyplanetTexture.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/greyplanetTexture.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/info.xml
===================================================================
--- data/pool/images/effects/planets/info.xml (rev 0)
+++ data/pool/images/effects/planets/info.xml 2011-04-08 05:52:54 UTC (rev 8211)
@@ -0,0 +1,12 @@
+<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>
+</info>
Added: data/pool/images/effects/planets/redplanet.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/redplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/redplanet.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/redplanet.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/redplanetTexture.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/redplanetTexture.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/rings.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/rings.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/rings2.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/rings2.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/violetplanet.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/violetplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/violetplanet.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/violetplanet.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/violetplanet2.png
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/violetplanet2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/planets/violetplanet2.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/planets/violetplanet2.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/images/effects/primitives/info.xml
===================================================================
--- data/pool/images/effects/primitives/info.xml (rev 0)
+++ data/pool/images/effects/primitives/info.xml 2011-04-08 05:52:54 UTC (rev 8211)
@@ -0,0 +1,5 @@
+<info>
+ <name>Billboard primitives</name>
+ <author for="spere.png">Damian Frick</author>
+ <dependency for="sphere.png">/materials/Sphere2.material</dependency>
+</info>
Copied: data/pool/images/effects/primitives/sphere.png (from rev 8167, data/pool/images/effects/sphere.png)
===================================================================
(Binary files differ)
Added: data/pool/images/effects/primitives/sphere.xcf
===================================================================
(Binary files differ)
Property changes on: data/pool/images/effects/primitives/sphere.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: data/pool/images/effects/shield.png
===================================================================
(Binary files differ)
Deleted: data/pool/images/effects/sphere.png
===================================================================
(Binary files differ)
Added: data/pool/materials/planets.material
===================================================================
--- data/pool/materials/planets.material (rev 0)
+++ data/pool/materials/planets.material 2011-04-08 05:52:54 UTC (rev 8211)
@@ -0,0 +1,126 @@
+material planets/blueplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture blueplanet.png
+ }
+ }
+ }
+}
+
+material planets/brownplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture brownplanet.png
+ }
+ }
+ }
+}
+
+material planets/greenplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture greenplanet.png
+ }
+ }
+ }
+}
+
+material planets/greyplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture greyplanet.png
+ }
+ }
+ }
+}
+
+material planets/redplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture redplanet.png
+ }
+ }
+ }
+}
+
+material planets/violetplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture violetplanet.png
+ }
+ }
+ }
+}
+
+material planets/violetplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture violetplanet.png
+ }
+ }
+ }
+}
+
More information about the Orxonox-commit
mailing list