TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 18:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixed Back on-screen menu button for OptionsMenu wasn't working

Browse source 
- Fixed MainMenu buttonlist not navigating with keybinds after going to optionsMenu and going back
- Fixed menu title text clipping
- Fixed keybind preview images on keybind lists in OptionsMenu being modal
- Fixed btn_l and btn_r bitmap button binding not working
- Fixed a/b and x/y button bitmaps on xbox controllers being flipped
This commit is contained in:
Areloch 2023-12-27 01:36:58 -06:00
parent 6e101595d6
commit 36d00e09d3
7 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Templates/BaseGame/game/data/UI/scripts/utility.tscript
View file

@ -45,13 +45,13 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Square";
else if(%button $= "Y" || %button $= "btn_y")
%assetId = %assetId @ "Triangle";
else if(%button $= "LB")
else if(%button $= "LB" || %button $= "btn_l")
%assetId = %assetId @ "L1";
else if(%button $= "LT")
else if(%button $= "LT" || %button $= "btn_lt")
%assetId = %assetId @ "L2";
else if(%button $= "RB")
else if(%button $= "RB" || %button $= "btn_r")
%assetId = %assetId @ "R1";
else if(%button $= "RT")
else if(%button $= "RT" || %button $= "btn_rt")
%assetId = %assetId @ "R2";
else if(%button $= "thumbrx" || %button $= "thumbry")
%assetId = %assetId @ "Right_Stick";
@ -84,13 +84,13 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Y";
else if(%button $= "Y" || %button $= "btn_y")
%assetId = %assetId @ "X";
else if(%button $= "LB")
else if(%button $= "LB" || %button $= "btn_l")
%assetId = %assetId @ "LB";
else if(%button $= "LT")
else if(%button $= "LT" || %button $= "btn_lt")
%assetId = %assetId @ "LT";
else if(%button $= "RB")
else if(%button $= "RB" || %button $= "btn_r")
%assetId = %assetId @ "RB";
else if(%button $= "RT")
else if(%button $= "RT" || %button $= "btn_rt")
%assetId = %assetId @ "RT";
else if(%button $= "thumbrx" || %button $= "thumbry")
%assetId = %assetId @ "Right_Stick";
@ -120,13 +120,21 @@ function getButtonBitmap(%device, %button)
%assetId = "UI:Xbox_";
if(%button $= "btn_a")
%assetId = %assetId @ "B";
else if(%button $= "btn_b")
%assetId = %assetId @ "A";
else if(%button $= "btn_b")
%assetId = %assetId @ "B";
else if(%button $= "btn_x")
%assetId = %assetId @ "Y";
else if(%button $= "btn_y")
%assetId = %assetId @ "X";
else if(%button $= "btn_y")
%assetId = %assetId @ "Y";
else if(%button $= "LB" || %button $= "btn_l")
%assetId = %assetId @ "LB";
else if(%button $= "LT" || %button $= "btn_lt")
%assetId = %assetId @ "LT";
else if(%button $= "RB" || %button $= "btn_r")
%assetId = %assetId @ "RB";
else if(%button $= "RT" || %button $= "btn_rt")
%assetId = %assetId @ "RT";
else if(%button $= "thumbrx" || %button $= "thumbry")
%assetId = %assetId @ "Right_Stick";
else if(%button $= "thumblx" || %button $= "thumbly")