Changeset 9526 for code/trunk/data/levels

Timestamp:

Feb 19, 2013, 10:25:42 AM (11 years ago)

Author:

jo

Message:

Merging presentationHS12 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/bigshipPresentation.oxw (copied) (copied from code/branches/presentationHS12/data/levels/bigshipPresentation.oxw)
• data/levels/collateralDamageDemo.oxw (copied) (copied from code/branches/presentationHS12/data/levels/collateralDamageDemo.oxw)
• data/levels/gallery.oxw (modified) (1 diff)
• data/levels/includes/weaponSettingsCollateral.oxi (copied) (copied from code/branches/presentationHS12/data/levels/includes/weaponSettingsCollateral.oxi)
• data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsTurret.oxi (copied) (copied from code/branches/presentationHS12/data/levels/includes/weaponSettingsTurret.oxi)
• data/levels/includes/weaponSettingsbigship.oxi (copied) (copied from code/branches/presentationHS12/data/levels/includes/weaponSettingsbigship.oxi)
• data/levels/pong.oxw (modified) (1 diff)
• data/levels/presentationHS12.oxw (copied) (copied from code/branches/presentationHS12/data/levels/presentationHS12.oxw)
• data/levels/templates/bigship.oxt (copied) (copied from code/branches/presentationHS12/data/levels/templates/bigship.oxt)
• data/levels/templates/lodInformation.oxt (modified) (1 diff)
• data/levels/templates/spaceshipCollateralDamage.oxt (copied) (copied from code/branches/presentationHS12/data/levels/templates/spaceshipCollateralDamage.oxt)
• data/levels/templates/spaceshipEscort.oxt (modified) (4 diffs)
• data/levels/templates/spaceshipTurret.oxt (copied) (copied from code/branches/presentationHS12/data/levels/templates/spaceshipTurret.oxt)
• data/levels/turretTest.oxw (copied) (copied from code/branches/presentationHS12/data/levels/turretTest.oxw)

code/trunk/data/levels/gallery.oxw

@@ -68 +68 @@
       <Model position="0,20,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun.mesh" />
       <Model position="0,40,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun-s.mesh" />
-      <Model position="0,60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="laserbeam.mesh" />
+      <Model position="0,60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="LaserBeam.mesh" />
       <Model position="0,80,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="rocket.mesh" />
       <Model position="0,-20,-40" yaw="90" pitch="-90" roll="0" scale="5" mesh="hs-w01.mesh" />

code/trunk/data/levels/includes/weaponSettingsEscort.oxi

@@ -14 +14 @@
         </links>
         <Weapon>
-          <attached>
-            <!--Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,0,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
-            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 /-->
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
+          <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
         </Weapon>
         <Weapon>
-          <attached>
-            <!--Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,0,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 /-->
-          </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=23 />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
+          <!--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" /-->
         </Weapon>
       </WeaponPack>

code/trunk/data/levels/pong.oxw

@@ -93 +93 @@
 <!-- TODO: Create a Pong Score Sound and include it here.
 This WorldSound works, but doesn't make sense, since it is played together with ambient/moodDependedDirectory/Ganymede.ogg -->
-            <!--WorldSound name="scoreSound" position="0,0,0" source="ambient/default/Earth.ogg" >
+            <!--WorldSound name="scoreSound" position="0,0,0" source="sounds/PongScore_cut.ogg" >
               <events>
                 <play>

code/trunk/data/levels/templates/lodInformation.oxt

@@ -15 +15 @@
       <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
       <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
+      <MeshLodInformation mesh=turretHead.mesh enabled=false />
+      <MeshLodInformation mesh=LaserBeam.mesh enabled=false/>
 
       <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->

code/trunk/data/levels/templates/spaceshipEscort.oxt

@@ -2 +2 @@
   <SpaceShip
    hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
+   camerapositiontemplate = spaceshipescortcameras
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
@@ -39 +39 @@
   >
     <engines>
-      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine />
-      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine />
+      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine />
+      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
     </engines>
     <attached>
@@ -62 +62 @@
 </Template>
 
-<Template name=spaceshipassffcameras defaults=0>
+<Template name=spaceshipescortcameras defaults=0>
   <SpaceShip>
     <camerapositions>
-      <CameraPosition position="0,13, 40" drag=true mouselook=true />
-      <CameraPosition position="0,20, 80" drag=true mouselook=true />
+      <CameraPosition position="0,15, 60" drag=true mouselook=true />
+      <CameraPosition position="0,20, 90" drag=true mouselook=true />
       <CameraPosition position="0,30,120" drag=true mouselook=true />
     </camerapositions>
@@ -72 +72 @@
 </Template>
 
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+<Template name=spaceshipescortengine baseclass=MultiStateEngine>
   <MultiStateEngine
    boostfactor    = 2.2