[Orxonox-commit 3482] r8168 - in data/pool/models: asteroids spacestation spacestation/screenshots

dafrick at orxonox.net dafrick at orxonox.net
Sun Apr 3 12:49:45 CEST 2011 

Author: dafrick
Date: 2011-04-03 12:49:45 +0200 (Sun, 03 Apr 2011)
New Revision: 8168

Added:
   data/pool/models/asteroids/TODO
   data/pool/models/asteroids/info_asteroid_UV.xml
   data/pool/models/asteroids/info_asteroid_ice.xml
   data/pool/models/spacestation/CuboidBody.blend
   data/pool/models/spacestation/CuboidConnection.blend
   data/pool/models/spacestation/CuboidLandingZone.blend
   data/pool/models/spacestation/DoubleCuboidBody.blend
   data/pool/models/spacestation/SemiCircleCockpit.blend
   data/pool/models/spacestation/SolarPanel.blend
   data/pool/models/spacestation/Thruster.blend
   data/pool/models/spacestation/meshes/
   data/pool/models/spacestation/satellitedish.blend
   data/pool/models/spacestation/screenshots/
   data/pool/models/spacestation/screenshots/CuboidBody.png
   data/pool/models/spacestation/screenshots/CuboidConnBody.png
   data/pool/models/spacestation/screenshots/CuboidConnection.png
   data/pool/models/spacestation/screenshots/CuboidLandingZone.png
   data/pool/models/spacestation/screenshots/CuboidSpaceStation.blend
   data/pool/models/spacestation/screenshots/DoubleCuboidBody.png
   data/pool/models/spacestation/screenshots/SemiCircleCockpit.png
   data/pool/models/spacestation/screenshots/SolarPanel.png
   data/pool/models/spacestation/screenshots/Thruster.png
   data/pool/models/spacestation/screenshots/satellitedish.png
   data/pool/models/spacestation/textures/
Removed:
   data/pool/models/spacestation/screenshots/CuboidBody2.png
   data/pool/models/spacestation/screenshots/CuboidConnection2.png
   data/pool/models/spacestation/screenshots/CuboidConnectionBody2.png
   data/pool/models/spacestation/screenshots/CuboidLandingZone2.png
   data/pool/models/spacestation/screenshots/CuboidSS2.png
   data/pool/models/spacestation/screenshots/DoubleCuboidBody2.png
   data/pool/models/spacestation/screenshots/SatelliteDish2.png
   data/pool/models/spacestation/screenshots/SemiCircleCockpit2.png
   data/pool/models/spacestation/screenshots/SolarPanel2.png
   data/pool/models/spacestation/screenshots/SpaceStations2.png
   data/pool/models/spacestation/screenshots/Thruster2.png
Modified:
   data/pool/models/spacestation/TODO
   data/pool/models/spacestation/info.xml
Log:
Adding .blend files and screenshots for spacestation.


Added: data/pool/models/asteroids/TODO
===================================================================
--- data/pool/models/asteroids/TODO	                        (rev 0)
+++ data/pool/models/asteroids/TODO	2011-04-03 10:49:45 UTC (rev 8168)
@@ -0,0 +1,4 @@
+* Add dependencies.
+* Add screenshots.
+* Add .blend files.
+* Add texture source files.

Added: data/pool/models/asteroids/info_asteroid_UV.xml
===================================================================
--- data/pool/models/asteroids/info_asteroid_UV.xml	                        (rev 0)
+++ data/pool/models/asteroids/info_asteroid_UV.xml	2011-04-03 10:49:45 UTC (rev 8168)
@@ -0,0 +1,5 @@
+<info>
+    <name>UV asteroid</name>
+    <author>Benjamin de Capitani</author>
+    <dependency></dependency>
+</info>

