Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9823 for code/branches


Ignore:
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:
9 edited

Legend:

Unmodified
Added
Removed
  • code/branches/levelMichael

  • code/branches/levelMichael/cmake/LibraryConfig.cmake

    r9687 r9823  
    160160# Expand the next statement if newer boost versions are released
    161161SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
    162                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
     162                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
     163                              1.53.0)
    163164IF(NOT TARDIS)
    164165  FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
  • code/branches/levelMichael/data/gui/layouts/SingleplayerMenu.layout

    r9016 r9823  
    3131                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    3232                <Property Name="VertScrollbar" Value="True" />
    33                 <Property Name="HorzScrollbar" Value="True" />
     33                <Property Name="HorzScrollbar" Value="False" />
    3434                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
     35                <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
    3536            </Window>
    3637        </Window>
  • code/branches/levelMichael/data/levels/gallery.oxw

    r9664 r9823  
    7474      <Model position="0, 20,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun.mesh" />
    7575      <Model position="0, 40,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun-s.mesh" />
    76       <Model position="0, 60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="LaserBeam.mesh" />
     76      <Model position="0, 60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="LaserBeam2.mesh" />
    7777      <Model position="0, 80,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="rocket.mesh" />
    7878      <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

    r9664 r9823  
    1414        </links>
    1515        <Weapon>
    16           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
    17           <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
     16          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
     17          <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
    1818        </Weapon>
    1919        <Weapon>
    20           <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
    21           <!--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" /-->
     20          <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
     21          <!--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" /-->
    2222        </Weapon>
    2323      </WeaponPack>
  • code/branches/levelMichael/data/levels/templates/lodInformation.oxt

    r9526 r9823  
    1616      <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
    1717      <MeshLodInformation mesh=turretHead.mesh enabled=false />
    18       <MeshLodInformation mesh=LaserBeam.mesh enabled=false/>
     18      <MeshLodInformation mesh=LaserBeam2.mesh enabled=false/>
    1919
    2020      <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->
  • code/branches/levelMichael/src/libraries/core/GUIManager.cc

    r9675 r9823  
    350350            CEGUI::System::getSingleton().setXMLParser("XercesParser");
    351351        }
    352         catch (const CEGUI::GenericException& e)
     352        catch (const CEGUI::GenericException&)
    353353        {
    354354            // Fall back to default parser
  • code/branches/levelMichael/src/libraries/util/CMakeLists.txt

    r8858 r9823  
    4848    ${CEGUI_LIBRARY}
    4949    ${OGRE_LIBRARY}
     50    ${Boost_SYSTEM_LIBRARY}
    5051  SOURCE_FILES
    5152    ${UTIL_SRC_FILES}
  • code/branches/levelMichael/src/modules/tetris/TetrisBrick.cc

    r9667 r9823  
    5454    {
    5555        RegisterObject(TetrisBrick);
    56         this->shapeIndex_ = static_cast<unsigned int>(rnd(7.0f)); //<! random number between 0 and 7
     56        this->shapeIndex_ = 1 + static_cast<unsigned int>(rnd(6.0f)); //<! random number between 0 and 7
    5757        this->stonesPerBrick_ = 4; //<! most tetris bricks is formed by 4 stones
    5858        this->delay_ = false;
Note: See TracChangeset for help on using the changeset viewer.