Changeset 10255 for code/branches/presentationHS14merge/data

Timestamp:

Feb 4, 2015, 10:21:28 PM (10 years ago)

Author:

landauf

Message:

merged storymodeHS14

Location:

code/branches/presentationHS14merge

Files:

• . (modified) (1 prop)
• data/defaultConfig/orxonox.ini (copied) (copied from code/branches/storymodeHS14/data/defaultConfig/orxonox.ini)
• data/gui/layouts/CampaignMenu.layout (copied) (copied from code/branches/storymodeHS14/data/gui/layouts/CampaignMenu.layout)
• data/gui/layouts/SingleplayerMenu.layout (modified) (1 diff)
• data/gui/scripts/CampaignMenu.lua (copied) (copied from code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua)
• data/gui/scripts/SingleplayerMenu.lua (modified) (4 diffs)

code/branches/presentationHS14merge/data/gui/layouts/SingleplayerMenu.layout

@@ -55 +55 @@
             <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
         </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignButton" >
+            <Property Name="Text" Value="Campaign" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8,0},{0.6,0},{0.85,0}}" />
+            <Event Name="Clicked" Function="SingleplayerMenu.CampaignButton_clicked"/>
+        </Window>
     </Window>
 </GUILayout>

code/branches/presentationHS14merge/data/gui/scripts/SingleplayerMenu.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("SingleplayerMenu")
-P.loadAlong = {"ShipSelectionMenu"}
+P.loadAlong = {"ShipSelectionMenu","CampaignMenu"}
 P.levelList = {}
 P.activeTabIndexes = {}
@@ -23 +23 @@
     P.SingleplayerSelectionChanged()
 
-    --buttons are arranged in a 1x3 matrix
+    --buttons are arranged in a 2x3 matrix
     P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"),
@@ -37 +37 @@
             ["button"] = winMgr:getWindow("orxonox/SingleplayerBackButton"),
             ["callback"]  = P.SingleplayerBackButton_clicked
+    })
+
+    P:setButton(2, 2,{
+            ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
+            ["callback"] = P.CampaignButton_clicked
     })
 end
@@ -166 +171 @@
 end
 
+function P.CampaignButton_clicked(e)
+    showMenuSheet("CampaignMenu", true)
+end
+
 return P