Added: data/pool/models/asteroids/info_asteroid_ice.xml
===================================================================
--- data/pool/models/asteroids/info_asteroid_ice.xml	                        (rev 0)
+++ data/pool/models/asteroids/info_asteroid_ice.xml	2011-04-03 10:49:45 UTC (rev 8168)
@@ -0,0 +1,5 @@
+<info>
+    <name>Ice asteroid</name>
+    <author>Benjamin de Capitani</author>
+    <dependency></dependency>
+</info>

Copied: data/pool/models/spacestation/CuboidBody.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/CuboidBody2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/CuboidConnection.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/CuboidConnection2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/CuboidLandingZone.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/CuboidLandingZone2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/DoubleCuboidBody.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/DoubleCuboidBody2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/SemiCircleCockpit.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/SemiCircleCockpit2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/SolarPanel.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/SolarPanel2.blend)
===================================================================
(Binary files differ)

Modified: data/pool/models/spacestation/TODO
===================================================================
--- data/pool/models/spacestation/TODO	2011-04-02 09:33:42 UTC (rev 8167)
+++ data/pool/models/spacestation/TODO	2011-04-03 10:49:45 UTC (rev 8168)
@@ -1,3 +1 @@
-* Add screenshots.
-* Add .blend files.
-* Add texture source?
+* Add .blend file for CuboidConnBody.mesh.

Copied: data/pool/models/spacestation/Thruster.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Thruster2.blend)
===================================================================
(Binary files differ)

Modified: data/pool/models/spacestation/info.xml
===================================================================
--- data/pool/models/spacestation/info.xml	2011-04-02 09:33:42 UTC (rev 8167)
+++ data/pool/models/spacestation/info.xml	2011-04-03 10:49:45 UTC (rev 8168)
@@ -1,9 +1,26 @@
 <info>
     <name>Spacestation parts</name>
     <author>Mirko Kaiser</author>
-    <dependency>materials/CuboidSpaceStation.material</dependency>
-    <dependency for="CuboidBody.mesh, CuboidConnBody.mesh, DoubleCuboidBody.mesh">images/textures/babel-wall1a.jpg</dependency>
-    <dependency for="CuboidLandingZone.mesh, Thruster.mesh">images/textures/babel-wall6a.jpg</dependency>
-    <dependency for="SemiCircleCockpit.mesh">images/textures/CockpitNose.jpg</dependency>
-    <dependency for="satellitedish.mesh">images/textures/dish.jpg</dependency>
+    <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 for="CuboidBody.mesh, CuboidConnBody.mesh, CuboidConnection.mesh, CuboidLandingZone.mesh, DoubleCuboidBody.mesh, satellitedish.mesh, SolarPanel.mesh, Thruster.mesh">/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/models/spacestation/satellitedish.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/SatelliteDish2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/CuboidBody.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidBody2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/CuboidBody2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/CuboidConnBody.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidConnectionBody2.png)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/CuboidConnection.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidConnection2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/CuboidConnection2.png
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/CuboidConnectionBody2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/CuboidLandingZone.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/CuboidLandingZone2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/CuboidLandingZone2.png
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/CuboidSS2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/CuboidSpaceStation.blend (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/CuboidSpaceStation2.blend)
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/DoubleCuboidBody.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/DoubleCuboidBody2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/DoubleCuboidBody2.png
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/SatelliteDish2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/SemiCircleCockpit.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SemiCircleCockpit2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/SemiCircleCockpit2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/SolarPanel.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SolarPanel2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/SolarPanel2.png
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/SpaceStations2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/Thruster.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/Thruster2.png)
===================================================================
(Binary files differ)

Deleted: data/pool/models/spacestation/screenshots/Thruster2.png
===================================================================
(Binary files differ)

Copied: data/pool/models/spacestation/screenshots/satellitedish.png (from rev 8167, data/contentcreation/pps/MirkoKaiser/CuboidSS/Version2/Screenshots/SatelliteDish2.png)
===================================================================
(Binary files differ)

More information about the Orxonox-commit mailing list