Changeset 9526 for code/trunk/data/levels/templates

Timestamp:

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

Author:

jo

Message:

Merging presentationHS12 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• 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)

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