[Orxonox-commit 3474] r8160 - in data/pool/models: . assff asteroids/rocky debris debris/assff primitives primitives/axes primitives/cone primitives/cube primitives/plane primitives/sphere spacestation
dafrick at orxonox.net
dafrick at orxonox.net
Wed Mar 30 11:27:45 CEST 2011
Author: dafrick
Date: 2011-03-30 11:27:44 +0200 (Wed, 30 Mar 2011)
New Revision: 8160
Added:
data/pool/models/debris/
data/pool/models/debris/assff/
data/pool/models/debris/assff/BodyDebris1.mesh
data/pool/models/debris/assff/CockpitDebris.mesh
data/pool/models/debris/assff/SmallPart1.mesh
data/pool/models/debris/assff/SmallPart2.mesh
data/pool/models/debris/assff/TODO
data/pool/models/debris/assff/WingDebris1.mesh
data/pool/models/debris/assff/WingDebris2.mesh
data/pool/models/debris/assff/info.xml
data/pool/models/primitives/
data/pool/models/primitives/axes/
data/pool/models/primitives/axes/TODO
data/pool/models/primitives/axes/axes.mesh
data/pool/models/primitives/axes/info.xml
data/pool/models/primitives/cone/
data/pool/models/primitives/cone/Cone.mesh
data/pool/models/primitives/cone/TODO
data/pool/models/primitives/cone/info.xml
data/pool/models/primitives/cube/
data/pool/models/primitives/cube/TODO
data/pool/models/primitives/cube/cube.mesh
data/pool/models/primitives/cube/cube_green.mesh
data/pool/models/primitives/cube/cube_orange.mesh
data/pool/models/primitives/cube/cube_red.mesh
data/pool/models/primitives/cube/cube_yellow.mesh
data/pool/models/primitives/cube/info.xml
data/pool/models/primitives/plane/
data/pool/models/primitives/plane/TODO
data/pool/models/primitives/plane/info.xml
data/pool/models/primitives/plane/plane.mesh
data/pool/models/primitives/sphere/
data/pool/models/primitives/sphere/TODO
data/pool/models/primitives/sphere/info.xml
data/pool/models/primitives/sphere/sphere.mesh
data/pool/models/spacestation/
data/pool/models/spacestation/CuboidBody.mesh
data/pool/models/spacestation/CuboidConnBody.mesh
data/pool/models/spacestation/CuboidConnection.mesh
data/pool/models/spacestation/CuboidLandingZone.mesh
data/pool/models/spacestation/DoubleCuboidBody.mesh
data/pool/models/spacestation/SemiCircleCockpit.mesh
data/pool/models/spacestation/SolarPanel.mesh
data/pool/models/spacestation/TODO
data/pool/models/spacestation/Thruster.mesh
data/pool/models/spacestation/info.xml
data/pool/models/spacestation/satellitedish.mesh
Removed:
data/pool/models/BodyDebris1.mesh
data/pool/models/CockpitDebris.mesh
data/pool/models/Cone.mesh
data/pool/models/CuboidBody.mesh
data/pool/models/CuboidConnBody.mesh
data/pool/models/CuboidConnection.mesh
data/pool/models/CuboidLandingZone.mesh
data/pool/models/DoubleCuboidBody.mesh
data/pool/models/SemiCircleCockpit.mesh
data/pool/models/SmallPart1.mesh
data/pool/models/SmallPart2.mesh
data/pool/models/SolarPanel.mesh
data/pool/models/Thruster.mesh
data/pool/models/WingDebris1.mesh
data/pool/models/WingDebris2.mesh
data/pool/models/axes.mesh
data/pool/models/cube.mesh
data/pool/models/cube_green.mesh
data/pool/models/cube_orange.mesh
data/pool/models/cube_red.mesh
data/pool/models/cube_yellow.mesh
data/pool/models/plane.mesh
data/pool/models/satellitedish.mesh
data/pool/models/sphere.mesh
Modified:
data/pool/models/AUTHORS
data/pool/models/assff/info.xml
data/pool/models/asteroids/rocky/TODO
Log:
Some more moving...
Modified: data/pool/models/AUTHORS
===================================================================
--- data/pool/models/AUTHORS 2011-03-29 22:27:48 UTC (rev 8159)
+++ data/pool/models/AUTHORS 2011-03-30 09:27:44 UTC (rev 8160)
@@ -17,23 +17,33 @@
asteroids/asteroid_UV_lq.mesh Benjamin de Capitani
asteroids/asteroid_ice.mesh Benjamin de Capitani
asteroids/asteroid_UV.mesh Benjamin de Capitani
-axes.mesh Felix Schulthess
-BodyDebris1.mesh Benjamin de Capitani
+debris/assff/BodyDebris1.mesh Benjamin de Capitani
+debris/assff/CockpitDebris.mesh Benjamin de Capitani
+debris/assff/SmallPart1.mesh Benjamin de Capitani
+debris/assff/SmallPart2.mesh Benjamin de Capitani
+debris/assff/WingDebris2.mesh Benjamin de Capitani
+debris/assff/WingDebris1.mesh Benjamin de Capitani
+primitives/axes/axes.mesh Felix Schulthess
+primitives/cone/Cone.mesh Felix Schulthess
+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
+spacestation/CuboidBody.mesh Mirko Kaiser
+spacestation/CuboidConnBody.mesh Mirko Kaiser
+spacestation/CuboidConnection.mesh Mirko Kaiser
+spacestation/CuboidLandingZone.mesh Mirko Kaiser
+spacetstaion/DoubleCuboidBody.mesh Mirko Kaiser
+spacestation/satellitedish.mesh Mirko Kaiser
+spacestation/SemiCircleCockpit.mesh Mirko Kaiser
+spacestation/SolarPanel.mesh Mirko Kaiser
+spacestation/Thruster.mesh Mirko Kaiser
can.mesh Hagen Seifert
Carrier.mesh Felix Schulthess
-CockpitDebris.mesh Benjamin de Capitani
-Cone.mesh Felix Schulthess
crate.mesh Reto Grieder
-cube_green.mesh Reto Grieder
-cube.mesh Felix Schulthess
-cube_orange.mesh Reto Grieder
-cube_red.mesh Reto Grieder
-CuboidBody.mesh Mirko Kaiser
-CuboidConnBody.mesh Mirko Kaiser
-CuboidConnection.mesh Mirko Kaiser
-CuboidLandingZone.mesh Mirko Kaiser
cwrench.mesh Felix Schulthess
-DoubleCuboidBody.mesh Mirko Kaiser
drone.mesh unknown
DuBall1.mesh Rocco Bottani, Massimo Maffioli
DuBall2.mesh Rocco Bottani, Massimo Maffioli
@@ -52,24 +62,14 @@
LightningGun-s.mesh Joël Smely
ogrehead.mesh unknown
pirate.mesh Felix Schulthess
-plane.mesh Reto Grieder
planet.mesh Felix Schulthess
rocket.mesh Daniel Cristen
-satellitedish.mesh Mirko Kaiser
satellite.mesh Felix Schulthess
-SemiCircleCockpit.mesh Mirko Kaiser
-SmallPart1.mesh Benjamin de Capitani
-SmallPart2.mesh Benjamin de Capitani
-SolarPanel.mesh Mirko Kaiser
spacecruiser.mesh unknown
spacecruiser_16.mesh Felix Schulthess
-sphere.mesh Felix Schulthess
starship.mesh unknown
swallow_mat.mesh David Gassner
-Thruster.mesh Mirko Kaiser
Transporter.mesh Benjamin de Capitani
UEATransporter036.mesh Axel Bomhauer-Beins
UEATransporter036T.mesh Axel Bomhauer-Beins
-WingDebris1.mesh Benjamin de Capitani
-WingDebris2.mesh Benjamin de Capitani
Deleted: data/pool/models/BodyDebris1.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/CockpitDebris.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/Cone.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/CuboidBody.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/CuboidConnBody.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/CuboidConnection.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/CuboidLandingZone.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/DoubleCuboidBody.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/SemiCircleCockpit.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/SmallPart1.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/SmallPart2.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/SolarPanel.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/Thruster.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/WingDebris1.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/WingDebris2.mesh
===================================================================
(Binary files differ)
Modified: data/pool/models/assff/info.xml
===================================================================
--- data/pool/models/assff/info.xml 2011-03-29 22:27:48 UTC (rev 8159)
+++ data/pool/models/assff/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -4,4 +4,5 @@
<author>Oliver Scheuss</author>
<dependency>materials/assff.material</dependency>
<dependency>images/textures/assff.JPG</dependency>
+ <screenshot>screenshot.png</screenshot>
</info>
Modified: data/pool/models/asteroids/rocky/TODO
===================================================================
--- data/pool/models/asteroids/rocky/TODO 2011-03-29 22:27:48 UTC (rev 8159)
+++ data/pool/models/asteroids/rocky/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -1,4 +1,4 @@
* Add author.
* Add screenshots.
* Add .blend files.
-* Add tetxure source files.
+* Add texture source files.
Deleted: data/pool/models/axes.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/cube.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/cube_green.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/cube_orange.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/cube_red.mesh
===================================================================
(Binary files differ)
Deleted: data/pool/models/cube_yellow.mesh
===================================================================
(Binary files differ)
Copied: data/pool/models/debris/assff/BodyDebris1.mesh (from rev 8159, data/pool/models/BodyDebris1.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/debris/assff/CockpitDebris.mesh (from rev 8159, data/pool/models/CockpitDebris.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/debris/assff/SmallPart1.mesh (from rev 8159, data/pool/models/SmallPart1.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/debris/assff/SmallPart2.mesh (from rev 8159, data/pool/models/SmallPart2.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/debris/assff/TODO
===================================================================
--- data/pool/models/debris/assff/TODO (rev 0)
+++ data/pool/models/debris/assff/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source?
Copied: data/pool/models/debris/assff/WingDebris1.mesh (from rev 8159, data/pool/models/WingDebris1.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/debris/assff/WingDebris2.mesh (from rev 8159, data/pool/models/WingDebris2.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/debris/assff/info.xml
===================================================================
--- data/pool/models/debris/assff/info.xml (rev 0)
+++ data/pool/models/debris/assff/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,6 @@
+<info>
+ <name>Assff debris</name>
+ <author>Benjamin de Capitani</author>
+ <dependency>materials/assff.material</dependency>
+ <dependency>images/textures/assff.JPG</dependency>
+</info>
Deleted: data/pool/models/plane.mesh
===================================================================
(Binary files differ)
Added: data/pool/models/primitives/axes/TODO
===================================================================
--- data/pool/models/primitives/axes/TODO (rev 0)
+++ data/pool/models/primitives/axes/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source?
Copied: data/pool/models/primitives/axes/axes.mesh (from rev 8159, data/pool/models/axes.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/primitives/axes/info.xml
===================================================================
--- data/pool/models/primitives/axes/info.xml (rev 0)
+++ data/pool/models/primitives/axes/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,5 @@
+<info>
+ <name>Axes</name>
+ <author>Felix Schulthess</author>
+ <dependency>materials/axes.material</dependency>
+</info>
Copied: data/pool/models/primitives/cone/Cone.mesh (from rev 8159, data/pool/models/Cone.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/primitives/cone/TODO
===================================================================
--- data/pool/models/primitives/cone/TODO (rev 0)
+++ data/pool/models/primitives/cone/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source files.
Added: data/pool/models/primitives/cone/info.xml
===================================================================
--- data/pool/models/primitives/cone/info.xml (rev 0)
+++ data/pool/models/primitives/cone/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,6 @@
+<info>
+ <name>Cone</name>
+ <author>Felix Schulthess</author>
+ <dependency>materials/cone.material</dependency>
+ <dependency>images/textures/OrxonoxGREEN.png</dependency>
+</info>
Added: data/pool/models/primitives/cube/TODO
===================================================================
--- data/pool/models/primitives/cube/TODO (rev 0)
+++ data/pool/models/primitives/cube/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source files.
Added: data/pool/models/primitives/cube/cube.mesh
===================================================================
(Binary files differ)
Property changes on: data/pool/models/primitives/cube/cube.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/primitives/cube/cube_green.mesh
===================================================================
(Binary files differ)
Property changes on: data/pool/models/primitives/cube/cube_green.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/primitives/cube/cube_orange.mesh
===================================================================
(Binary files differ)
Property changes on: data/pool/models/primitives/cube/cube_orange.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/primitives/cube/cube_red.mesh
===================================================================
(Binary files differ)
Property changes on: data/pool/models/primitives/cube/cube_red.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/primitives/cube/cube_yellow.mesh
===================================================================
(Binary files differ)
Property changes on: data/pool/models/primitives/cube/cube_yellow.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/primitives/cube/info.xml
===================================================================
--- data/pool/models/primitives/cube/info.xml (rev 0)
+++ data/pool/models/primitives/cube/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,10 @@
+<info>
+ <name>Cube</name>
+ <author for="cube.mesh" >Felix Schulthess</author>
+ <author for="cube_yellow.mesh, cube_green.mesh, cube_red.mesh, cube_orange.mesh" >Reto Grieder</author>
+ <dependency>materials/cube.material</dependency>
+ <dependency for="cube.mesh, cube_yellow.mesh" >images/textures/OrxonoxYELLOW.png</dependency>
+ <dependency for="cube_green.mesh" >images/textures/OrxonoxGREEN.png</dependency>
+ <dependency for="cube_red.mesh" >images/textures/OrxonoxRED.png</dependency>
+ <dependency for="cube_orange.mesh" >images/textures/OrxonoxORANGE.png</dependency>
+</info>
Added: data/pool/models/primitives/plane/TODO
===================================================================
--- data/pool/models/primitives/plane/TODO (rev 0)
+++ data/pool/models/primitives/plane/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source?
Added: data/pool/models/primitives/plane/info.xml
===================================================================
--- data/pool/models/primitives/plane/info.xml (rev 0)
+++ data/pool/models/primitives/plane/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,6 @@
+<info>
+ <name>Plane</name>
+ <author>Reto Grieder</author>
+ <dependency>materials/plane.material</dependency>
+ <dependency>images/textures/tiled_floor.jpg</dependency>
+</info>
Copied: data/pool/models/primitives/plane/plane.mesh (from rev 8159, data/pool/models/plane.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/primitives/sphere/TODO
===================================================================
--- data/pool/models/primitives/sphere/TODO (rev 0)
+++ data/pool/models/primitives/sphere/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source?
Added: data/pool/models/primitives/sphere/info.xml
===================================================================
--- data/pool/models/primitives/sphere/info.xml (rev 0)
+++ data/pool/models/primitives/sphere/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,6 @@
+<info>
+ <name>Sphere</name>
+ <author>Felix Schulthess</author>
+ <dependency>materials/sphere.material<dependency>
+ <dependency>images/textures/OrxonoxRED.png<dependency>
+</info>
Copied: data/pool/models/primitives/sphere/sphere.mesh (from rev 8159, data/pool/models/sphere.mesh)
===================================================================
(Binary files differ)
Deleted: data/pool/models/satellitedish.mesh
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/CuboidBody.mesh (from rev 8159, data/pool/models/CuboidBody.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/CuboidConnBody.mesh (from rev 8159, data/pool/models/CuboidConnBody.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/CuboidConnection.mesh (from rev 8159, data/pool/models/CuboidConnection.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/CuboidLandingZone.mesh (from rev 8159, data/pool/models/CuboidLandingZone.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/DoubleCuboidBody.mesh (from rev 8159, data/pool/models/DoubleCuboidBody.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/SemiCircleCockpit.mesh (from rev 8159, data/pool/models/SemiCircleCockpit.mesh)
===================================================================
(Binary files differ)
Copied: data/pool/models/spacestation/SolarPanel.mesh (from rev 8159, data/pool/models/SolarPanel.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/spacestation/TODO
===================================================================
--- data/pool/models/spacestation/TODO (rev 0)
+++ data/pool/models/spacestation/TODO 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,3 @@
+* Add screenshots.
+* Add .blend files.
+* Add texture source?
Copied: data/pool/models/spacestation/Thruster.mesh (from rev 8159, data/pool/models/Thruster.mesh)
===================================================================
(Binary files differ)
Added: data/pool/models/spacestation/info.xml
===================================================================
--- data/pool/models/spacestation/info.xml (rev 0)
+++ data/pool/models/spacestation/info.xml 2011-03-30 09:27:44 UTC (rev 8160)
@@ -0,0 +1,9 @@
+<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>
+</info>
Copied: data/pool/models/spacestation/satellitedish.mesh (from rev 8159, data/pool/models/satellitedish.mesh)
===================================================================
(Binary files differ)
Deleted: data/pool/models/sphere.mesh
===================================================================
(Binary files differ)
More information about the Orxonox-commit
mailing list