Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11299 for code/branches


Ignore:
Timestamp:
Nov 21, 2016, 3:57:58 PM (8 years ago)
Author:
marvinh
Message:

Heute wurden die Planeten an die richtige Position gesetzt und auch die dazugehoerigen Buttons. Diverse Versuche mit Lichtern hinter Planeten wurden durchgefuehrt. Naechstes Mal muss noch der Button unsichtbar gemacht werden und irgendwie sichtbar gemacht werden, welches Level man schon erledigt hat. Idee dort ist beim OrxonoxLook ein neues Buttonlayout zu erstellen. Stay Tuned

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

Legend:

Unmodified
Added
Removed

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

    r11286 r11299  
    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/ImageButton" Name="orxonox/Mission1Button" >
     10        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
    1111            <Property Name="Text" Value="Mission One" />
    1212            <Property Name="Visible" Value="False"/>
    1313            <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}}" />
     14            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
    1515            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
    1616        </Window>
    17         <Window Type="MenuWidgets/RadioButton" Name="orxonox/Mission2Button" >
     17        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
    1818            <Property Name="Text" Value="Fight in our Back" />
    1919            <Property Name="Visible" Value="False"/>
    2020            <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}}" />
     21            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
    2222            <Property Name="Disabled" Value="True" />
    2323            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
    2424        </Window>
    25         <Window Type="MenuWidgets/SystemButton" Name="orxonox/Mission3Button" >
     25        <Window Type="MenuWidgets/ImageButton" Name="orxonox/Mission3Button" >
    2626            <Property Name="Text" Value="Pirate Attack" />
    2727            <Property Name="Visible" Value="False"/>
    2828            <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}}" />
     29            <Property Name="UnifiedAreaRect" Value="{{0.685,0},{0.605,0},{0.75,0},{0.71,0}}" />
    3030            <Property Name="Disabled" Value="True" />
    3131            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
    … …  
    3535            <Property Name="Visible" Value="False"/>
    3636            <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}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.78,0},{0.48,0},{0.87,0},{0.59,0}}" />
    3838            <Property Name="Disabled" Value="True" />
    3939            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
    4040        </Window>
    41         <Window Type="MenuWidgets/ImageButton" Name="orxonox/Mission5Button" >
     41        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
    4242            <Property Name="Text" Value="Area 51 under Fire" />
    4343            <Property Name="Visible" Value="False"/>
    4444            <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}}" />
     45            <Property Name="UnifiedAreaRect" Value="{{0.725,0},{0.27,0},{0.775,0},{0.37,0}}" />
    4646            <Property Name="Disabled" Value="True" />
    4747            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
    … …  
    5151            <Property Name="Visible" Value="False"/>
    5252            <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}}" />
     53            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
    5454            <Property Name="Disabled" Value="True" />
    5555            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
    … …  
    5959            <Property Name="Visible" Value="False"/>
    6060            <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}}" />
     61            <Property Name="UnifiedAreaRect" Value="{{0.47,0},{0.13,0},{0.525,0},{0.23,0}}" />
    6262            <Property Name="Disabled" Value="True" />
    6363            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
    … …  
    6767            <Property Name="Visible" Value="False"/>
    6868            <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}}" />
     69            <Property Name="UnifiedAreaRect" Value="{{0.33,0},{0.1,0},{0.38,0},{0.18,0}}" />
    7070            <Property Name="Disabled" Value="True" />
    7171            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
    … …  
    7575            <Property Name="Visible" Value="False"/>
    7676            <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}}" />
     77            <Property Name="UnifiedAreaRect" Value="{{0.18,0},{0.07,0},{0.24,0},{0.145,0}}" />
    7878            <Property Name="Disabled" Value="True" />
    7979            <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
    … …  
    8484            <Property Name="Text" Value="Back" />
    8585            <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}}" />
     86            <Property Name="UnifiedAreaRect" Value="{{0.75,0},{0.9,0},{0.95,0},{0.95,0}}" />
    8787            <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/>
    8888        </Window>

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

    r11286 r11299  
    3131  >
    3232
    33 <StaticEntity position="0,0,0" direction="0,0,0" mass=10000 friction=0>
    34 <attached>
    3533
    36     <Model position="0,0,0" mesh="Coordinates.mesh" scale=50 />
    37    </attached>
    38   </StaticEntity>
    39 
    40 
    41 
    42 <StaticEntity position="0,0,0" direction="0,0,0" mass=10000 friction=0>
     34<StaticEntity position="0,0,0" direction="0,0,0" >
    4335  <attached>
    4436
    45       <Model position="-870,0,0" mesh="planets/earth.mesh" scale=30 />
     37    <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
     38    <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
     39 
     40    <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  />
     41    <Billboard colour="1,1,0.05" position="100,350,-330"  material="Flares/lensflare" scale=4.5 />
    4642
    47       <Model position="870,0,0" mesh="planets/earth.mesh" scale=30 />
     43    <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 />
     44    <Billboard colour="1,1,0.05" position="-600,250,-580"  material="Flares/lensflare" scale=5 />
    4845
    49       <Model position="0,-560,0" mesh="planets/earth.mesh" scale=30 />
     46    <Model position="-1000,50,-750" mesh="planets/moon.mesh" scale=100 />
     47    <Billboard colour="1,1,0.05" position="-1000,50,-830"  material="Flares/lensflare" scale=5 />
    5048
    51       <Model position="0,520,0" mesh="planets/earth.mesh" scale=30 />
     49    <Model position="-900,-400,-1000" mesh="planets/moon.mesh" scale=100 />
     50    <Billboard colour="1,1,0.05" position="-900,-400,-1080"  material="Flares/lensflare" scale=5 />
    5251
     52    <Model position="-500,-700,-1250" mesh="planets/moon.mesh" scale=100 />
     53    <Billboard colour="1,1,0.05" position="-500,-700,-1330"  material="Flares/lensflare" scale=5 />
    5354
     55    <Model position="0,-900,-1500" mesh="planets/moon.mesh" scale=100 />
     56    <Billboard colour="1,1,0.05" position="0,-900,-1580" material="Flares/lensflare" scale=5 />
    5457
     58    <Model position="700,-1100,-1750" mesh="planets/moon.mesh" scale=100 />
     59    <Billboard colour="1,1,0.05" position="700,-1100,-1830"  material="Flares/lensflare" scale=5 />
    5560
    56 
    57 
    58       <Model position="0,0,0" mesh="planets/sol.mesh" scale=8 />
    59  
    60     <Model position="300,300,0" mesh="planets/moon.mesh" scale=60 />
    61 
    62     <Model position="400,400,0" mesh="planets/muunilinst.mesh" scale=25 />
    63 
    64     <Model position="500,500,0" mesh="planets/muunilinst.mesh" scale=18 />
    65 
    66     <Model position="600,600,0" mesh="planets/muunilinst.mesh" scale=13 />
    67 
    68     <Model position="-100,-100,0" mesh="planets/muunilinst.mesh" scale=8 />
    69 
    70     <Model position="-200,-200,0" mesh="planets/muunilinst.mesh" scale=8 />
    71 
    72     <Model position="-300,-300,0" mesh="planets/muunilinst.mesh" scale=8 />
    73 
    74     <Model position="-400,-400,0" mesh="planets/muunilinst.mesh" scale=8 />
    75 
    76     <Model position="-500,-500,0" mesh="planets/muunilinst.mesh" scale=8 />
     61    <Model position="1500,-1300,-2000" mesh="planets/moon.mesh" scale=100 />
     62    <Billboard colour="1,1,0.05" position="1500,-1300,-2080"  material="Flares/lensflare" scale=5 />
    7763
    7864  </attached>
    … …  
    8369
    8470
    85 <Planet
    86       position="10000,0,0"
    87       scale="100"
    88       collisionType="dynamic"
    89       linearDamping="0.8"
    90       angularDamping="0"
    91       mass="5000000"
    92       pitch="0"
    93       mesh="planets/muunilinst.mesh"
    94       atmosphere="atmosphere1"
    95       rotationaxis="1,0,0"
    96       rotationrate="1.0"
    97       atmospheresize="80.0f"
    98       imagesize="1024.0f"
    99       collisiondamage = 2
    100       enablecollisiondamage = true
    101     >
    102     <attached>
    103         <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
    104     </attached>
    105     <collisionShapes>
    106         <SphereCollisionShape radius="100" position="0,0,0" />
    107     </collisionShapes>
    108 </Planet>
    10971
    11072
Note: See TracChangeset for help on using the changeset viewer.