Changeset 9361 for code/branches/release2012

Timestamp:

Sep 2, 2012, 1:55:27 PM (12 years ago)

Author:

jo

Message:

Modified music menusheet and credits menusheet.

Location:

code/branches/release2012/data/gui

Files:

• layouts/CreditsMenu.layout (modified) (2 diffs)
• scripts/AudioMenu.lua (modified) (3 diffs)

code/branches/release2012/data/gui/layouts/CreditsMenu.layout

@@ -37 +37 @@
                         <Property Name="VertFormatting" Value="TopAligned" />
                         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                        <Property Name="Text">Orxonox version 0.0.3
+                        <Property Name="Text">Orxonox version 0.0.4
     
     Programming Language:  C++ - lua - tcl
@@ -46 +46 @@
     
     Credits:
+    http://www.orxonox.net/wiki/credits
                       </Property>
                     </Window>

code/branches/release2012/data/gui/scripts/AudioMenu.lua

@@ -34 +34 @@
     table.insert(themeList, "8-Bit Style")
     table.insert(themeList, "Corny Jazz")
-    table.insert(themeList, "Metal")
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
@@ -46 +45 @@
     elseif orxonox.getConfig("MoodManager", "mood_") == "jazzy" then
         listboxwindow:setItemSelectState(3,true)
-    elseif orxonox.getConfig("MoodManager", "mood_") == "metal" then
-        listboxwindow:setItemSelectState(4,true)
     else
         listboxwindow:setItemSelectState(0,true)
@@ -181 +178 @@
     elseif listboxwindow:isItemSelected(3) then
         orxonox.config("MoodManager", "mood_", "jazzy")
-    elseif listboxwindow:isItemSelected(4) then
-        orxonox.config("MoodManager", "mood_", "metal")
     else
         orxonox.config("MoodManager", "mood_", "default")