[Orxonox-commit 394] r2145 - in media: levels models

[Hagen at orxonox.net]

Author: Hagen
Date: 2009-05-18 16:26:49 +0200 (Mon, 18 May 2009)
New Revision: 2145

Modified:
   media/levels/presentation_dm.oxw
   media/levels/weaponsettings2.oxw
   media/models/can.mesh
Log:
can model fixed, EnergyDrink weapon included

Modified: media/levels/presentation_dm.oxw
===================================================================
--- media/levels/presentation_dm.oxw	2009-05-18 14:01:54 UTC (rev 2144)
+++ media/levels/presentation_dm.oxw	2009-05-18 14:26:49 UTC (rev 2145)
@@ -22,7 +22,7 @@
 <?lua
 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=spaceshipHtwo />
+    <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 
 end
 ?>

Modified: media/levels/weaponsettings2.oxw
===================================================================
--- media/levels/weaponsettings2.oxw	2009-05-18 14:01:54 UTC (rev 2144)
+++ media/levels/weaponsettings2.oxw	2009-05-18 14:26:49 UTC (rev 2145)
@@ -40,7 +40,7 @@
           <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
         </links>
         <Weapon>
-          <FusionFire mode=0 />
+          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
         </Weapon>
       </WeaponPack>
     </weapons>

Modified: media/models/can.mesh
===================================================================
(Binary files differ)