[Orxonox-commit 393] r2144 - in media: levels materials/scripts materials/textures models
Hagen at orxonox.net
Hagen at orxonox.net
Mon May 18 16:01:55 CEST 2009
Author: Hagen
Date: 2009-05-18 16:01:54 +0200 (Mon, 18 May 2009)
New Revision: 2144
Added:
media/materials/scripts/can.material
media/materials/scripts/can.material~
media/materials/scripts/hs-w01.material
media/materials/scripts/hs-w01s.material
media/materials/scripts/hs-w01s.material~
media/materials/scripts/laserbeam.material
media/materials/scripts/laserbeam.material~
media/materials/textures/can.tga
media/materials/textures/hs-w01.tga
media/materials/textures/hs-w01s.tga
media/materials/textures/laserbeam.tga
media/models/can.mesh
media/models/hs-w01.mesh
media/models/hs-w01s.mesh
media/models/laserbeam.mesh
Modified:
media/levels/presentation_dm.oxw
media/levels/spaceshiptemplates_presentation.oxw
media/levels/tutorial.oxw
media/levels/weaponsettings2.oxw
media/materials/textures/flare.tga
Log:
some models...bla
Modified: media/levels/presentation_dm.oxw
===================================================================
--- media/levels/presentation_dm.oxw 2009-05-18 13:05:07 UTC (rev 2143)
+++ media/levels/presentation_dm.oxw 2009-05-18 14:01:54 UTC (rev 2144)
@@ -15,6 +15,10 @@
>
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+
+<Model mesh="can.mesh" scale=10 position="0,0,-100" />
+
+
<?lua
for i = 1, 10, 1
do ?>
Modified: media/levels/spaceshiptemplates_presentation.oxw
===================================================================
--- media/levels/spaceshiptemplates_presentation.oxw 2009-05-18 13:05:07 UTC (rev 2143)
+++ media/levels/spaceshiptemplates_presentation.oxw 2009-05-18 14:01:54 UTC (rev 2144)
@@ -34,7 +34,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("levels/weaponsettings1.oxw")
+ include("levels/weaponsettings2.oxw")
?>
</SpaceShip>
</Template>
Modified: media/levels/tutorial.oxw
===================================================================
--- media/levels/tutorial.oxw 2009-05-18 13:05:07 UTC (rev 2143)
+++ media/levels/tutorial.oxw 2009-05-18 14:01:54 UTC (rev 2144)
@@ -25,34 +25,9 @@
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-<Drone primaryThrust=100 auxiliaryThrust=100 rotationThrust=100 mass = 50 linearDamping = 0.9 angularDamping = 0.7>
- <attached>
- <Model scale="10" mesh="Cylinder.mesh"/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
- </collisionShapes>
-</Drone>
+<Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" />
+<Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
-<Drone primaryThrust="100" auxilaryThrust="30" rotationThrust="10"
-
-mass = 50
-linearDamping = 0.9
-angularDamping = 0.7
-
-
->
- <attached>
- <Model scale="10" mesh="drone.mesh"/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
- </collisionShapes>
-</Drone>
-
-
-
-
<?lua
for i = 1, 10, 1
do ?>
Modified: media/levels/weaponsettings2.oxw
===================================================================
--- media/levels/weaponsettings2.oxw 2009-05-18 13:05:07 UTC (rev 2143)
+++ media/levels/weaponsettings2.oxw 2009-05-18 14:01:54 UTC (rev 2144)
@@ -1,6 +1,6 @@
<weaponslots>
- <WeaponSlot position="-15,-1.5,0" yaw=0 pitch=0 roll=0 />
- <WeaponSlot position="15,-1.5,0" yaw=0 pitch=0 roll=0 />
+ <WeaponSlot position="-15,-0.5,0" yaw=0 pitch=0 roll=0 />
+ <WeaponSlot position="15,-.5,0" yaw=0 pitch=0 roll=0 />
<WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
</weaponslots>
<weaponsets>
@@ -15,19 +15,22 @@
</links>
<Weapon>
<attached>
- <Model mesh="LightningGun.mesh" pitch="78" roll="90" yaw="90" position="0,-1.3,0" scale="0.5,0.5,0.5"/>
- <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale="0.5,0.5,0.5"/>
+ <Model mesh="hs-w01.mesh" roll="195"/>
+ <Model mesh="hs-w01s.mesh" roll="195" position="0.1,-0.5,0"/>
</attached>
- <LightningGun mode=0 muzzleoffset="0,0,-20" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
</Weapon>
<Weapon>
<attached>
- <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" scale="0.5,0.5,0.5"/>
- <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" scale="0.5,0.5,0.5"/>
+ <Model mesh="hs-w01.mesh" roll="165"/>
+ <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,-0.5,0"/>
</attached>
- <LightningGun mode=0 muzzleoffset="0,0,-20" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
+ <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
</Weapon>
Added: media/materials/scripts/can.material
===================================================================
--- media/materials/scripts/can.material (rev 0)
+++ media/materials/scripts/can.material 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,25 @@
+material can/TEXFACE/can.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture can.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/scripts/can.material~
===================================================================
--- media/materials/scripts/can.material~ (rev 0)
+++ media/materials/scripts/can.material~ 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,25 @@
+material can/TEXFACE/can.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture can.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/scripts/hs-w01.material
===================================================================
--- media/materials/scripts/hs-w01.material (rev 0)
+++ media/materials/scripts/hs-w01.material 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,50 @@
+material hs-w01s/TEXFACE/hs-w01.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture hs-w01.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
+material hs-w01/TEXFACE/hs-w01.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture hs-w01.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/scripts/hs-w01s.material
===================================================================
--- media/materials/scripts/hs-w01s.material (rev 0)
+++ media/materials/scripts/hs-w01s.material 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,25 @@
+material hs-w01s/TEXFACE/hs-w01s.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture hs-w01s.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/scripts/hs-w01s.material~
===================================================================
--- media/materials/scripts/hs-w01s.material~ (rev 0)
+++ media/materials/scripts/hs-w01s.material~ 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,26 @@
+material hs-w01s/TEXFACE/hs-w01s.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ scene_blend add
+ texture_unit
+ {
+ texture hs-w01s.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/scripts/laserbeam.material
===================================================================
--- media/materials/scripts/laserbeam.material (rev 0)
+++ media/materials/scripts/laserbeam.material 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,18 @@
+material laserbeam/TEXFACE/laserbeam.tga
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend add
+ texture_unit
+ {
+ texture laserbeam.tga
+ colour_op modulate
+ }
+ }
+
+ }
+}
Added: media/materials/scripts/laserbeam.material~
===================================================================
--- media/materials/scripts/laserbeam.material~ (rev 0)
+++ media/materials/scripts/laserbeam.material~ 2009-05-18 14:01:54 UTC (rev 2144)
@@ -0,0 +1,24 @@
+material laserbeam/TEXFACE/laserbeam.tga
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend add
+ texture_unit
+ {
+ texture laserbeam.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/textures/can.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/can.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: media/materials/textures/flare.tga
===================================================================
(Binary files differ)
Added: media/materials/textures/hs-w01.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/hs-w01.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/hs-w01s.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/hs-w01s.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/laserbeam.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/laserbeam.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/models/can.mesh
===================================================================
(Binary files differ)
Property changes on: media/models/can.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/models/hs-w01.mesh
===================================================================
(Binary files differ)
Property changes on: media/models/hs-w01.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/models/hs-w01s.mesh
===================================================================
(Binary files differ)
Property changes on: media/models/hs-w01s.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/models/laserbeam.mesh
===================================================================
(Binary files differ)
Property changes on: media/models/laserbeam.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the Orxonox-commit
mailing list