[Orxonox-commit 4025] r8699 - in data/pool: images/textures materials models models/hydrogenharvester
dafrick at orxonox.net
dafrick at orxonox.net
Mon Jun 6 00:19:03 CEST 2011
Author: dafrick
Date: 2011-06-06 00:19:03 +0200 (Mon, 06 Jun 2011)
New Revision: 8699
Added:
data/pool/images/textures/CentralStructure.png
data/pool/images/textures/Doors.png
data/pool/images/textures/MainStructure.png
data/pool/images/textures/OuterCompartment.png
data/pool/materials/HydroHarvester.material
data/pool/models/hydrogenharvester/
data/pool/models/hydrogenharvester/CentralStructure.psp
data/pool/models/hydrogenharvester/Doors.psp
data/pool/models/hydrogenharvester/HarvesterHull.blend
data/pool/models/hydrogenharvester/HarvesterHullAnim.blend
data/pool/models/hydrogenharvester/HarvesterHullMerged.blend
data/pool/models/hydrogenharvester/HydroHarvester.mesh
data/pool/models/hydrogenharvester/MainStructure.psp
data/pool/models/hydrogenharvester/OuterCompartment.psp
data/pool/models/hydrogenharvester/info.xml
data/pool/models/hydrogenharvester/screenshot.jpg
Modified:
data/pool/images/textures/AUTHORS
data/pool/materials/AUTHORS
data/pool/models/AUTHORS
Log:
Adding HydroHarvester to pool.
Modified: data/pool/images/textures/AUTHORS
===================================================================
--- data/pool/images/textures/AUTHORS 2011-06-05 22:17:18 UTC (rev 8698)
+++ data/pool/images/textures/AUTHORS 2011-06-05 22:19:03 UTC (rev 8699)
@@ -11,6 +11,7 @@
babel-wall6a.jpg Georges Grondin (cc-by-sa)
babel-wall6b.jpg Georges Grondin (cc-by-sa)
can.png Hagen Seifert
+CentralStructure.png Hans Sjökvist
CockpitGlass.jpg Mirko Kaiser
CockpitNose.jpg Mirko Kaiser
CockpitSide.png Mirko Kaiser
@@ -20,6 +21,7 @@
dirt01.jpg unknown
Dirt.jpg unknown
dish.jpg Felix Schulthess
+Doors.png Hans Sjökvist
drone.png unknown
DuBall1.jpg Rocco Bottani, Massimo Maffioli
DuBall2.jpg Rocco Bottani, Massimo Maffioli
@@ -38,6 +40,7 @@
Lightning_gun_pic2.png Joël Smely
LightningGun.png Joël Smely
LightningGun-s.png Joël Smely
+MainStructure.png Hans Sjökvist
MetalBare.jpg Benjamin de Capitani
MetalBase0020_thumbhuge.jpg Benjamin de Capitani
MetalBase0030_thumbhuge.jpg Benjamin de Capitani
@@ -47,6 +50,7 @@
OrxonoxORANGE.png unknown
OrxonoxRED.png unknown
OrxonoxYELLOW.png Reto Grieder
+OuterCompartment.png Hans Sjökvist
pirate.jpg Felix Schulthess
planet.jpg Felix Schulthess
PlasmaAufh_Aufh.jpg Benjamin de Capitani
Copied: data/pool/images/textures/CentralStructure.png (from rev 8697, data/trunk/images/textures/CentralStructure.png)
===================================================================
(Binary files differ)
Property changes on: data/pool/images/textures/CentralStructure.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: svn:mergeinfo
+ /data/branches/altaudio/images/textures/CentralStructure.png:6211-6263
/data/branches/cleanup/images/textures/CentralStructure.png:7470-7685
/data/branches/media_stripped/images/textures/CentralStructure.png:5591-5657
/data/branches/png2/images/textures/CentralStructure.png:7245-7260
Copied: data/pool/images/textures/Doors.png (from rev 8697, data/trunk/images/textures/Doors.png)
===================================================================
(Binary files differ)
Property changes on: data/pool/images/textures/Doors.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: svn:mergeinfo
+ /data/branches/altaudio/images/textures/Doors.png:6211-6263
/data/branches/cleanup/images/textures/Doors.png:7470-7685
/data/branches/media_stripped/images/textures/Doors.png:5591-5657
/data/branches/png2/images/textures/Doors.png:7245-7260
Copied: data/pool/images/textures/MainStructure.png (from rev 8697, data/trunk/images/textures/MainStructure.png)
===================================================================
(Binary files differ)
Property changes on: data/pool/images/textures/MainStructure.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: svn:mergeinfo
+ /data/branches/altaudio/images/textures/MainStructure.png:6211-6263
/data/branches/cleanup/images/textures/MainStructure.png:7470-7685
/data/branches/media_stripped/images/textures/MainStructure.png:5591-5657
/data/branches/png2/images/textures/MainStructure.png:7245-7260
Copied: data/pool/images/textures/OuterCompartment.png (from rev 8697, data/trunk/images/textures/OuterCompartment.png)
===================================================================
(Binary files differ)
Property changes on: data/pool/images/textures/OuterCompartment.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: svn:mergeinfo
+ /data/branches/altaudio/images/textures/OuterCompartment.png:6211-6263
/data/branches/cleanup/images/textures/OuterCompartment.png:7470-7685
/data/branches/media_stripped/images/textures/OuterCompartment.png:5591-5657
/data/branches/png2/images/textures/OuterCompartment.png:7245-7260
Modified: data/pool/materials/AUTHORS
===================================================================
--- data/pool/materials/AUTHORS 2011-06-05 22:17:18 UTC (rev 8698)
+++ data/pool/materials/AUTHORS 2011-06-05 22:19:03 UTC (rev 8699)
@@ -42,6 +42,7 @@
hs_w01_reduced.material Benjamin de Capitani
hs-w01s.material Hagen Seifert
HXY.material Benjamin de Capitani
+HydroHarvester.material Hans Sjökvist
iceplanet.material Marian Runo
Invert.material Fabian Landau?
jumpthrust.material Felix Schulthess
Copied: data/pool/materials/HydroHarvester.material (from rev 8697, data/trunk/materials/HydroHarvester.material)
===================================================================
--- data/pool/materials/HydroHarvester.material (rev 0)
+++ data/pool/materials/HydroHarvester.material 2011-06-05 22:19:03 UTC (rev 8699)
@@ -0,0 +1,83 @@
+material Harv/MainStructure
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.700000 0.700000 0.700000 1.000000
+ diffuse 0.640000 0.640000 0.640000 1.000000
+ specular 0.100000 0.100000 0.100000 1.000000 3.750000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture MainStructure.png
+ tex_address_mode wrap
+ filtering trilinear
+ colour_op alpha_blend
+ }
+ }
+ }
+}
+material Harv/Doors
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.640000 0.640000 0.640000 1.000000
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture Doors.png
+ tex_address_mode wrap
+ filtering trilinear
+ colour_op alpha_blend
+ }
+ }
+ }
+}
+material Harv/CentralStructure
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.800000 0.800000 0.800000 1.000000
+ diffuse 0.640000 0.640000 0.640000 1.000000
+ specular 0.100000 0.100000 0.100000 1.000000 2.500000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture CentralStructure.png
+ tex_address_mode wrap
+ filtering trilinear
+ colour_op alpha_blend
+ }
+ }
+ }
+}
+material OuterCompartments
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.700000 0.700000 0.700000 1.000000
+ diffuse 0.640000 0.640000 0.640000 1.000000
+ specular 0.035437 0.035437 0.035437 1.000000 3.750000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture OuterCompartment.png
+ tex_address_mode wrap
+ filtering trilinear
+ }
+ }
+ }
+}
Property changes on: data/pool/materials/HydroHarvester.material
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+ /data/branches/altaudio/materials/HydroHarvester.material:6211-6263
/data/branches/cleanup/materials/HydroHarvester.material:7470-7685
/data/branches/media_stripped/materials/HydroHarvester.material:5591-5657
/data/branches/png2/materials/HydroHarvester.material:7245-7260
Modified: data/pool/models/AUTHORS
===================================================================
--- data/pool/models/AUTHORS 2011-06-05 22:17:18 UTC (rev 8698)
+++ data/pool/models/AUTHORS 2011-06-05 22:19:03 UTC (rev 8699)
@@ -24,6 +24,7 @@
drone/drone.mesh unknown
duBall/DuBall1.mesh Rocco Bottani, Massimo Maffioli
duBall/DuBall2.mesh Rocco Bottani, Massimo Maffioli
+hydrogenharvester/HydroHarvester.mesh Hans Sjökvist
primitives/axes/axes.mesh Felix Schulthess
primitives/cone/Cone.mesh Felix Schulthess
primitives/crate/crate.mesh Reto Grieder
Added: data/pool/models/hydrogenharvester/CentralStructure.psp
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/CentralStructure.psp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/hydrogenharvester/Doors.psp
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/Doors.psp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/hydrogenharvester/HarvesterHull.blend
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/HarvesterHull.blend
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/hydrogenharvester/HarvesterHullAnim.blend
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/HarvesterHullAnim.blend
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/hydrogenharvester/HarvesterHullMerged.blend
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/HarvesterHullMerged.blend
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: data/pool/models/hydrogenharvester/HydroHarvester.mesh (from rev 8697, data/trunk/models/HydroHarvester.mesh)
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/HydroHarvester.mesh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+ /data/branches/altaudio/models/HydroHarvester.mesh:6211-6263
/data/branches/cleanup/models/HydroHarvester.mesh:7470-7685
/data/branches/media_stripped/models/HydroHarvester.mesh:5591-5657
/data/branches/png2/models/HydroHarvester.mesh:7245-7260
Added: data/pool/models/hydrogenharvester/MainStructure.psp
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/MainStructure.psp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/hydrogenharvester/OuterCompartment.psp
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/OuterCompartment.psp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/pool/models/hydrogenharvester/info.xml
===================================================================
--- data/pool/models/hydrogenharvester/info.xml (rev 0)
+++ data/pool/models/hydrogenharvester/info.xml 2011-06-05 22:19:03 UTC (rev 8699)
@@ -0,0 +1,10 @@
+<info>
+ <name>Hydrogen Harvester</name>
+ <author>Hans Sjökvist</author>
+ <dependency>/materials/HydroHarvester.material</dependency>
+ <dependency>/images/textures/MainStructure.png</dependency>
+ <dependency>/images/textures/CentralStructure.png</dependency>
+ <dependency>/images/textures/Doors.png</dependency>
+ <dependency>/images/textures/OuterCompartment.png</dependency>
+ <screenshot>screenshot.jpg</screenshot>
+</info>
Added: data/pool/models/hydrogenharvester/screenshot.jpg
===================================================================
(Binary files differ)
Property changes on: data/pool/models/hydrogenharvester/screenshot.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the Orxonox-commit
mailing list