Changeset 8592 for code/branches/presentation

Timestamp:

May 26, 2011, 1:44:06 PM (14 years ago)

Author:

dafrick

Message:

Merging weapons branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsAssff2.oxi (copied) (copied from code/branches/weapons/data/levels/includes/weaponSettingsAssff2.oxi)
• data/levels/templates/spaceshipAssff2.oxt (copied) (copied from code/branches/weapons/data/levels/templates/spaceshipAssff2.oxt)
• data/particle/weaponflare.particle (copied) (copied from code/branches/weapons/data/particle/weaponflare.particle)
• data/particle/weaponshoot.particle (copied) (copied from code/branches/weapons/data/particle/weaponshoot.particle)

code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi

@@ -30 +30 @@
         <Weapon>
           <attached>
-            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
-            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
+            <Model mesh="stunweapon.mesh" pitch="180" roll="0" yaw="0" position="1.9,-.5,1" scale=".5"/>
+            <BlinkingBillboard position="1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
           </attached>
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
+          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
         </Weapon>
         <Weapon>