Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11316


Ignore:
Timestamp:
Dec 5, 2016, 3:57:07 PM (8 years ago)
Author:
jhuwyler
Message:

Durch fehlen von Imagesetts konnte nicht alles gemacht werden. Die Levelnamen wurden in eigenen Buttons auf der Map platziert. Sie werden auch geupdated und brauchen noch ein Buttonlayout. Zudem muss das Probelm vom vorigen Mal noch gemacht werden.

Location:
code/branches/StoryModeMap_HS16/data
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r11308 r11316  
    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/JuuButton" Name="orxonox/Mission1Button" >
     10
     11        <!-- Misson 1************************************* -->
     12        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission1Text" >
    1113            <Property Name="Text" Value="Mission One" />
     14            <Property Name="Visible" Value="False"/>
     15            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
     16        </Window>
     17
     18        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
    1219            <Property Name="Visible" Value="False"/>
    1320            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    1522            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
    1623        </Window>
    17         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
     24
     25        <!-- Misson 2************************************* -->
     26        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission2Text" >
    1827            <Property Name="Text" Value="Fight in our Back" />
     28            <Property Name="Visible" Value="False"/>
     29            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
     30        </Window>
     31
     32        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
    1933            <Property Name="Visible" Value="False"/>
    2034            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2337            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
    2438        </Window>
    25         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
     39
     40        <!-- Misson 3************************************* -->
     41        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission3Text" >
    2642            <Property Name="Text" Value="Pirate Attack" />
     43            <Property Name="Visible" Value="False"/>
     44            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.75,0},{0.8,0},{0.8,0}}" />
     45        </Window>
     46        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
     47
    2748            <Property Name="Visible" Value="False"/>
    2849            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3152            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
    3253        </Window>
    33         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
     54
     55        <!-- Misson 4************************************* -->
     56        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission4Text" >
    3457            <Property Name="Text" Value="Trip to Area 51" />
     58            <Property Name="Visible" Value="False"/>
     59            <Property Name="UnifiedAreaRect" Value="{{0.575,0},{0.5,0},{0.775,0},{0.55,0}}" />
     60        </Window>
     61        <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
     62
    3563            <Property Name="Visible" Value="False"/>
    3664            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3967            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
    4068        </Window>
    41         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
     69
     70        <!-- Misson 5************************************* -->
     71        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission5Text" >
    4272            <Property Name="Text" Value="Area 51 under Fire" />
     73            <Property Name="Visible" Value="False"/>
     74            <Property Name="UnifiedAreaRect" Value="{{0.625,0},{0.4,0},{0.825,0},{0.45,0}}" />
     75        </Window>
     76        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
     77
    4378            <Property Name="Visible" Value="False"/>
    4479            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4782            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
    4883        </Window>
    49         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
     84
     85        <!-- Misson 6************************************* -->
     86        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission6Text" >
    5087            <Property Name="Text" Value="Escape the Bastards" />
     88            <Property Name="Visible" Value="False"/>
     89            <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.1,0},{0.725,0},{0.15,0}}" />
     90        </Window>
     91        <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
     92
    5193            <Property Name="Visible" Value="False"/>
    5294            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    5597            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
    5698        </Window>
    57         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission7Button" >
     99
     100        <!-- Misson 7************************************* -->
     101        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission7Text" >
    58102            <Property Name="Text" Value="Expedition to Sector 5C" />
     103            <Property Name="Visible" Value="False"/>
     104            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
     105        </Window>
     106        <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
     107
    59108            <Property Name="Visible" Value="False"/>
    60109            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    63112            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
    64113        </Window>
    65         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission8Button" >
     114
     115        <!-- Misson 8************************************* -->
     116        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission8Text" >
    66117            <Property Name="Text" Value="Shuttle under Attack" />
     118            <Property Name="Visible" Value="False"/>
     119            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.45,0},{0.25,0}}" />
     120        </Window>
     121        <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
     122
    67123            <Property Name="Visible" Value="False"/>
    68124            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    71127            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
    72128        </Window>
    73         <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission9Button" >
     129
     130        <!-- Misson 9************************************* -->
     131        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission9Text" >
    74132            <Property Name="Text" Value="Retaliation" />
     133            <Property Name="Visible" Value="False"/>
     134            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.145,0},{0.3,0},{0.195,0}}" />
     135        </Window>
     136        <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
     137
    75138            <Property Name="Visible" Value="False"/>
    76139            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    80143        </Window>
    81144
    82 
     145        <!-- Back Button************************************* -->
    83146        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
    84147            <Property Name="Text" Value="Back" />

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

    r11308 r11316  
    4141    <WindowAlias Alias="HUDWidgets/Tree"                     Target="OrxonoxLook/Tree" />
    4242
    43     <WindowAlias Alias="HUDWidgets/JuuButton"              Target="OrxonoxLook/JuuButton" />
     43    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="OrxonoxLook/JuuButton" />
    4444</GUIScheme>

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

    r11308 r11316  
    5252    <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"         LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
    5353
     54    <!-- Special Button for CampaignMenu -->
    5455    <FalagardMapping WindowType="OrxonoxLook/JuuButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/JuuButton" />
    5556

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

    r11269 r11316  
    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

  • code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw

    r11299 r11316  
    33<LevelInfo
    44 name = "StoryModeMap"
    5  description = "Level that should have planets with different missions in it"
    6  tags = "test"
     5 description = "The Campaign Menu Map with all the Campaignmissons in it"
     6 tags = "Campaign, Campaignmissons"
    77 screenshot = "emptylevel.png"
    88/>
Note: See TracChangeset for help on using the changeset viewer.