Changeset 6235 for code/branches
- Timestamp:
- Dec 3, 2009, 8:48:25 PM (15 years ago)
- Location:
- code/branches/presentation2/data/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/data/gui/layouts/ControlsMenu.layout
r6206 r6235 22 22 <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/> 23 23 </Window> 24 <Window Type="TaharezLook/Button" Name="orxonox/Keyb oardControlsButton" >25 <Property Name="Text" Value="Keyb oard controls" />24 <Window Type="TaharezLook/Button" Name="orxonox/KeybindingsButton" > 25 <Property Name="Text" Value="Keybindings" /> 26 26 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 27 27 <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 131 131 mastermute = true 132 132 end 133 soundMgr:toggleMute(orxonox.SoundType.none)134 133 end 134 soundMgr:toggleMute(orxonox.SoundType.none) 135 135 end 136 136 … … 146 146 musicmute = true 147 147 end 148 soundMgr:toggleMute(orxonox.SoundType.ambient)149 148 end 149 soundMgr:toggleMute(orxonox.SoundType.ambient) 150 150 end 151 151 … … 161 161 effectsmute = true 162 162 end 163 soundMgr:toggleMute(orxonox.SoundType.effects)164 163 end 164 soundMgr:toggleMute(orxonox.SoundType.effects) 165 165 end 166 166 -
code/branches/presentation2/data/gui/scripts/ControlsMenu.lua
r6206 r6235 17 17 18 18 function P.ControlsKeyboardControlsButton_clicked(e) 19 showGUI("Key boardControlsMenu", true)19 showGUI("KeyBindMenu", true) 20 20 end 21 21
Note: See TracChangeset
for help on using the changeset viewer.