Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 25, 2013, 3:25:56 PM (11 years ago)
Author:
jo
Message:

merged recent trunk features into 'levelElias' branch

Location:
code/branches/levelElias
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/levelElias

  • code/branches/levelElias/data/levels/gallery.oxw

    r9664 r9811  
    7474      <Model position="0, 20,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun.mesh" />
    7575      <Model position="0, 40,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun-s.mesh" />
    76       <Model position="0, 60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="LaserBeam.mesh" />
     76      <Model position="0, 60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="LaserBeam2.mesh" />
    7777      <Model position="0, 80,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="rocket.mesh" />
    7878      <Model position="0,-20,-40" yaw="90" pitch="-90" roll="0" scale="5" mesh="hs-w01.mesh" />
  • code/branches/levelElias/data/levels/includes/weaponSettingsEscort.oxi

    r9664 r9811  
    1414        </links>
    1515        <Weapon>
    16           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
    17           <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
     16          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
     17          <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
    1818        </Weapon>
    1919        <Weapon>
    20           <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
    21           <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam.mesh" /-->
     20          <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
     21          <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam2.mesh" /-->
    2222        </Weapon>
    2323      </WeaponPack>
  • code/branches/levelElias/data/levels/templates/lodInformation.oxt

    r9810 r9811  
    1616      <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
    1717      <MeshLodInformation mesh=turretHead.mesh enabled=false />
    18       <MeshLodInformation mesh=LaserBeam.mesh enabled=false/>
     18      <MeshLodInformation mesh=LaserBeam2.mesh enabled=false/>
    1919      <MeshLodInformation mesh=asteroid_ice.mesh enabled=false/>
    2020      <MeshLodInformation mesh=ast1.mesh  lodQuality=0.1/>
Note: See TracChangeset for help on using the changeset viewer.