Changeset 9503

Timestamp:

Dec 10, 2012, 3:38:23 PM (11 years ago)

Author:

smerkli

Message:

Merged dawalser's branch

Location:

code/branches/presentationHS12

Files:

• . (modified) (1 prop)
• data/levels/includes/weaponSettingsTurret.oxi (copied) (copied from code/branches/turret/data/levels/includes/weaponSettingsTurret.oxi)
• data/levels/templates/lodInformation.oxt (modified) (1 diff)
• data/levels/templates/spaceshipTurret.oxt (copied) (copied from code/branches/turret/data/levels/templates/spaceshipTurret.oxt)
• data/levels/turretTest.oxw (copied) (copied from code/branches/turret/data/levels/turretTest.oxw)
• src/modules/objects/CMakeLists.txt (modified) (1 diff)
• src/modules/objects/ObjectsPrereqs.h (modified) (1 diff)
• src/modules/objects/Turret.cc (copied) (copied from code/branches/turret/src/modules/objects/Turret.cc)
• src/modules/objects/Turret.h (copied) (copied from code/branches/turret/src/modules/objects/Turret.h)

code/branches/presentationHS12/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 />
 
       <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->

code/branches/presentationHS12/src/modules/objects/CMakeLists.txt

@@ -5 +5 @@
   Script.cc
   SpaceBoundaries.cc
+  Turret.cc
 )
 

code/branches/presentationHS12/src/modules/objects/ObjectsPrereqs.h

@@ -73 +73 @@
     class Script;
     class SpaceBoundaries;
+    class Turret;
 
     // collisionshapes