Changeset 9823

Timestamp:

Nov 25, 2013, 4:10:21 PM (11 years ago)

Author:

jo

Message:

merging latest trunk into branch 'levelMichael'

Location:

code/branches/levelMichael

Files:

• . (modified) (1 prop)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• data/gui/layouts/SingleplayerMenu.layout (modified) (1 diff)
• data/levels/gallery.oxw (modified) (1 diff)
• data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• data/levels/templates/lodInformation.oxt (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/util/CMakeLists.txt (modified) (1 diff)
• src/modules/tetris/TetrisBrick.cc (modified) (1 diff)

code/branches/levelMichael/cmake/LibraryConfig.cmake

@@ -160 +160 @@
 # Expand the next statement if newer boost versions are released
 SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
-                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
+                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
+                              1.53.0)
 IF(NOT TARDIS)
   FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)

code/branches/levelMichael/data/gui/layouts/SingleplayerMenu.layout

@@ -31 +31 @@
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="VertScrollbar" Value="True" />
-                <Property Name="HorzScrollbar" Value="True" />
+                <Property Name="HorzScrollbar" Value="False" />
                 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
+                <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
             </Window>
         </Window>

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

@@ -74 +74 @@
       <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="LaserBeam2.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/branches/levelMichael/data/levels/includes/weaponSettingsEscort.oxi

@@ -14 +14 @@
         </links>
         <Weapon>
-          <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" /-->
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
+          <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
         </Weapon>
         <Weapon>
-          <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" /-->
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
+          <!--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" /-->
         </Weapon>
       </WeaponPack>

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

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

code/branches/levelMichael/src/libraries/core/GUIManager.cc

@@ -350 +350 @@
             CEGUI::System::getSingleton().setXMLParser("XercesParser");
         }
-        catch (const CEGUI::GenericException& e)
+        catch (const CEGUI::GenericException&)
         {
             // Fall back to default parser

code/branches/levelMichael/src/libraries/util/CMakeLists.txt

@@ -48 +48 @@
     ${CEGUI_LIBRARY}
     ${OGRE_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
   SOURCE_FILES
     ${UTIL_SRC_FILES}

code/branches/levelMichael/src/modules/tetris/TetrisBrick.cc

@@ -54 +54 @@
     {
         RegisterObject(TetrisBrick);
-        this->shapeIndex_ = static_cast<unsigned int>(rnd(7.0f)); //<! random number between 0 and 7
+        this->shapeIndex_ = 1 + static_cast<unsigned int>(rnd(6.0f)); //<! random number between 0 and 7
         this->stonesPerBrick_ = 4; //<! most tetris bricks is formed by 4 stones
         this->delay_ = false;