Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6235 for code/branches


Ignore:
Timestamp:
Dec 3, 2009, 8:48:25 PM (15 years ago)
Author:
cmueri
Message:

Small bug in audio menu fixed.

Location:
code/branches/presentation2/data/gui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/layouts/ControlsMenu.layout

    r6206 r6235  
    2222                <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
    2323            </Window>
    24             <Window Type="TaharezLook/Button" Name="orxonox/KeyboardControlsButton" >
    25                 <Property Name="Text" Value="Keyboard controls" />
     24            <Window Type="TaharezLook/Button" Name="orxonox/KeybindingsButton" >
     25                <Property Name="Text" Value="Keybindings" />
    2626                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2727                <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.590909,0},{0.7,0},{0.772727,0}}" />
  • code/branches/presentation2/data/gui/scripts/AudioMenu.lua

    r6233 r6235  
    131131            mastermute = true
    132132        end
    133         soundMgr:toggleMute(orxonox.SoundType.none)
    134133    end
     134    soundMgr:toggleMute(orxonox.SoundType.none)
    135135end
    136136
     
    146146            musicmute = true
    147147        end
    148         soundMgr:toggleMute(orxonox.SoundType.ambient)
    149148    end
     149    soundMgr:toggleMute(orxonox.SoundType.ambient)
    150150end
    151151
     
    161161            effectsmute = true
    162162        end
    163         soundMgr:toggleMute(orxonox.SoundType.effects)
    164163    end
     164    soundMgr:toggleMute(orxonox.SoundType.effects)
    165165end
    166166
  • code/branches/presentation2/data/gui/scripts/ControlsMenu.lua

    r6206 r6235  
    1717
    1818function P.ControlsKeyboardControlsButton_clicked(e)
    19     showGUI("KeyboardControlsMenu", true)
     19    showGUI("KeyBindMenu", true)
    2020end
    2121
Note: See TracChangeset for help on using the changeset viewer.