Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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

trunk merged into hud

Location:
code/branches/HUD_HS16
Files:
8 deleted
41 edited
25 copied

Legend:

Unmodified
Added
Removed

  • code/branches/HUD_HS16

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

    r11052 r11497  
    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/branches/HUD_HS16/data/gui/layouts/MainMenu.layout

    r6746 r11497  
    1111            <Property Name="Text" Value="Quickstart" />
    1212            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    13             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
     13            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.25,0},{0.6,0},{0.3,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.3625,0},{0.6,0},{0.4125,0}}" />
     19            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.325,0},{0.6,0},{0.375,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.4375,0},{0.6,0},{0.4875,0}}" />
     25            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.45,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"/>
    2733        </Window>
    2834        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsButton" >
    2935            <Property Name="Text" Value="Settings" />
    3036            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    31             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.55,0},{0.6,0},{0.6,0}}" />
    3238            <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
    3339        </Window>
    … …  
    3541            <Property Name="Text" Value="Credits" />
    3642            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
     43            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
    3844            <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
    3945        </Window>
    … …  
    4147            <Property Name="Text" Value="Exit" />
    4248            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    43             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
     49            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{0.6,0},{0.75,0}}" />
    4450            <Event Name="Clicked" Function="MainMenu.ExitButton_clicked"/>
    4551        </Window>

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

    r7887 r11497  
    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/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme

    r8079 r11497  
    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/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme

    r7887 r11497  
    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/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme

    r6746 r11497  
    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/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme

    r8079 r11497  
    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/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme

    r6746 r11497  
    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/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme

    r8079 r11497  
    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/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua

    r11052 r11497  
    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/branches/HUD_HS16/data/gui/scripts/MainMenu.lua

    r8079 r11497  
    22
    33local P = createMenuSheet("MainMenu")
    4 P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "SettingsMenu", "CreditsMenu" }
     4P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "HighscoreMenu", "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, {
    2429            ["button"] = winMgr:getWindow("orxonox/SettingsButton"),
    2530            ["callback"]  = P.SettingsButton_clicked
    2631    })
    2732
    28     P:setButton(5, 1, {
     33    P:setButton(6, 1, {
    2934            ["button"] = winMgr:getWindow("orxonox/CreditsButton"),
    3035            ["callback"]  = P.CreditsButton_clicked
    3136    })
    3237
    33     P:setButton(6, 1, {
     38    P:setButton(7, 1, {
    3439            ["button"] = winMgr:getWindow("orxonox/ExitButton"),
    3540            ["callback"]  = P.ExitButton_clicked
    … …  
    5156end
    5257
     58function P.HighscoreButton_clicked(e)
     59    showMenuSheet("HighscoreMenu", true)
     60end
     61
    5362function P.SettingsButton_clicked(e)
    5463    showMenuSheet("SettingsMenu", true)

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

    r9977 r11497  
    1818
    1919    P.commandList = {}
     20    table.insert(P.commandList, "Highscore playerName_")
    2021    table.insert(P.commandList, "KeyBinder mouseSensitivity_")
    2122    table.insert(P.commandList, "KeyBinder mouseSensitivityDerived_")
    … …  
    4344
    4445    P.nameList = {}
     46    table.insert(P.nameList, "Playername")
    4547    table.insert(P.nameList, "Mouse sensitivity")
    4648    table.insert(P.nameList, "Mouse acceleration")

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

    r10258 r11497  
    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/branches/HUD_HS16/data/levels/HeavyCruiser.oxw

    r11052 r11497  
    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 -->
    4948            <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 />
    5049            <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 />
    … …  
    5352            <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 />
    5453            <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 />
    55             <!-- front position lights -->
     54
    5655            <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 />
    5756            <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 />
    5857            <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 />
    5958            <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 />
    60             <!-- rear position lights -->
     59
    6160            <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 />
    6261            <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 />
    … …  
    293292        <BoxCollisionShape position="0,18,69" halfExtents="23,12,1" info="HOOKBOX, wide"/>
    294293        <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"/>-->
    302294    </collisionShapes>
    303     </StaticEntity>
     295    </StaticEntity-->
    304296
    305297    <!-- Width/Height/Lenght--><!-- B=back F=front C=center-->
    306     <StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     298    <!--StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
    307299    <attached>
    308300        <Model position="80,33,-320" mesh="cube.mesh" scale3D="7,11,54" info="frontR"/>
    … …  
    358350        <Model position="153,60,-65" roll="-15" mesh="cube.mesh" scale3D="4,3,4" info="sidearmRfront, top"/>
    359351        <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"/>-->
    362352
    363353
    … …  
    399389        <Model position="-153,59,-41" roll="15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmLfront, top"/>
    400390
    401         <!--<Model position="-145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmLfront, HOOK"/>-->
    402 
    403391
    404392        <Model position="60,35,-310" mesh="cube.mesh" scale3D="13,28,60" info="body, bay1, Rwall"/>
    … …  
    544532    <collisionShapes>
    545533    </collisionShapes>
    546     </StaticEntity>
     534    </StaticEntity-->
    547535
    548536
    … …  
    738726    </Pawn>
    739727
    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" >
     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" >
    741729
    742730        <explosion>
    … …  
    752740            <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
    753741           
    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"/>-->
    756742            <BoxCollisionShape position="-151,47,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontTop"/>
    757743            <BoxCollisionShape position="-136,-7,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontBottom"/>
    … …  
    760746            <BoxCollisionShape position="-145,21,12" roll="15" halfExtents="16,28,2" info="sidearmL, front"/>
    761747            <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"/>-->
    763748            <BoxCollisionShape position="-133,-13,29" roll="15" halfExtents="12,6,17" info="sidearmL, bottom cylinder"/>
    764749            <BoxCollisionShape position="-165,-4,31" roll="15" halfExtents="7,21,13" info="sidearmL, box"/>
    … …  
    816801        <collisionShapes>
    817802            <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"/>-->
    821803            <BoxCollisionShape position="151,47,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontTop"/>
    822804            <BoxCollisionShape position="136,-7,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontBottom"/>
    … …  
    825807            <BoxCollisionShape position="145,21,12" roll="-15" halfExtents="16,28,2" info="sidearmR, front"/>
    826808            <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"/>-->
    828809            <BoxCollisionShape position="133,-13,29" roll="-15" halfExtents="12,6,17" info="sidearmR, bottom cylinder"/>
    829810            <BoxCollisionShape position="165,-4,31" roll="-15" halfExtents="7,21,13" info="sidearmR, box"/>
    … …  
    930911            <BoxCollisionShape position="96,33,-230" halfExtents="13,17,22" info="partR"/>
    931912        </collisionShapes>
    932     </Pawn>
     913    </Pawn-->
    933914   
    934915
    … …  
    937918
    938919    <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     ?>
    960920   
    961921    <!-- <SpawnPoint team=0 position="0,-200,0" lookat="0,-200,-100" spawnclass=SpaceShip pawndesign=HeavyCruiser /> -->

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

    r11052 r11497  
    11<LevelInfo
    2  name = "Empty level"
     2 name = "emptyLevel"
    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")
    1213?>
    1314
    1415<?lua
    1516  include("templates/spaceshipEscort.oxt")
     17  include("templates/endurancetest_template.oxt")
    1618?>
    1719
    … …  
    2931    <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"/>
    3032    <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>
    3139   
    3240  </Scene>

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

    r11395 r11497  
    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>   
     72      <events>
     73        <execute>
     74           <EventListener event="test" />
     75        </execute>
     76      </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
    5999
    60100    <!-- red -->

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

    r11352 r11497  
    214214    />
    215215
    216   </OverlayGroup>
    217 </Template>
     216    <GUIOverlay
     217      name = "Dialogue"
     218      guiname = "Dialogue"
     219      visible = "false"
     220    />
     221
     222  </OverlayGroup>
     223</Template>

  • code/branches/HUD_HS16/src/modules/CMakeLists.txt

    r11395 r11497  
    2626################ Sub Directories ################
    2727
     28ADD_SUBDIRECTORY(dialogue)
    2829ADD_SUBDIRECTORY(designtools)
    2930ADD_SUBDIRECTORY(dialogue)
    … …  
    4546ADD_SUBDIRECTORY(dodgerace)
    4647ADD_SUBDIRECTORY(hover)
     48ADD_SUBDIRECTORY(superorxobros)

  • code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc

    r11071 r11497  
    3636#include "DodgeRaceCube.h"
    3737#include "core/CoreIncludes.h"
     38#include "Highscore.h"
    3839
    3940namespace orxonox
    … …  
    224225        // It will misteriously crash the game!
    225226        // Instead startMainMenu, this won't crash.
     227        if (Highscore::exists()){
     228                    int score = this->getPoints();
     229                    if(score > Highscore::getInstance().getHighestScoreOfGame("Dodge Race"))
     230                        Highscore::getInstance().storeHighscore("Dodge Race",score);
     231
     232          }
    226233        GSLevel::startMainMenu();
    227234    }

  • code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt

    r10624 r11497  
    33  RaceCheckPoint.cc
    44  SpaceRaceManager.cc
    5   OldSpaceRace.cc
    6   OldRaceCheckPoint.cc
     5
    76  SpaceRaceBot.cc
    87  SpaceRaceController.cc

  • code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc

    r11071 r11497  
    2323 *     Mauro Salomon
    2424 *   Co-authors:
    25  *      Celine Egger
    26  *
    27  */
     25 *      Celine Egger*/
     26       
     27
     28
     29
     30/*
     31Edited, Renewed and Revised by
     32        Berkay Berabi
     33        Louis Meile
     34 
     35 
     36To-do- list by Louis Meile and Berkay Berabi for future projects :
     37- improve AI (SpaceRaceController):
     38i) so far bots arent able to evade obstacles. fix that!
     39ii) bots should be able to use pickups
     40- game crashes when bot wins the game(this is a huge problem you should work with the log file to find out what the errors are )
     41- bots rotate while waiting for the countdown to end. make it stop!
     42- add elements to level file to make it even more fun to play. be creative!
     43*/
     44
    2845
    2946#include "SpaceRace.h"
    3047
     48#include "core/CoreIncludes.h"
     49#include "chat/ChatManager.h"
     50#include "util/Convert.h"
     51#include "util/Math.h"
     52#include "infos/Bot.h"
     53#include "items/Engine.h"
     54#include "controllers/HumanController.h"
     55
     56#include "core/CoreIncludes.h"
     57#include "chat/ChatManager.h"
     58#include "infos/PlayerInfo.h"
     59#include "worldentities/pawns/Pawn.h"
     60#include "core/config/ConfigValueIncludes.h"
     61#include "infos/Bot.h"
     62#include "SpaceRaceBot.h"
    3163#include "items/Engine.h"
    3264
    … …  
    3769#include "SpaceRaceBot.h"
    3870#include "items/Engine.h"
     71#include <vector>
     72
    3973
    4074namespace orxonox
    … …  
    4680        RegisterObject(SpaceRace);
    4781
    48         this->botclass_ = Class(SpaceRaceBot);//ClassByString("")
     82        this->botclass_ = Class(SpaceRaceBot); //ClassByString("")
    4983        this->cantMove_ = false;
    5084        this->bTimeIsUp_ = false;
    51         this->numberOfBots_ = 0; // quick fix: don't allow default-bots to enter the race
    52                                  // remove this line, if a raceBot has been created.
    53     }
     85        this->setConfigValues();
     86
     87        this->numberOfBots_ = 5; // quick fix: don't allow default-bots to enter the race
     88        //we fixed the number of bots in order to have the same starting position all the time !
     89    }
     90
     91  void SpaceRace::setConfigValues()
     92    {
     93       
     94   
     95    }
     96
     97    void SpaceRace::start()
     98    {
     99    // define spawn positions of the 5 bots
     100
     101        int startpos[15];
     102       
     103        startpos[0] =100;
     104        startpos[1] =-40;
     105        startpos[2] =0;
     106       
     107        startpos[3] =100;
     108        startpos[4] =-40;
     109        startpos[5] =100;
     110       
     111        startpos[6] =100;
     112        startpos[7] =-40;
     113        startpos[8] =-100;
     114       
     115        startpos[9] =0;
     116        startpos[10] =-40;
     117        startpos[11] =-80;
     118       
     119        startpos[12] =0;
     120        startpos[13] =-40;
     121        startpos[14] =80;
     122       
     123
     124
     125
     126        Gametype::start();
     127   if (true)
     128        {
     129            this->spawnPlayersIfRequested();
     130            this->cantMove_ = true;
     131            //players are unable to move while countdown is running
     132            for (Engine* engine : ObjectList<Engine>()){
     133                engine->setActive(false);
     134               
     135
     136            }
     137           //append spawn positions to bots
     138           int a,b,c;
     139            a=0;
     140            b=1;
     141            c=2;
     142              for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>()){
     143                bot->getControllableEntity()->setPosition(startpos[a],startpos[b],startpos[c]);
     144               a= a+3;
     145               b = b+3;
     146               c+= 3;
     147            }
     148
     149
     150        }
     151
     152                                               
     153
     154        std::string message("Use headphones to hear the countdown!");
     155        this->getGametypeInfo()->sendAnnounceMessage(message);
     156        ChatManager::message(message);
     157
     158//after 11 seconds , countdownFinished function is called to activate bots` engines
     159Timer* countdownTimer = new Timer();
     160        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
     161    }
     162
     163
     164
    54165
    55166    void SpaceRace::end()
    … …  
    63174        {
    64175            message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
    65                         + "You didn't reach the check point  before the time limit. You lose!";
     176                        + "You lose!";
    66177        }
    67178        else
    68179        {
    69             message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
     180            message = "You win!! Final check point reached after "+ multi_cast<std::string>(s)
    70181                        + "." + multi_cast<std::string>(ms) + " seconds.";
    71182        }
    … …  
    78189    }
    79190
    80     void SpaceRace::tick(float dt)
     191
     192void SpaceRace::tick(float dt)
    81193    {
    82194        SUPER(SpaceRace,tick,dt);
    83 
    84         // spawn the players already when the countdown starts, but deactivate their engines
    85         if (this->isStartCountdownRunning() && !this->cantMove_)
    86         {
    87             this->spawnPlayersIfRequested();
    88             this->cantMove_ = true;
    89 
    90             for (Engine* engine : ObjectList<Engine>())
    91                 engine->setActive(false);
    92         }
    93 
    94         // activate the engines again if the countdown ends
    95         if (!this->isStartCountdownRunning() && this->cantMove_)
    96         {
    97             for (Engine* engine : ObjectList<Engine>())
    98                 engine->setActive(true);
    99 
    100             this->cantMove_= false;
    101 
    102             std::string message = "The match has started! Reach the check points as quickly as possible!";
    103             this->getGametypeInfo()->sendAnnounceMessage(message);
    104             ChatManager::message(message);
    105         }
    106     }
     195}
    107196
    108197    void SpaceRace::newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player)
    … …  
    114203        int ms = this->clock_.getMilliseconds() % 1000;
    115204
    116         const std::string& message = "Checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1)
    117             + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
     205       
     206   
     207        const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1)
     208        + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
     209 this->getGametypeInfo()->sendAnnounceMessage(message);
     210        ChatManager::message(message);
     211
     212    }
     213
     214 void SpaceRace::countdownFinished()//activates the engines of all players
     215    {
     216
     217        std::string message("RACE STARTED ");
    118218        this->getGametypeInfo()->sendAnnounceMessage(message);
    119219        ChatManager::message(message);
    120     }
    121 
     220
     221
     222    for (Engine* engine : ObjectList<Engine>())
     223                engine->setActive(true);
     224
     225
     226   
     227}
     228
     229 void SpaceRace::playerEntered(PlayerInfo* player)
     230    {
     231        Gametype::playerEntered(player);
     232
     233        const std::string& message = player->getName() + " entered the game";
     234        ChatManager::message(message);
     235    }
     236
     237
     238 void SpaceRace::addBots(unsigned int amount) //function that add the bots to the game
     239    {
     240        for (unsigned int i = 1; i <= amount; ++i){
     241            this->botclass_.fabricate(this->getContext());
     242        }
     243    }
     244
     245
     246//set bot configurations
    122247    bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
    123248    {
     249        return true;
     250    }
     251
     252    bool SpaceRace::allowPawnDamage(Pawn* victim, Pawn* originator)
     253    {
     254        return true;
     255    }
     256
     257    bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)// false because the bots can not recognize the objects and die to early
     258                                                                    //if they can
     259    {
    124260        return false;
    125261    }
    126 
    127     bool SpaceRace::allowPawnDamage(Pawn* victim, Pawn* originator)
    128     {
    129         return false;
    130     }
    131 
    132     bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)
    133     {
    134         return false;
    135     }
    136262}

  • code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h

    r11071 r11497  
    5757            virtual ~SpaceRace() {}
    5858
     59             void setConfigValues();
     60
    5961            virtual void tick(float dt) override;
     62            virtual void start() override;
     63            virtual void end() override;
     64 virtual void countdownFinished();
     65             virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
    6066
    61             virtual void end() override;
     67
     68
     69             virtual void playerEntered(PlayerInfo* player) override;
     70
     71            //virtual void newCheckpointReached();
    6272
    6373            void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
     74           
     75
     76
    6477            inline RaceCheckPoint* getCheckpointReached(PlayerInfo* player)
    6578                { return this->checkpointReached_[player]; }

  • code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc

    r10262 r11497  
    2323 *      Author: purgham
    2424 */
     25#include <vector>
    2526
    2627#include "SpaceRaceBot.h"
     28#include "core/GameMode.h"
    2729#include "core/CoreIncludes.h"
     30#include "core/config/ConfigValueIncludes.h"
     31#include "gametypes/Gametype.h"
     32#include "controllers/AIController.h"
     33#include "gametypes/SpaceRaceController.h"
     34
     35
     36
    2837
    2938namespace orxonox
    … …  
    3544        this->defaultController_ = Class(SpaceRaceController);// ClassByString("")
    3645        this->createController();
     46
     47    }
     48
     49SpaceRaceBot::~SpaceRaceBot(){
     50
     51}
     52
     53void SpaceRaceBot::setConfigValues()
     54    {
     55        static const std::string names[] =
     56        {
     57            "Dr. Julius No",
     58            "Berkay Berabi",
     59            "Louis Meile"         
     60            "Yo mama"
     61        };
     62        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
     63
     64        SetConfigValue(names_, defaultnames);
    3765    }
    3866}

  • code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h

    r10262 r11497  
    3030#include "gametypes/GametypesPrereqs.h"
    3131#include "gametypes/SpaceRaceController.h"
     32#include <vector>
    3233
    3334
    … …  
    3536{
    3637
    37     /**
    38 
    39     */
    4038    class _GametypesExport SpaceRaceBot: public Bot
    4139    {
    4240        public:
    43         SpaceRaceBot(Context* context);
    44             virtual ~SpaceRaceBot() {}
     41                SpaceRaceBot(Context* context);
     42            virtual ~SpaceRaceBot();
     43   
     44            void setConfigValues();
     45
     46
     47
     48 virtual inline bool isInitialized() const override
     49                { return true; }
     50            virtual inline float getPing() const override
     51                { return 0; }
     52            virtual inline float getPacketLossRatio() const override
     53                { return 0; }
     54
     55
     56  private:
     57            std::vector<std::string> names_;
     58
     59
    4560    };
    4661}

  • code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc

    r11099 r11497  
    1616 *   GNU General Public License for more details.
    1717 *
    18  *   You should have received a copy of the GNU General Public License
     18 *   You should have     a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    2020 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    … …  
    5858        OrxAssert(!checkpoints.empty(), "No Checkpoints in Level");
    5959        checkpoints_ = checkpoints;
    60         /*orxout()<<"es gibt: "<<checkpoints_.size()<<"checkpoints"<<endl;
    61         for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
    62         {
    63             orxout()<<"Checkpoint "<<(*it)->getCheckpointIndex()<<"; NExtReal: ";
    64             std::set<int> temp =(*it)->getNextCheckpoints();
    65             for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
    66             {
    67                 orxout()<<(*ii)<<", ";
    68             }
    69 
    70             orxout()<<" NextVirtual: ";
    71             temp=(*it)->getVirtualNextCheckpoints();
    72             for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
    73             {
    74                 orxout()<<(*ii)<<", ";
    75             }
    76             orxout()<<endl<<endl;
    77 
    78         }//ausgabe*/
    79         /*
    80         for (std::vector<RaceCheckPoint*>::iterator it = checkpoints.begin(); it != checkpoints.end(); ++it)
    81         {
    82             std::set<int> nextCheckPoints = ((*it)->getNextCheckpoints());
    83             if(!nextCheckPoints.empty())
    84             {
    85                 for (std::set<int>::iterator numb = nextCheckPoints.begin(); numb!=nextCheckPoints.end(); numb++)
    86                 {
    87                     RaceCheckPoint* point2 = findCheckpoint((*numb));
    88 
    89                     //if(point2 != nullptr)
    90                     //placeVirtualCheckpoints((*it), point2);
    91                 }
    92             }
    93         }
    94         */
    95         /*
    96         for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
    97         {
    98             orxout()<<"Checkpoint "<<(*it)->getCheckpointIndex()<<"; NExtReal: ";
    99             std::set<int> temp =(*it)->getNextCheckpoints();
    100             for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
    101             {
    102                 orxout()<<(*ii)<<", ";
    103             }
    104 
    105             orxout()<<" NextVirtual: ";
    106             temp=(*it)->getVirtualNextCheckpoints();
    107             for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
    108             {
    109                 orxout()<<(*ii)<<", ";
    110             }
    111             orxout()<<endl;
    112 
    113         }//ausgabe
    114         orxout()<<"es gibt: "<<checkpoints_.size()<<"checkpoints"<<endl;*/
    11560        staticRacePoints_ = findStaticCheckpoints(nextRaceCheckpoint_, checkpoints);
    11661        // initialisation of currentRaceCheckpoint_
    … …  
    12267            continue;
    12368        }
    124         //orxout()<<"Die ANzahl der virtuellen CP betraegt: "<< (-i)-2<<endl;
    12569
    12670    }
    … …  
    225169                minNextRaceCheckPoint = nextRaceCheckPoint;
    226170            }
     171
    227172        }
    228173
    … …  
    363308            //orxout()<< "CP "<< currentRaceCheckpoint_->getCheckpointIndex()<<" chanched to: "<< nextRaceCheckpoint_->getCheckpointIndex()<<endl;
    364309        }
     310
    365311        else if ((lastPositionSpaceship-this->getControllableEntity()->getPosition()).length()/dt > ADJUSTDISTANCE)
    366312        {
    … …  
    380326        //orxout(user_status) << "dt= " << dt << ";  distance= " << (lastPositionSpaceship-this->getControllableEntity()->getPosition()).length() <<std::endl;
    381327        lastPositionSpaceship = this->getControllableEntity()->getPosition();
     328       
     329this->boostControl();
    382330        this->moveToPosition(nextRaceCheckpoint_->getPosition());
     331        this->boostControl();
    383332    }
    384333

  • code/branches/HUD_HS16/src/modules/invader/Invader.cc

    r11083 r11497  
    3333
    3434#include "Invader.h"
    35 
     35#include "Highscore.h"
    3636#include "core/CoreIncludes.h"
    3737#include "core/EventIncludes.h"
    … …  
    189189        // It will misteriously crash the game!
    190190        // Instead startMainMenu, this won't crash.
     191        if (Highscore::exists()){
     192                    int score = this->getPoints();
     193                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade"))
     194                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score);
     195
     196          }
    191197        GSLevel::startMainMenu();
    192198    }

  • code/branches/HUD_HS16/src/modules/jump/Jump.cc

    r11071 r11497  
    3434#include "Jump.h"
    3535#include "core/CoreIncludes.h"
     36#include "Highscore.h"
    3637
    3738#include "JumpCenterpoint.h"
    … …  
    311312        cleanup();
    312313        GSLevel::startMainMenu();
    313 
     314        if (Highscore::exists()){
     315                    int score = this->getScore(this->getPlayer());
     316                    if(score > Highscore::getInstance().getHighestScoreOfGame("Jump"))
     317                        Highscore::getInstance().storeHighscore("Jump",score);
     318
     319          }
    314320        Deathmatch::end();
    315321    }

  • code/branches/HUD_HS16/src/modules/tetris/Tetris.cc

    r11083 r11497  
    3939
    4040#include "Tetris.h"
     41#include "Highscore.h"
    4142
    4243#include "core/CoreIncludes.h"
    … …  
    327328            this->player_->stopControl();
    328329        }
    329 
     330         if (Highscore::exists()){
     331                    int score = this->getScore(this->getPlayer());
     332                    if(score > Highscore::getInstance().getHighestScoreOfGame("Tetris"))
     333                        Highscore::getInstance().storeHighscore("Tetris",score);
     334
     335          }
    330336        this->cleanup();
    331337

  • code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc

    r11083 r11497  
    8181#include "chat/ChatManager.h"
    8282#include "core/CoreIncludes.h"
     83#include "Highscore.h"
    8384
    8485namespace orxonox
    … …  
    197198    void TowerDefense::end()
    198199    {
    199 
     200        if (Highscore::exists()){
     201                    int score = this->getWaveNumber();
     202                    if(score > Highscore::getInstance().getHighestScoreOfGame("Tower Defense"))
     203                        Highscore::getInstance().storeHighscore("Tower Defense",score);
     204
     205          }
    200206        TeamDeathmatch::end();
    201207        ChatManager::message("Match is over! Gameover!");

  • code/branches/HUD_HS16/src/orxonox/CMakeLists.txt

    r11325 r11497  
    2828  LevelInfo.cc
    2929  LevelManager.cc
     30  Highscore.cc
    3031  Main.cc
    3132  MoodManager.cc
    … …  
    6162    LevelInfo.h
    6263    LevelManager.h
     64    Highscore.h
    6365    MoodManager.h
    6466    controllers/HumanController.h

  • code/branches/HUD_HS16/src/orxonox/LevelInfo.cc

    r11099 r11497  
    151151    }
    152152
     153    bool LevelInfoItem::addHighscore(const std::string& name, const int score)
     154    {
     155        std::stringstream stream;
     156        stream << name << "/:/" << score;
     157        bool success = this->highscores_.insert(stream.str()).second;
     158        if(success)
     159            this->highscoresUpdated();
     160        return success;
     161    }
     162
    153163    /**
    154164    @brief
    … …  
    191201    }
    192202
     203    void LevelInfoItem::highscoresUpdated(void)
     204    {
     205        std::stringstream stream;
     206        std::set<std::string>::iterator temp;
     207        for(std::set<std::string>::iterator it = this->highscores_.begin(); it != this->highscores_.end(); )
     208        {
     209            temp = it;
     210            if(++it == this->highscores_.end()) // If this is the last tag we don't add a comma.
     211                stream << *temp;
     212            else
     213                stream << *temp << ", ";
     214        }
     215
     216        this->highscoresString_ = std::string(stream.str());
     217    }
    193218    /**
    194219    @brief

  • code/branches/HUD_HS16/src/orxonox/LevelInfo.h

    r11099 r11497  
    118118            inline bool hasTag(const std::string& tag) const { return this->tags_.find(tag) != this->tags_.end(); } // tolua_export
    119119
     120            bool addHighscore(const std::string& name,const int score);
     121
     122            inline const std::string& getHighscores(void) const { return this->highscoresString_; } // tolua_export
     123
    120124            void setStartingShips(const std::string& ships); //!< Set the starting ship models of the level
    121125            bool addStartingShip(const std::string& ship, bool update = true); //!< Add a model to shipselection
    … …  
    154158            void startingshipsUpdated(void); //!< Updates the comma-seperated string of all possible starting ships.
    155159            void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
     160            void highscoresUpdated(void);
    156161            static void initializeTags(void); //!< Initialize the set of allowed tags.
    157162            /**
    … …  
    170175            std::string screenshot_; //!< The screenshot of the Level.
    171176            std::set<std::string> tags_; //!< The set of tags the Level is tagged with.
     177
     178            std::set<std::string> highscores_;
     179            std::string highscoresString_;
     180
    172181            std::string tagsString_; //!< The comma-seperated string of all the tags the Level is tagged with.
    173182            std::set<std::string> startingShips_; //!< The set of starting ship models the Level allows.
    … …  
    244253            inline const std::string& getTags(void) const
    245254                { return this->LevelInfoItem::getTags(); }
     255
     256            inline const std::string& getHighscores(void) const
     257                { return this->LevelInfoItem::getHighscores(); }
    246258            /**
    247259            @brief Set the starting ship models of the level

  • code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h

    r11252 r11497  
    9292            //friend class, for mouselook
    9393            friend class Map;
     94            static HumanController* localController_s;
    9495
    9596        protected:
    96             static HumanController* localController_s;
    9797            bool controlPaused_;
    9898

  • code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc

    r11336 r11497  
    5050#include "PlayerManager.h"
    5151#include "GSRoot.h"
    52 // #include "overlays/hud/HUDPickupSystem.h"
    5352
    5453namespace orxonox
    … …  
    127126            InputManager::getInstance().leaveState("game");
    128127
    129         // HUDPickupSystem* pickupSystem;
    130 
    131         // for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
    132         //     pickupSystem = hud;
    133 
    134         // pickupSystem->repaint=false;
    135 
    136128        // disconnect all HumanPlayers
    137129        PlayerManager::getInstance().disconnectAllClients();

  • code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h

    r11336 r11497  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 // #include "overlays/OverlaysPrereqs.h"
    3433
    3534#include <string>

  • code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt

    r9016 r11497  
    1111  TeamGametype.cc
    1212  Mission.cc
     13  StoryMode.cc
    1314)

  • code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc

    r11071 r11497  
    9696        }
    9797    }
    98 
     98   
    9999    /**
    100100     * @brief Initializes sub-objects of the Gametype. This must be called after the constructor.

  • code/branches/HUD_HS16/src/orxonox/infos/Bot.cc

    r9667 r11497  
    6868        static const std::string names[] =
    6969        {
    70             "Dr. Julius No",
    71             "Rosa Klebb",
    72             "Auric Goldfinger",
    73             "Emilio Largo",
    74             "Ernst Stavro Blofeld",
    75             "Dr. Kananga",
    76             "Francisco Scaramanga",
    77             "Karl Stromberg",
    78             "Sir Hugo Drax",
    79             "Aris Kristatos",
     70            "Berkay Berabi",
     71            "Louis  Meile"
     72            "Muten Roshi",
     73            "Abradolf Lincler",
     74            "Lionel Messi",
    8075            "Kamal Khan",
    81             "General Orlov",
    82             "Max Zorin",
    83             "Brad Whitaker",
    84             "General Georgi Koskov",
    85             "Franz Sanchez",
    86             "Alec Trevelyan",
    87             "Elliot Carver",
    88             "Elektra King",
    89             "Viktor Zokas",
    90             "Gustav Graves",
    91             "Le Chiffre",
    92             "Mr. White",
    93             "Dominic Greene"
     76            "Karl the Llama",
     77            "Thomas the Tankengine",
     78            "Rick",
     79            "Morty",
     80            "Charlie the Unicorn",
     81            "Kung Fury",
     82            "Postman Pat"
    9483        };
    9584        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));

  • code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h

    r9667 r11497  
    8383            inline bool isStartCountdownRunning() const
    8484                { return this->bStartCountdownRunning_; }
     85           
    8586            void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
    8687
    … …  
    132133            void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
    133134            void dispatchFadingMessage(const std::string& message) const;
     135            void setStartCountdown(float countdown); // Set the start countdown to the input value.
     136
    134137
    135138        protected:
    136139            void start(void); // Inform the GametypeInfo that the game has started.
    137140            void end(void); // Inform the GametypeInfo that the game has ended.
    138             void setStartCountdown(float countdown); // Set the start countdown to the input value.
    139141            void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
    140142            void countDown(); // Count down the start countdown counter.

  • code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc

    r11071 r11497  
    5858        soundList_.emplace_back("Ganymede.ogg");
    5959        soundList_.emplace_back("luke_grey_-_hypermode.ogg");
     60        soundList_.emplace_back("racetheme.ogg");
     61
    6062
    6163    }
Note: See TracChangeset for help on using the changeset viewer.