[Orxonox-commit 3475] r8161 - in data/pool/models: . drone duBall primitives primitives/crate spaceships spaceships/assff spaceships/carrier spaceships/ghost spaceships/pirate spaceships/spacecruiser spaceships/starship
dafrick at orxonox.net
dafrick at orxonox.net
Wed Mar 30 12:45:16 CEST 2011
Author: dafrick
Date: 2011-03-30 12:45:16 +0200 (Wed, 30 Mar 2011)
New Revision: 8161
Added:
data/pool/models/drone/
data/pool/models/drone/TODO
data/pool/models/drone/drone.mesh
data/pool/models/drone/info.xml
data/pool/models/duBall/
data/pool/models/duBall/DuBall1.mesh
data/pool/models/duBall/DuBall2.mesh
data/pool/models/duBall/TODO
data/pool/models/duBall/info.xml
data/pool/models/primitives/crate/
data/pool/models/primitives/crate/TODO
data/pool/models/primitives/crate/crate.mesh
data/pool/models/primitives/crate/info.xml
data/pool/models/spaceships/
data/pool/models/spaceships/assff/
data/pool/models/spaceships/assff/info.xml
data/pool/models/spaceships/carrier/
data/pool/models/spaceships/carrier/Carrier.mesh
data/pool/models/spaceships/carrier/TODO
data/pool/models/spaceships/carrier/info.xml
data/pool/models/spaceships/ghost/
data/pool/models/spaceships/ghost/ghost.mesh
data/pool/models/spaceships/ghost/info.xml
data/pool/models/spaceships/pirate/
data/pool/models/spaceships/pirate/pirate.mesh
data/pool/models/spaceships/spacecruiser/
data/pool/models/spaceships/spacecruiser/spacecruiser.mesh
data/pool/models/spaceships/spacecruiser/spacecruiser_16.mesh
data/pool/models/spaceships/starship/
data/pool/models/spaceships/starship/TODO
data/pool/models/spaceships/starship/info.xml
data/pool/models/spaceships/starship/starship.mesh
Removed:
data/pool/models/Carrier.mesh
data/pool/models/DuBall1.mesh
data/pool/models/DuBall2.mesh
data/pool/models/assff/
data/pool/models/crate.mesh
data/pool/models/drone.mesh
data/pool/models/ghost.mesh
data/pool/models/pirate.mesh
data/pool/models/spacecruiser.mesh
data/pool/models/spacecruiser_16.mesh
data/pool/models/spaceships/assff/info.xml
data/pool/models/starship.mesh
Modified:
data/pool/models/AUTHORS
Log:
Still moving stuff.
Modified: data/pool/models/AUTHORS
===================================================================
--- data/pool/models/AUTHORS 2011-03-30 09:27:44 UTC (rev 8160)
+++ data/pool/models/AUTHORS 2011-03-30 10:45:16 UTC (rev 8161)
@@ -1,8 +1,6 @@
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
-assff/assff.mesh Felix Schulthess
-assff/assff_lod_med.mesh Oliver Scheuss
asteroids/plain/asteroid1.mesh Benjamin de Capitani
asteroids/plain/asteroid2.mesh Benjamin de Capitani
asteroids/plain/asteroid3.mesh Benjamin de Capitani
@@ -23,14 +21,26 @@
debris/assff/SmallPart2.mesh Benjamin de Capitani
debris/assff/WingDebris2.mesh Benjamin de Capitani
debris/assff/WingDebris1.mesh Benjamin de Capitani
+drone/drone.mesh unknown
+duBall/DuBall1.mesh Rocco Bottani, Massimo Maffioli
+duBall/DuBall2.mesh Rocco Bottani, Massimo Maffioli
primitives/axes/axes.mesh Felix Schulthess
primitives/cone/Cone.mesh Felix Schulthess
+primitives/crate/crate.mesh Reto Grieder
primitives/cube/cube.mesh Felix Schulthess
primitives/cube/cube_green.mesh Reto Grieder
primitives/cube/cube_orange.mesh Reto Grieder
primitives/cube/cube_red.mesh Reto Grieder
primitives/plane/plane.mesh Reto Grieder
primitives/sphere/sphere.mesh Felix Schulthess
+spaceships/assff/assff.mesh Felix Schulthess
+spaceships/assff/assff_lod_med.mesh Oliver Scheuss
+spaceships/carrier/Carrier.mesh Felix Schulthess
+spaceships/ghost/ghost.mesh David Gassner
+spaceships/pirate/pirate.mesh Felix Schulthess
+spaceships/spacecruiser/spacecruiser.mesh unknown
+spaceships/spacecruiser/spacecruiser_16.mesh Felix Schulthess
+spaceships/starship/starship.mesh unknown
spacestation/CuboidBody.mesh Mirko Kaiser
spacestation/CuboidConnBody.mesh Mirko Kaiser
spacestation/CuboidConnection.mesh Mirko Kaiser
@@ -41,14 +51,8 @@
spacestation/SolarPanel.mesh Mirko Kaiser
spacestation/Thruster.mesh Mirko Kaiser
can.mesh Hagen Seifert
-Carrier.mesh Felix Schulthess
-crate.mesh Reto Grieder
cwrench.mesh Felix Schulthess
-drone.mesh unknown
-DuBall1.mesh Rocco Bottani, Massimo Maffioli
-DuBall2.mesh Rocco Bottani, Massimo Maffioli
earth.mesh Marian Runo
-ghost.mesh David Gassner
gwrench.mesh Felix Schulthess
h2_green.mesh David Gassner
hs-w01.mesh Hagen Seifert
@@ -61,13 +65,9 @@
LightningGun.mesh Joël Smely
LightningGun-s.mesh Joël Smely
ogrehead.mesh unknown
-pirate.mesh Felix Schulthess
planet.mesh Felix Schulthess
rocket.mesh Daniel Cristen
satellite.mesh Felix Schulthess
-spacecruiser.mesh unknown
-spacecruiser_16.mesh Felix Schulthess
-starship.mesh unknown
swallow_mat.mesh David Gassner
Transporter.mesh Benjamin de Capitani
UEATransporter036.mesh Axel Bomhauer-Beins
Deleted: data/pool/models/Carrier.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/DuBall1.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/DuBall2.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/crate.mesh
===================================================================
(Binary files differ)
Added: data/pool/models/drone/TODO
===================================================================
--- data/pool/models/drone/TODO (rev 0)
+++ data/pool/models/drone/TODO 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,2 @@
+* Add .blend files.
+* Add texture source.
Copied: data/pool/models/drone/drone.mesh (from rev 8159, data/pool/models/drone.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/drone/info.xml
===================================================================
--- data/pool/models/drone/info.xml (rev 0)
+++ data/pool/models/drone/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,8 @@
+<info>
+ <name>Assff</name>
+ <author>Felix Schulthess</author>
+ <author>Oliver Scheuss</author>
+ <dependency>materials/assff.material</dependency>
+ <dependency>images/textures/assff.JPG</dependency>
+ <screenshot>screenshot.png</screenshot>
+</info>
Deleted: data/pool/models/drone.mesh
===================================================================
(Binary files differ)
Copied: data/pool/models/duBall/DuBall1.mesh (from rev 8159, data/pool/models/DuBall1.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/duBall/DuBall2.mesh (from rev 8159, data/pool/models/DuBall2.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/duBall/TODO
===================================================================
--- data/pool/models/duBall/TODO (rev 0)
+++ data/pool/models/duBall/TODO 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source.
Added: data/pool/models/duBall/info.xml
===================================================================
--- data/pool/models/duBall/info.xml (rev 0)
+++ data/pool/models/duBall/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,8 @@
+<info>
+ <name>DuBall - Spacestation</name>
+ <author>Rocco Bottani</author>
+ <author>Massimo Maffioli</author>
+ <dependency>materials/DuBall.material</dependency>
+ <dependency for="DuBall1.mesh">images/textures/DuBall1.jpg</dependency>
+ <dependency for="DuBall2.mesh">images/textures/DuBall2.jpg</dependency>
+</info>
Deleted: data/pool/models/ghost.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/pirate.mesh
===================================================================
(Binary files differ)
Added: data/pool/models/primitives/crate/TODO
===================================================================
--- data/pool/models/primitives/crate/TODO (rev 0)
+++ data/pool/models/primitives/crate/TODO 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source?
Copied: data/pool/models/primitives/crate/crate.mesh (from rev 8159, data/pool/models/crate.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/primitives/crate/info.xml
===================================================================
--- data/pool/models/primitives/crate/info.xml (rev 0)
+++ data/pool/models/primitives/crate/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,6 @@
+<info>
+ <name>Crate</name>
+ <author>Reto Grieder</author>
+ <dependency>materials/crate.material</dependency>
+ <dependency>images/textures/crate.png</dependency>
+</info>
Deleted: data/pool/models/spacecruiser.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/spacecruiser_16.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/spaceships/assff/info.xml
===================================================================
--- data/pool/models/assff/info.xml 2011-03-29 22:27:48 UTC (rev 8159)
+++ data/pool/models/spaceships/assff/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -1,7 +0,0 @@
-<info>
- <name>Assff</name>
- <author>Felix Schulthess</author>
- <author>Oliver Scheuss</author>
- <dependency>materials/assff.material</dependency>
- <dependency>images/textures/assff.JPG</dependency>
-</info>
Copied: data/pool/models/spaceships/assff/info.xml (from rev 8160, data/pool/models/assff/info.xml)
===================================================================
--- data/pool/models/spaceships/assff/info.xml (rev 0)
+++ data/pool/models/spaceships/assff/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,8 @@
+<info>
+ <name>Assff</name>
+ <author for="assff.mesh">Felix Schulthess</author>
+ <author for="assff_lod_med.mesh">Oliver Scheuss</author>
+ <dependency>materials/assff.material</dependency>
+ <dependency>images/textures/assff.JPG</dependency>
+ <screenshot>screenshot.png</screenshot>
+</info>
Added: data/pool/models/spaceships/carrier/Carrier.mesh
===================================================================
(Binary files differ)
Property changes on: data/pool/models/spaceships/carrier/Carrier.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/spaceships/carrier/TODO
===================================================================
--- data/pool/models/spaceships/carrier/TODO (rev 0)
+++ data/pool/models/spaceships/carrier/TODO 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,4 @@
+* Add author.
+* Add texture dependencies.
+* Add .blend files.
+* Add texture source.
Added: data/pool/models/spaceships/carrier/info.xml
===================================================================
--- data/pool/models/spaceships/carrier/info.xml (rev 0)
+++ data/pool/models/spaceships/carrier/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,6 @@
+<info>
+ <name>Carrier</name>
+ <author>Felix Schulthess</author>
+ <dependency>materials/Carrier.material</dependency>
+ <dependency>images/textures/seamless/sl_hull02.jpg</dependency>
+</info>
Copied: data/pool/models/spaceships/ghost/ghost.mesh (from rev 8159, data/pool/models/ghost.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/spaceships/ghost/info.xml
===================================================================
--- data/pool/models/spaceships/ghost/info.xml (rev 0)
+++ data/pool/models/spaceships/ghost/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,6 @@
+<info>
+ <name>Ghost</name>
+ <author>David Gassner</author>
+ <dependency>materials/ghost.material</dependency>
+ <dependency>images/textures/ghost_complete-texture_Cube.jpg</dependency>
+</info>
Copied: data/pool/models/spaceships/pirate/pirate.mesh (from rev 8159, data/pool/models/pirate.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spaceships/spacecruiser/spacecruiser.mesh (from rev 8159, data/pool/models/spacecruiser.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spaceships/spacecruiser/spacecruiser_16.mesh (from rev 8159, data/pool/models/spacecruiser_16.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/spaceships/starship/TODO
===================================================================
--- data/pool/models/spaceships/starship/TODO (rev 0)
+++ data/pool/models/spaceships/starship/TODO 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,4 @@
+* Add screenshots.
+* Add author.
+* Add .blend files.
+* Add texture source.
Added: data/pool/models/spaceships/starship/info.xml
===================================================================
--- data/pool/models/spaceships/starship/info.xml (rev 0)
+++ data/pool/models/spaceships/starship/info.xml 2011-03-30 10:45:16 UTC (rev 8161)
@@ -0,0 +1,5 @@
+<info>
+ <name>Starship</name>
+ <dependency>materials/starship.material</dependency>
+ <dependency>images/textures/starship.png</dependency>
+</info>
Copied: data/pool/models/spaceships/starship/starship.mesh (from rev 8159, data/pool/models/starship.mesh)
===================================================================
(Binary files differ)
Deleted: data/pool/models/starship.mesh
===================================================================
(Binary files differ)
More information about the Orxonox-commit
mailing list