Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 23, 2017, 2:56:00 PM (7 years ago)
Author:
patricwi
Message:

reset back in time

Location:
code/branches/HUD_HS16
Files:
19 deleted
18 edited
4 copied

Legend:

Unmodified
Added
Removed

  • code/branches/HUD_HS16

  • code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout

    r11497 r11499  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10 
    11         <!-- Misson 1************************************* -->
    12         <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Text" >
     10        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
    1311            <Property Name="Text" Value="Mission One" />
    1412            <Property Name="Visible" Value="False"/>
    15             <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
     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}}" />
    1615            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
    1716        </Window>
    18 
    19         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission1Button" >
     17        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
     18            <Property Name="Text" Value="Fight in our Back" />
    2019            <Property Name="Visible" Value="False"/>
    2120            <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" >
    28             <Property Name="Text" Value="Fight in our Back" />
    29             <Property Name="Visible" Value="False"/>
    30             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
     21            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
    3122            <Property Name="Disabled" Value="True" />
    3223            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
    3324        </Window>
    34 
    35         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
     25        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
     26            <Property Name="Text" Value="Pirate Attack" />
    3627            <Property Name="Visible" Value="False"/>
    3728            <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" >
    45             <Property Name="Text" Value="Pirate Attack" />
    46             <Property Name="Visible" Value="False"/>
    47             <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.75,0},{0.8,0},{0.8,0}}" />
     29            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
    4830            <Property Name="Disabled" Value="True" />
    4931            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
    5032        </Window>
    51         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
    52 
     33        <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
     34            <Property Name="Text" Value="Trip to Area 51" />
    5335            <Property Name="Visible" Value="False"/>
    5436            <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" >
    62             <Property Name="Text" Value="Trip to Area 51" />
    63             <Property Name="Visible" Value="False"/>
    64             <Property Name="UnifiedAreaRect" Value="{{0.575,0},{0.5,0},{0.775,0},{0.55,0}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
    6538            <Property Name="Disabled" Value="True" />
    6639            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
    6740        </Window>
    68         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
    69 
     41        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
     42            <Property Name="Text" Value="Area 51 under Fire" />
    7043            <Property Name="Visible" Value="False"/>
    7144            <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" >
    79             <Property Name="Text" Value="Area 51 under Fire" />
    80             <Property Name="Visible" Value="False"/>
    81             <Property Name="UnifiedAreaRect" Value="{{0.625,0},{0.4,0},{0.825,0},{0.45,0}}" />
     45            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
    8246            <Property Name="Disabled" Value="True" />
    8347            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
    8448        </Window>
    85         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
    86 
     49        <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
     50            <Property Name="Text" Value="Escape the Bastards" />
    8751            <Property Name="Visible" Value="False"/>
    8852            <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" >
    96             <Property Name="Text" Value="Escape the Bastards" />
    97             <Property Name="Visible" Value="False"/>
    98             <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.1,0},{0.725,0},{0.15,0}}" />
     53            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
    9954            <Property Name="Disabled" Value="True" />
    10055            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
    10156        </Window>
    102         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
    103 
     57        <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
     58            <Property Name="Text" Value="Expedition to Sector 5C" />
    10459            <Property Name="Visible" Value="False"/>
    10560            <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" >
    113             <Property Name="Text" Value="Expedition to Sector 5C" />
    114             <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"/>
    122             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    123             <Property Name="UnifiedAreaRect" Value="{{0.47,0},{0.13,0},{0.525,0},{0.23,0}}" />
     61            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
    12462            <Property Name="Disabled" Value="True" />
    12563            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
    12664        </Window>
    127 
    128         <!-- Misson 8************************************* -->
    129         <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Text" >
     65        <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
    13066            <Property Name="Text" Value="Shuttle under Attack" />
    13167            <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"/>
    13968            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    140             <Property Name="UnifiedAreaRect" Value="{{0.33,0},{0.1,0},{0.38,0},{0.18,0}}" />
     69            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
    14170            <Property Name="Disabled" Value="True" />
    14271            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
    14372        </Window>
    144 
    145         <!-- Misson 9************************************* -->
    146         <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Text" >
     73        <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
    14774            <Property Name="Text" Value="Retaliation" />
    14875            <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"/>
    15676            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    157             <Property Name="UnifiedAreaRect" Value="{{0.18,0},{0.07,0},{0.24,0},{0.145,0}}" />
     77            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
    15878            <Property Name="Disabled" Value="True" />
    15979            <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
    16080        </Window>
    16181
    162         <!-- Back Button************************************* -->
     82
    16383        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
    16484            <Property Name="Text" Value="Back" />
    16585            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    166             <Property Name="UnifiedAreaRect" Value="{{0.75,0},{0.9,0},{0.95,0},{0.95,0}}" />
     86            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
    16787            <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/>
    16888        </Window>

  • code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout

    r11497 r11499  
    1111            <Property Name="Text" Value="Quickstart" />
    1212            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    13             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.25,0},{0.6,0},{0.3,0}}" />
     13            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
    1414            <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
    1515        </Window>
    … …  
    1717            <Property Name="Text" Value="Singleplayer" />
    1818            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    19             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.325,0},{0.6,0},{0.375,0}}" />
     19            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
    2020            <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
    2121        </Window>
    … …  
    2323            <Property Name="Text" Value="Multiplayer" />
    2424            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    25             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.45,0}}" />
     25            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
    2626            <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
    27         </Window>
    28         <Window Type="MenuWidgets/Button" Name="orxonox/HighscoreButton" >
    29             <Property Name="Text" Value="Highscore" />
    30             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    31             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.475,0},{0.6,0},{0.525,0}}" />
    32             <Event Name="Clicked" Function="MainMenu.HighscoreButton_clicked"/>
    3327        </Window>
    3428        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsButton" >
    3529            <Property Name="Text" Value="Settings" />
    3630            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.55,0},{0.6,0},{0.6,0}}" />
     31            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
    3832            <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
    3933        </Window>
    … …  
    4135            <Property Name="Text" Value="Credits" />
    4236            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    43             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
    4438            <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
    4539        </Window>
    … …  
    4741            <Property Name="Text" Value="Exit" />
    4842            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    49             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{0.6,0},{0.75,0}}" />
     43            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    5044            <Event Name="Clicked" Function="MainMenu.ExitButton_clicked"/>
    5145        </Window>

  • code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme

    r11497 r11499  
    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" />
    4442</GUIScheme>

  • code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme

    r11497 r11499  
    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" />
    53 
    54     <!-- Special Button for CampaignMenu -->
    55     <FalagardMapping WindowType="OrxonoxLook/JuuButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/JuuButton" />
    56 
     52    <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
    5753</GUIScheme>

  • code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme

    r11497 r11499  
    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" />
    4442</GUIScheme>

  • code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme

    r11497 r11499  
    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" />
    4442</GUIScheme>

  • code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme

    r11497 r11499  
    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" />
    5653</GUIScheme>

  • code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme

    r11497 r11499  
    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" />
    4442</GUIScheme>

  • code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme

    r11497 r11499  
    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    
    5453</GUIScheme>

  • code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua

    r11497 r11499  
    99function P.updateButtons()
    1010    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
    11     P.updateButton(0, winMgr:getWindow("orxonox/Mission1Text"))
    1211    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
    13     P.updateButton(1, winMgr:getWindow("orxonox/Mission2Text"))
    1412    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
    15     P.updateButton(2, winMgr:getWindow("orxonox/Mission3Text"))
    1613    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
    17     P.updateButton(3, winMgr:getWindow("orxonox/Mission4Text"))
    1814    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
    19     P.updateButton(4, winMgr:getWindow("orxonox/Mission5Text"))
    2015    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
    21     P.updateButton(5, winMgr:getWindow("orxonox/Mission6Text"))
    2216    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
    23     P.updateButton(6, winMgr:getWindow("orxonox/Mission7Text"))
    2417    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
    25     P.updateButton(7, winMgr:getWindow("orxonox/Mission8Text"))
    2618    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
    27     P.updateButton(8, winMgr:getWindow("orxonox/Mission9Text"))
    2819
    2920
    … …  
    10697
    10798function P.loadLevel(level)
    108     orxonox.execute("changeGame " .. level:getXMLFilename())
     99    orxonox.execute("startGame " .. level:getXMLFilename())
    109100    hideAllMenuSheets()
    110101end
    … …  
    127118
    128119function P.CampaignMenuBackButton_clicked(e)
    129     orxonox.execute("startMainMenu")
    130     hideMenuSheet("CampaignMenu")
     120    hideMenuSheet(P.name)
    131121end
    132122

  • code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua

    r11497 r11499  
    22
    33local P = createMenuSheet("MainMenu")
    4 P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "HighscoreMenu", "SettingsMenu", "CreditsMenu" }
     4P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "SettingsMenu", "CreditsMenu" }
    55
    66function P.onLoad()
    … …  
    2222
    2323    P:setButton(4, 1, {
    24             ["button"] = winMgr:getWindow("orxonox/HighscoreButton"),
    25             ["callback"]  = P.MultiplayerButton_clicked
    26     })
    27 
    28     P:setButton(5, 1, {
    2924            ["button"] = winMgr:getWindow("orxonox/SettingsButton"),
    3025            ["callback"]  = P.SettingsButton_clicked
    3126    })
    3227
    33     P:setButton(6, 1, {
     28    P:setButton(5, 1, {
    3429            ["button"] = winMgr:getWindow("orxonox/CreditsButton"),
    3530            ["callback"]  = P.CreditsButton_clicked
    3631    })
    3732
    38     P:setButton(7, 1, {
     33    P:setButton(6, 1, {
    3934            ["button"] = winMgr:getWindow("orxonox/ExitButton"),
    4035            ["callback"]  = P.ExitButton_clicked
    … …  
    5651end
    5752
    58 function P.HighscoreButton_clicked(e)
    59     showMenuSheet("HighscoreMenu", true)
    60 end
    61 
    6253function P.SettingsButton_clicked(e)
    6354    showMenuSheet("SettingsMenu", true)

  • code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua

    r11497 r11499  
    1818
    1919    P.commandList = {}
    20     table.insert(P.commandList, "Highscore playerName_")
    2120    table.insert(P.commandList, "KeyBinder mouseSensitivity_")
    2221    table.insert(P.commandList, "KeyBinder mouseSensitivityDerived_")
    … …  
    4443
    4544    P.nameList = {}
    46     table.insert(P.nameList, "Playername")
    4745    table.insert(P.nameList, "Mouse sensitivity")
    4846    table.insert(P.nameList, "Mouse acceleration")

  • code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua

    r11497 r11499  
    172172
    173173function P.CampaignButton_clicked(e)
    174     -- showMenuSheet("CampaignMenu", true)
    175     hideAllMenuSheets()
    176     orxonox.execute("startGame StoryModeMap.oxw")
     174    showMenuSheet("CampaignMenu", true)
    177175end
    178176

  • code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw

    r11497 r11499  
    3434
    3535<!-- HeavyCruiser and all its parts in one static entity -->
    36     <!--StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     36    <StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
    3737    <attached>
    3838            <Model mesh="HeavyCruiser_body.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
    … …  
    4646            <Model mesh="HeavyCruiser_sidearmRfront.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
    4747           
     48            <!-- bay1 lights -->
    4849            <BlinkingBillboard position="75,30,-416" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.05 frequency=0.3 phase=240 quadratic=1 />
    4950            <BlinkingBillboard position="-75,30,-416" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.05 frequency=0.3 phase=240 quadratic=1 />
    … …  
    5253            <BlinkingBillboard position="73,30,-388" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.15 frequency=0.3 phase=0 quadratic=1 />
    5354            <BlinkingBillboard position="-73,30,-388" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.15 frequency=0.3 phase=0 quadratic=1 />
    54 
     55            <!-- front position lights -->
    5556            <BlinkingBillboard position="67,-5,-240" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
    5657            <BlinkingBillboard position="-67,-5,-240" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
    5758            <BlinkingBillboard position="72,51,-380" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
    5859            <BlinkingBillboard position="-72,51,-380" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
    59 
     60            <!-- rear position lights -->
    6061            <BlinkingBillboard position="95,-15,483" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
    6162            <BlinkingBillboard position="-95,-15,483" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
    … …  
    292293        <BoxCollisionShape position="0,18,69" halfExtents="23,12,1" info="HOOKBOX, wide"/>
    293294        <BoxCollisionShape position="0,18,47" halfExtents="23,12,1" info="HOOKBOX, wide"/>
     295       
     296<!--         <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
     297        <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
     298        <BoxCollisionShape position="-11,18,80" halfExtents="10,10,10" info="HOOK, partL"/>
     299        <BoxCollisionShape position="11,18,80" halfExtents="10,10,10" info="HOOK, partR"/>
     300        <BoxCollisionShape position="-11,18,58" halfExtents="10,10,10" info="HOOK, frontL"/>
     301        <BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="HOOK, frontR"/>-->
    294302    </collisionShapes>
    295     </StaticEntity-->
     303    </StaticEntity>
    296304
    297305    <!-- Width/Height/Lenght--><!-- B=back F=front C=center-->
    298     <!--StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     306    <StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
    299307    <attached>
    300308        <Model position="80,33,-320" mesh="cube.mesh" scale3D="7,11,54" info="frontR"/>
    … …  
    350358        <Model position="153,60,-65" roll="-15" mesh="cube.mesh" scale3D="4,3,4" info="sidearmRfront, top"/>
    351359        <Model position="153,59,-41" roll="-15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmRfront, top"/>
     360
     361        <!--<Model position="145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmRfront, HOOK"/>-->
    352362
    353363
    … …  
    389399        <Model position="-153,59,-41" roll="15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmLfront, top"/>
    390400
     401        <!--<Model position="-145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmLfront, HOOK"/>-->
     402
    391403
    392404        <Model position="60,35,-310" mesh="cube.mesh" scale3D="13,28,60" info="body, bay1, Rwall"/>
    … …  
    532544    <collisionShapes>
    533545    </collisionShapes>
    534     </StaticEntity-->
     546    </StaticEntity>
    535547
    536548
    … …  
    726738    </Pawn>
    727739
    728     <!--Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmL radarname = "HIDDEN" >
     740    <Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmL radarname = "HIDDEN" >
    729741
    730742        <explosion>
    … …  
    740752            <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
    741753           
     754            <!-- <BoxCollisionShape position="-109,47,87" halfExtents="29,8,26" info="sidearmL, upper connection"/>
     755            <BoxCollisionShape position="-99,-1,79" roll="15" halfExtents="40,4,9" info="sidearmL, lower connection"/>-->
    742756            <BoxCollisionShape position="-151,47,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontTop"/>
    743757            <BoxCollisionShape position="-136,-7,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontBottom"/>
    … …  
    746760            <BoxCollisionShape position="-145,21,12" roll="15" halfExtents="16,28,2" info="sidearmL, front"/>
    747761            <BoxCollisionShape position="-140,12,261" roll="15" halfExtents="22,41,43" info="sidearmL, back"/>
     762            <!--<BoxCollisionShape position="-145,25,5" roll="15" halfExtents="10,18,5" info="sidearmL, front break"/>-->
    748763            <BoxCollisionShape position="-133,-13,29" roll="15" halfExtents="12,6,17" info="sidearmL, bottom cylinder"/>
    749764            <BoxCollisionShape position="-165,-4,31" roll="15" halfExtents="7,21,13" info="sidearmL, box"/>
    … …  
    801816        <collisionShapes>
    802817            <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
     818
     819        <!--<BoxCollisionShape position="109,47,87" halfExtents="29,8,26" info="sidearmR, upper connection"/>
     820            <BoxCollisionShape position="99,-1,79" roll="-15" halfExtents="40,4,9" info="sidearmR, lower connection"/>-->
    803821            <BoxCollisionShape position="151,47,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontTop"/>
    804822            <BoxCollisionShape position="136,-7,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontBottom"/>
    … …  
    807825            <BoxCollisionShape position="145,21,12" roll="-15" halfExtents="16,28,2" info="sidearmR, front"/>
    808826            <BoxCollisionShape position="140,12,261" roll="-15" halfExtents="22,41,43" info="sidearmR, back"/>
     827            <!--<BoxCollisionShape position="145,25,5" roll="-15" halfExtents="10,18,5" info="sidearmR, front break"/>-->
    809828            <BoxCollisionShape position="133,-13,29" roll="-15" halfExtents="12,6,17" info="sidearmR, bottom cylinder"/>
    810829            <BoxCollisionShape position="165,-4,31" roll="-15" halfExtents="7,21,13" info="sidearmR, box"/>
    … …  
    911930            <BoxCollisionShape position="96,33,-230" halfExtents="13,17,22" info="partR"/>
    912931        </collisionShapes>
    913     </Pawn-->
     932    </Pawn>
    914933   
    915934
    … …  
    918937
    919938    <SpawnPoint team=0 position="0,0,0" lookat="0,0,-100" spawnclass=SpaceShip pawndesign=HeavyCruiserBody />
     939   
     940    <?lua
     941        --[[
     942            With this lua script, the sub-parts of HeavyCruiser can easily be inserted into a level.
     943            Available functions are:
     944              To place all subparts:
     945                 placeAllSubParts(team, posX, posY, posZ, dirX, dirY, dirZ)
     946              To place individual parts:
     947                 placeFrontL(...)   Use the same arguments as in placeAllSubParts
     948                 placeFrontR(...)
     949                 placePartL(...)
     950                 placePartR(...)
     951                 placeSidearmL(...)
     952                 placeSidearmLfront(...)
     953                 placeSidearmR(...)
     954                 placeSidearmRfront(...)
     955        ]]--
     956
     957        dofile("includes/HeavyCruiserParts.lua")
     958        placeAllSubParts(0, 0,0,0, 0,0,0)
     959    ?>
    920960   
    921961    <!-- <SpawnPoint team=0 position="0,-200,0" lookat="0,-200,-100" spawnclass=SpaceShip pawndesign=HeavyCruiser /> -->

  • code/branches/HUD_HS16/data/levels/emptyLevel.oxw

    r11497 r11499  
    11<LevelInfo
    2  name = "emptyLevel"
     2 name = "Empty level"
    33 description = "A level with absolutely nothing in it."
    44 tags = "test"
    … …  
    1010  include("HUDTemplates3.oxo")
    1111  include("templates/lodInformation.oxt")
    12   include("templates/HeavyCruiser.oxt")
    1312?>
    1413
    1514<?lua
    1615  include("templates/spaceshipEscort.oxt")
    17   include("templates/endurancetest_template.oxt")
    1816?>
    1917
    … …  
    3129    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
    3230    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
    33 
    34     <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
    35       <templates>
    36         <Template link=endurance />
    37       </templates>
    38     </ModularSpaceShip>
    3931   
    4032  </Scene>

  • code/branches/HUD_HS16/data/levels/events.oxw

    r11497 r11499  
    5757    -->
    5858
    59     <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true" />
    60     <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
    61    
    62     <NextQuestion  question="Continue?" a1="yes" a2="no" >
    63      <possibleQuestions>
    64         <NextQuestion  question="Are you sure?" a1="yep let me continue" a2="no actually not" />
    65         <NextQuestion  question="Why?" a1="Got a dentist's appointment" a2="this sucks" >
    66         <possibleQuestions>
    67           <NextQuestion  question="Are your teeth that bad mate?" a1="yep" a2="leave me alone godammit" />
    68           <NextQuestion  question="You suck" a1="..." a2="Im going now okay" />
    69         </possibleQuestions>
    70       </NextQuestion>
    71       </possibleQuestions>   
     59
     60    <!-- red -->
     61    <!--
     62      Standard:
     63      Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
     64      Every fired event of the source is mapped to the "visibility" state of the listener.
     65
     66      This is a 1:1 mapping between event-listener and event-source.
     67    -->
     68    <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
     69      <events>
     70        <visibility>
     71          <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
     72        </visibility>
     73      </events>
     74    </Billboard>
     75
     76    <!-- HELLO THERE ................................................................ ITS ME -->
     77    <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true"/>
     78    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,0"/>
     79    <DDDialogue string="Hello World3" >
    7280      <events>
    7381        <execute>
    … …  
    7583        </execute>
    7684      </events>
    77     </NextQuestion>
    78 
    79     <DistanceTrigger name="test1" position="100,300,0" target="Pawn" distance=25 stayActive="true" />
    80     <Backlight position="100,300,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,1"/>
    81    
    82     <NextQuestion  question="Wazzp bud?" a1="yes" a2="no" >
    83      <possibleQuestions>
    84         <NextQuestion  question="Do you like fish" a1="yep let me continue" a2="no actually not" />
    85         <NextQuestion  question="Whats your favourite pastime?" a1="Got a dentist's appointment" a2="this sucks" >
    86         <possibleQuestions>
    87           <NextQuestion  question="Whatever?" a1="yep" a2="leave me alone godammit" />
    88           <NextQuestion  question="Turtles then?" a1="..." a2="Im going now okay" />
    89         </possibleQuestions>
    90       </NextQuestion>
    91       </possibleQuestions>   
    92       <events>
    93         <execute>
    94            <EventListener event="test1" />
    95         </execute>
    96       </events>
    97     </NextQuestion>
    98 
    99 
    100     <!-- red -->
    101     <!--
    102       Standard:
    103       Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
    104       Every fired event of the source is mapped to the "visibility" state of the listener.
    105 
    106       This is a 1:1 mapping between event-listener and event-source.
    107     -->
    108     <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
    109       <events>
    110         <visibility>
    111           <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
    112         </visibility>
    113       </events>
    114     </Billboard>
    115 
    116     <!-- HELLO THERE ................................................................ ITS ME -->
    117     <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true"/>
    118     <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,0"/>
    119     <DialogueManager question="Hello World3">
    120       <events>
    121         <execute>
    122            <EventListener event="test" />
    123         </execute>
    124       </events>
    125     </DialogueManager>
    126 
     85    </DDDialogue>
    12786
    12887    <!-- orange -->

  • code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo

    r11497 r11499  
    214214    />
    215215
    216     <GUIOverlay
    217       name = "Dialogue"
    218       guiname = "Dialogue"
    219       visible = "false"
    220     />
    221 
    222   </OverlayGroup>
    223 </Template>
     216  </OverlayGroup>
     217</Template>
Note: See TracChangeset for help on using the changeset viewer.