Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11359


Ignore:
Timestamp:
Mar 9, 2017, 4:30:11 PM (3 years ago)
Author:
patricwi
Message:

story mode map merged

Location:
code/trunk
Files:
12 edited
5 copied

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/data/gui/layouts/CampaignMenu.layout

    r11052 r11359  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
     10
     11        <!-- Misson 1************************************* -->
     12        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Text" >
    1113            <Property Name="Text" Value="Mission One" />
    1214            <Property Name="Visible" Value="False"/>
    13             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    14             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
     15            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
    1516            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
    1617        </Window>
    17         <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
     18
     19        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission1Button" >
     20            <Property Name="Visible" Value="False"/>
     21            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     22            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
     23            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
     24        </Window>
     25
     26        <!-- Misson 2************************************* -->
     27        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Text" >
    1828            <Property Name="Text" Value="Fight in our Back" />
    1929            <Property Name="Visible" Value="False"/>
    20             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    21             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
     30            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
    2231            <Property Name="Disabled" Value="True" />
    2332            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
    2433        </Window>
    25         <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
     34
     35        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
     36            <Property Name="Visible" Value="False"/>
     37            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     38            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
     39            <Property Name="Disabled" Value="True" />
     40            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
     41        </Window>
     42
     43        <!-- Misson 3************************************* -->
     44        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Text" >
    2645            <Property Name="Text" Value="Pirate Attack" />
    2746            <Property Name="Visible" Value="False"/>
    28             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    29             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
     47            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.75,0},{0.8,0},{0.8,0}}" />
    3048            <Property Name="Disabled" Value="True" />
    3149            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
    3250        </Window>
    33         <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
     51        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
     52
     53            <Property Name="Visible" Value="False"/>
     54            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     55            <Property Name="UnifiedAreaRect" Value="{{0.685,0},{0.605,0},{0.75,0},{0.71,0}}" />
     56            <Property Name="Disabled" Value="True" />
     57            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
     58        </Window>
     59
     60        <!-- Misson 4************************************* -->
     61        <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Text" >
    3462            <Property Name="Text" Value="Trip to Area 51" />
    3563            <Property Name="Visible" Value="False"/>
    36             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
     64            <Property Name="UnifiedAreaRect" Value="{{0.575,0},{0.5,0},{0.775,0},{0.55,0}}" />
    3865            <Property Name="Disabled" Value="True" />
    3966            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
    4067        </Window>
    41         <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
     68        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
     69
     70            <Property Name="Visible" Value="False"/>
     71            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     72            <Property Name="UnifiedAreaRect" Value="{{0.78,0},{0.48,0},{0.87,0},{0.59,0}}" />
     73            <Property Name="Disabled" Value="True" />
     74            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
     75        </Window>
     76
     77        <!-- Misson 5************************************* -->
     78        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Text" >
    4279            <Property Name="Text" Value="Area 51 under Fire" />
    4380            <Property Name="Visible" Value="False"/>
    44             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    45             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
     81            <Property Name="UnifiedAreaRect" Value="{{0.625,0},{0.4,0},{0.825,0},{0.45,0}}" />
    4682            <Property Name="Disabled" Value="True" />
    4783            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
    4884        </Window>
    49         <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
     85        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
     86
     87            <Property Name="Visible" Value="False"/>
     88            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     89            <Property Name="UnifiedAreaRect" Value="{{0.725,0},{0.27,0},{0.775,0},{0.37,0}}" />
     90            <Property Name="Disabled" Value="True" />
     91            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
     92        </Window>
     93
     94        <!-- Misson 6************************************* -->
     95        <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Text" >
    5096            <Property Name="Text" Value="Escape the Bastards" />
    5197            <Property Name="Visible" Value="False"/>
    52             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    53             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
     98            <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.1,0},{0.725,0},{0.15,0}}" />
    5499            <Property Name="Disabled" Value="True" />
    55100            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
    56101        </Window>
    57         <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
     102        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
     103
     104            <Property Name="Visible" Value="False"/>
     105            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     106            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
     107            <Property Name="Disabled" Value="True" />
     108            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
     109        </Window>
     110
     111        <!-- Misson 7************************************* -->
     112        <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Text" >
    58113            <Property Name="Text" Value="Expedition to Sector 5C" />
    59114            <Property Name="Visible" Value="False"/>
     115            <Property Name="Disabled" Value="True" />
     116            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
     117            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
     118        </Window>
     119        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission7Button" >
     120
     121            <Property Name="Visible" Value="False"/>
    60122            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    61             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
     123            <Property Name="UnifiedAreaRect" Value="{{0.47,0},{0.13,0},{0.525,0},{0.23,0}}" />
    62124            <Property Name="Disabled" Value="True" />
    63125            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
    64126        </Window>
    65         <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
     127
     128        <!-- Misson 8************************************* -->
     129        <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Text" >
    66130            <Property Name="Text" Value="Shuttle under Attack" />
    67131            <Property Name="Visible" Value="False"/>
     132            <Property Name="Disabled" Value="True" />
     133            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.45,0},{0.25,0}}" />
     134            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
     135        </Window>
     136        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission8Button" >
     137
     138            <Property Name="Visible" Value="False"/>
    68139            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    69             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
     140            <Property Name="UnifiedAreaRect" Value="{{0.33,0},{0.1,0},{0.38,0},{0.18,0}}" />
    70141            <Property Name="Disabled" Value="True" />
    71142            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
    72143        </Window>
    73         <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
     144
     145        <!-- Misson 9************************************* -->
     146        <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Text" >
    74147            <Property Name="Text" Value="Retaliation" />
    75148            <Property Name="Visible" Value="False"/>
     149            <Property Name="Disabled" Value="True" />
     150            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.145,0},{0.3,0},{0.195,0}}" />
     151            <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
     152        </Window>
     153        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission9Button" >
     154
     155            <Property Name="Visible" Value="False"/>
    76156            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
     157            <Property Name="UnifiedAreaRect" Value="{{0.18,0},{0.07,0},{0.24,0},{0.145,0}}" />
    78158            <Property Name="Disabled" Value="True" />
    79159            <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
    80160        </Window>
    81161
    82 
     162        <!-- Back Button************************************* -->
    83163        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
    84164            <Property Name="Text" Value="Back" />
    85165            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    86             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
     166            <Property Name="UnifiedAreaRect" Value="{{0.75,0},{0.9,0},{0.95,0},{0.95,0}}" />
    87167            <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/>
    88168        </Window>
  • code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme

    r7887 r11359  
    4040    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="OrxonoxLook/Tooltip" />
    4141    <WindowAlias Alias="HUDWidgets/Tree"                     Target="OrxonoxLook/Tree" />
     42
     43    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="OrxonoxLook/JuuButton" />
    4244</GUIScheme>
  • code/trunk/data/gui/schemes/OrxonoxLook.scheme

    r8079 r11359  
    5050    <FalagardMapping WindowType="OrxonoxLook/VUMeter"                     TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="OrxonoxLook/VUMeter" />
    5151    <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="OrxonoxLook/LargeVerticalScrollbar" />
    52     <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
     52    <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"         LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
     53
     54    <!-- Special Button for CampaignMenu -->
     55    <FalagardMapping WindowType="OrxonoxLook/JuuButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/JuuButton" />
     56
    5357</GUIScheme>
  • code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme

    r7887 r11359  
    4040    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="OrxonoxLook/Tooltip" />
    4141    <WindowAlias Alias="MenuWidgets/Tree"                     Target="OrxonoxLook/Tree" />
     42
     43    <WindowAlias Alias="MenuWidgets/JuuButton"                Target="OrxonoxLook/JuuButton" />
    4244</GUIScheme>
  • code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme

    r6746 r11359  
    4040    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="TaharezGreenLook/Tooltip" />
    4141    <WindowAlias Alias="HUDWidgets/Tree"                     Target="TaharezGreenLook/Tree" />
     42
     43     <WindowAlias Alias="HUDWidgets/ImageButton"              Target="TaharezGreenLook/JuuButton" />
    4244</GUIScheme>
  • code/trunk/data/gui/schemes/TaharezGreenLook.scheme

    r8079 r11359  
    5151    <FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezGreenLook/LargeVerticalScrollbar" />
    5252    <FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/LargeVerticalScrollbarThumb" />
     53
     54    <!-- Special Button for CampaignMenu -->
     55    <FalagardMapping WindowType="TaharezGreenLook/JuuButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/JuuButton" />
    5356</GUIScheme>
  • code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme

    r6746 r11359  
    4040    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="TaharezGreenLook/Tooltip" />
    4141    <WindowAlias Alias="MenuWidgets/Tree"                     Target="TaharezGreenLook/Tree" />
     42
     43        <WindowAlias Alias="MenuWidgets/JuuButton"                Target="TaharezGreenLook/JuuButton" />
    4244</GUIScheme>
  • code/trunk/data/gui/schemes/TaharezLook.scheme

    r8079 r11359  
    5151    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/LargeVerticalScrollbar" />
    5252    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
     53   
    5354</GUIScheme>
  • code/trunk/data/gui/scripts/CampaignMenu.lua

    r11052 r11359  
    99function P.updateButtons()
    1010    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
     11    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Text"))
    1112    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
     13    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Text"))
    1214    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
     15    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Text"))
    1316    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
     17    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Text"))
    1418    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
     19    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Text"))
    1520    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
     21    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Text"))
    1622    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
     23    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Text"))
    1724    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
     25    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Text"))
    1826    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
     27    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Text"))
    1928
    2029
     
    97106
    98107function P.loadLevel(level)
    99     orxonox.execute("startGame " .. level:getXMLFilename())
     108    orxonox.execute("changeGame " .. level:getXMLFilename())
    100109    hideAllMenuSheets()
    101110end
     
    118127
    119128function P.CampaignMenuBackButton_clicked(e)
    120     hideMenuSheet(P.name)
     129    orxonox.execute("startMainMenu")
     130    hideMenuSheet("CampaignMenu")
    121131end
    122132
  • code/trunk/data/gui/scripts/SingleplayerMenu.lua

    r10258 r11359  
    172172
    173173function P.CampaignButton_clicked(e)
    174     showMenuSheet("CampaignMenu", true)
     174    -- showMenuSheet("CampaignMenu", true)
     175    hideAllMenuSheets()
     176    orxonox.execute("startGame StoryModeMap.oxw")
    175177end
    176178
  • code/trunk/src/orxonox/gametypes/CMakeLists.txt

    r9016 r11359  
    1111  TeamGametype.cc
    1212  Mission.cc
     13  StoryMode.cc
    1314)
Note: See TracChangeset for help on using the changeset viewer.