TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-30 09:35:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #370 from Areloch/MiscBaseGameUIFixes

Browse source 
Misc. BaseGame UI fixes
This commit is contained in:
Brian Roberts 2020-10-28 20:24:33 -05:00 • committed by GitHub
commit 72ee2260ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gui/controls/guiGameListMenuCtrl.cpp
View file

@ -391,7 +391,7 @@ void GuiGameListMenuCtrl::onRenderKeybindOption(Row* row, Point2I currentOffset)
//drawer->drawBitmap(row->mBitmap, )
Point2I button;
button.x = currentOffset.x + columnSplit + (columnSplit / 2)/* + (optionWidth / 2)*/;
button.x = currentOffset.x + columnSplit + (columnSplit / 2.5)/* + (optionWidth / 2)*/;
button.y = currentOffset.y + (rowHeight / 4);
Point2I buttonSize;
@ -885,6 +885,14 @@ bool GuiGameListMenuCtrl::onKeyDown(const GuiEvent &event)
changeRow(1);
return true;
case KEY_LEFT:
changeOption(-1);
return true;
case KEY_RIGHT:
changeOption(1);
return true;
case KEY_A:
case KEY_RETURN:
case KEY_NUMPADENTER:

2
Templates/BaseGame/game/data/ui/guis/optionsMenu.gui
View file

@ -206,7 +206,7 @@
willFirstRespond = "1";
hScrollBar = "alwaysOff";
vScrollBar = "dynamic";
lockHorizScroll = "0";
lockHorizScroll = "1";
lockVertScroll = "0";
constantThumbHeight = "0";
childMargin = "0 0";

13
Templates/BaseGame/game/data/ui/guis/pauseMenu.cs
View file

@ -7,7 +7,12 @@ function PauseMenuList::onAdd(%this)
function PauseMenu::onWake(%this)
{
$timescale = 0;
if($Server::ServerType $= "SinglePlayer")
{
$timescale = 0;
sfxSetChannelVolume( $SimAudioType, $pref::SFX::channelVolume[ 0 ] );
}
PauseMenuList.hidden = false;
PauseMenuList.setFirstResponder();
@ -17,7 +22,11 @@ function PauseMenu::onWake(%this)
function PauseMenu::onSleep(%this)
{
$timescale = 1;
if($Server::ServerType $= "SinglePlayer")
{
$timescale = 1;
sfxSetChannelVolume( $SimAudioType, $pref::SFX::channelVolume[ $SimAudioType ] );
}
}
function PauseMenu::onReturnTo(%this)