[Orxonox-commit 501] r2175 - in media: levels levels/includes levels/templates materials/scripts materials/textures
jsmely at orxonox.net
jsmely at orxonox.net
Mon May 25 15:01:34 CEST 2009
Author: jsmely
Date: 2009-05-25 15:01:34 +0200 (Mon, 25 May 2009)
New Revision: 2175
Added:
media/levels/includes/weaponsettings3.oxi
media/materials/textures/Lightning_gun4.tga
media/materials/textures/Lightning_gun_pic2.tga
Modified:
media/levels/presentation_dm.oxw
media/levels/templates/spaceship_assff.oxt
media/materials/scripts/LightningGun-s.material
media/materials/scripts/LightningGun.material
Log:
end version
Added: media/levels/includes/weaponsettings3.oxi
===================================================================
--- media/levels/includes/weaponsettings3.oxi (rev 0)
+++ media/levels/includes/weaponsettings3.oxi 2009-05-25 13:01:34 UTC (rev 2175)
@@ -0,0 +1,47 @@
+ <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="0,0,-45" yaw=0 pitch=0 roll=0 />
+ </weaponslots>
+ <weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+ </weaponsets>
+ <weapons>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ </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" position="0,1,0"/>
+ <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0"/>
+ </attached>
+ <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" />
+ <LightningGun mode=1 muzzleoffset="0,0,-20" />
+ </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" position="0,1,0"/>
+ <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,0.5,0"/>
+ </attached>
+ <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" />
+ <LightningGun mode=1 muzzleoffset="0,0,-20" />
+ </Weapon>
+ </WeaponPack>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+ </links>
+ <Weapon>
+ <!-- EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" / -->
+ </Weapon>
+ </WeaponPack>
+ </weapons>
Modified: media/levels/presentation_dm.oxw
===================================================================
--- media/levels/presentation_dm.oxw 2009-05-25 12:46:56 UTC (rev 2174)
+++ media/levels/presentation_dm.oxw 2009-05-25 13:01:34 UTC (rev 2175)
@@ -16,19 +16,14 @@
<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
+for i = 1, 10, 1
do ?>
<SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-<?lua
+<?lua
end
?>
- <Model position="1,2,3" mesh="cube.mesh" />
-
<GlobalShader compositor="Bloom" visible=false>
<events>
<visibility>
@@ -39,20 +34,20 @@
<?lua
-for i = 1, 50, 1
+for i = 1, 100, 1
do
j = math.random()
?>
-
- <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+
+ <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mass=<?lua print(j * 30) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes>
</MovableEntity>
-<?lua
+<?lua
end
?>
Modified: media/levels/templates/spaceship_assff.oxt
===================================================================
--- media/levels/templates/spaceship_assff.oxt 2009-05-25 12:46:56 UTC (rev 2174)
+++ media/levels/templates/spaceship_assff.oxt 2009-05-25 13:01:34 UTC (rev 2175)
@@ -34,7 +34,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("levels/includes/weaponsettings2.oxi")
+ include("levels/includes/weaponsettings3.oxi")
?>
</SpaceShip>
</Template>
Modified: media/materials/scripts/LightningGun-s.material
===================================================================
--- media/materials/scripts/LightningGun-s.material 2009-05-25 12:46:56 UTC (rev 2174)
+++ media/materials/scripts/LightningGun-s.material 2009-05-25 13:01:34 UTC (rev 2175)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture LightningGun-s.tga
+ texture Lightning_gun4.tga
colour_op modulate
}
}
Modified: media/materials/scripts/LightningGun.material
===================================================================
--- media/materials/scripts/LightningGun.material 2009-05-25 12:46:56 UTC (rev 2174)
+++ media/materials/scripts/LightningGun.material 2009-05-25 13:01:34 UTC (rev 2175)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture LightningGun.tga
+ texture Lightning_gun4.tga
colour_op modulate
}
}
Added: media/materials/textures/Lightning_gun4.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/Lightning_gun4.tga
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/Lightning_gun_pic2.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/Lightning_gun_pic2.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the Orxonox-commit
mailing list