Changeset 9924

Timestamp:

Dec 18, 2013, 1:17:26 PM (11 years ago)

Author:

jo

Message:

merged levelElias

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• data/levels/EscapeTheBastards.oxw (copied) (copied from code/branches/levelElias/data/levels/EscapeTheBastards.oxw)
• data/levels/gallery.oxw (modified) (1 diff)
• data/levels/missionOne.oxw (modified) (1 diff)
• data/levels/pickups.oxw (modified) (1 diff)
• data/levels/portals.oxw (modified) (1 diff)
• data/levels/presentation.oxw (modified) (1 diff)
• data/levels/templates/lodInformation.oxt (modified) (2 diffs)
• data/levels/turretTest.oxw (modified) (2 diffs)

code/branches/presentationHS13/data/levels/gallery.oxw

@@ -152 +152 @@
       <!--Model position="0,80,200" yaw="90" pitch="-90" roll="0" scale="5" mesh="SmallPart1.mesh" /-->
       <Model position="0,-20,200" yaw="90" pitch="-90" roll="0" scale="4" mesh="raceCheckPoint.mesh" />
-      <Model position="0,-40,200" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="Spacegate.mesh" />
+      <Model position="0,-40,200" yaw="90" pitch="0" roll="0" scale="0.5" mesh="Spacegate.mesh" />
 
       <Model position="0,-60,200" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="BigSpacegate.mesh" />

code/branches/presentationHS13/data/levels/missionOne.oxw

@@ -1 @@
-<!---->
+<!-- -->
 <LevelInfo
  name = "Mission One"

code/branches/presentationHS13/data/levels/pickups.oxw

@@ +1 @@
+<!-- -->
 <LevelInfo
  name = "Pickups showcase"

code/branches/presentationHS13/data/levels/portals.oxw

@@ +1 @@
+<!-- -->
  
 <LevelInfo

code/branches/presentationHS13/data/levels/presentation.oxw

@@ +1 @@
+<!-- -->
 <LevelInfo
  name = "Presentation"

code/branches/presentationHS13/data/levels/templates/lodInformation.oxt

@@ -17 +17 @@
       <MeshLodInformation mesh=turretHead.mesh enabled=false />
       <MeshLodInformation mesh=LaserBeam2.mesh enabled=false/>
+      <MeshLodInformation mesh=asteroid_ice.mesh enabled=false/>
+      <MeshLodInformation mesh=ast1.mesh  lodQuality=0.1/>
+      <MeshLodInformation mesh=ast2.mesh  lodQuality=0.1/>
+      <MeshLodInformation mesh=ast3.mesh  lodQuality=0.1/>
+      <MeshLodInformation mesh=ast4.mesh  lodQuality=0.1/>
+      <MeshLodInformation mesh=ast5.mesh  lodQuality=0.1/>
+      <MeshLodInformation mesh=ast6.mesh  lodQuality=0.1/>
 
       <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->
@@ -31 +38 @@
       <MeshLodInformation mesh=HeavyCruiser_sidearmRfront.mesh enabled=false/>
 
-        <MeshLodInformation mesh=ss_cylinder.mesh enabled=false/>
-        <MeshLodInformation mesh=ss_chair.mesh enabled=false/>
-        <MeshLodInformation mesh=ss_flag_room.mesh enabled=false/>
-        <MeshLodInformation mesh=ss_wall.mesh enabled=false/>
+          <MeshLodInformation mesh=ss_cylinder.mesh enabled=false/>
+          <MeshLodInformation mesh=ss_chair.mesh enabled=false/>
+          <MeshLodInformation mesh=ss_flag_room.mesh enabled=false/>
+          <MeshLodInformation mesh=ss_wall.mesh enabled=false/>
 
     </lodinformation>

code/branches/presentationHS13/data/levels/turretTest.oxw

@@ +1 @@
+<!-- -->
+
 <LevelInfo
  name = "turret Test"
@@ -44 +46 @@
 
 
-<Turret position="0,10,0" pitch="90" yaw="0" roll="0">
+<Turret position="-43600,-30500,30000" pitch="90" yaw="0" roll="0">
     <templates>
         <Template link=spaceshipturret />