[Orxonox-commit 6648] r11286 - in code/branches/StoryModeMap_HS16/data: gui/layouts levels

[marvinh at orxonox.net]

Author: marvinh
Date: 2016-11-14 15:52:10 +0100 (Mon, 14 Nov 2016)
New Revision: 11286

Modified:
   code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout
   code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw
Log:
Der Button stellt sich als schwerer als gedacht heraus. Doch Marvin und Juu schaffen alles. Das naechste Mal muessen alle Layouts angepasst werden, dass ueberall ein unsichtbarer Button existiert. Dieser wird danach ueber die 3d gelegt, dass es aussieht als ob button und Planet verschmelzen.

Modified: code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout	2016-11-14 14:46:36 UTC (rev 11285)
+++ code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout	2016-11-14 14:52:10 UTC (rev 11286)
@@ -7,14 +7,14 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
+        <Window Type="MenuWidgets/ImageButton" Name="orxonox/Mission1Button" >
             <Property Name="Text" Value="Mission One" />
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
             <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
+        <Window Type="MenuWidgets/RadioButton" Name="orxonox/Mission2Button" >
             <Property Name="Text" Value="Fight in our Back" />
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22,7 +22,7 @@
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
+        <Window Type="MenuWidgets/SystemButton" Name="orxonox/Mission3Button" >
             <Property Name="Text" Value="Pirate Attack" />
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -38,7 +38,7 @@
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
+        <Window Type="MenuWidgets/ImageButton" Name="orxonox/Mission5Button" >
             <Property Name="Text" Value="Area 51 under Fire" />
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

Modified: code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw	2016-11-14 14:46:36 UTC (rev 11285)
+++ code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw	2016-11-14 14:52:10 UTC (rev 11286)
@@ -41,19 +41,25 @@
 
 <StaticEntity position="0,0,0" direction="0,0,0" mass=10000 friction=0>
   <attached>
-      <Model position="-800,0,0" mesh="planet.mesh" scale=8 />
 
-      <Model position="800,0,0" mesh="planet.mesh" scale=8 />
+      <Model position="-870,0,0" mesh="planets/earth.mesh" scale=30 />
 
-      <Model position="0,-500,0" mesh="planet.mesh" scale=8 />
+      <Model position="870,0,0" mesh="planets/earth.mesh" scale=30 />
 
-      <Model position="0,500,0" mesh="planet.mesh" scale=8 />
+      <Model position="0,-560,0" mesh="planets/earth.mesh" scale=30 />
 
-      <Model position="0,0,0" mesh="planet.mesh" scale=8 />
+      <Model position="0,520,0" mesh="planets/earth.mesh" scale=30 />
+
+
+
+
+
+
+      <Model position="0,0,0" mesh="planets/sol.mesh" scale=8 />
   
-    <Model position="300,300,0" mesh="planets/muunilinst.mesh" scale=60 />
+    <Model position="300,300,0" mesh="planets/moon.mesh" scale=60 />
 
-    <Model position="400,400,0" mesh="planets/muunilinst.mesh" scale=20 />
+    <Model position="400,400,0" mesh="planets/muunilinst.mesh" scale=25 />
 
     <Model position="500,500,0" mesh="planets/muunilinst.mesh" scale=18 />