Changeset 11286 for code/branches

Timestamp:

Nov 14, 2016, 3:52:10 PM (8 years ago)

Author:

marvinh

Message:

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.

Location:

code/branches/StoryModeMap_HS16/data

Files:

• gui/layouts/CampaignMenu.layout (modified) (4 diffs)
• levels/StoryModeMap.oxw (modified) (1 diff)

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

@@ -8 +8 @@
         <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"/>
@@ -15 +15 @@
             <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"/>
@@ -23 +23 @@
             <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"/>
@@ -39 +39 @@
             <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"/>

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

@@ -42 +42 @@
 <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 />