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

Added cleanup of exec stack for module when it's finished to avoid duplicate executions

Browse source 
Added proper container bracketing for the main menu buttons and made that the main navigation target
Added logic to UINav to prevent needlessly re-setting the root page if it already is the root page, which would break the navigation stack
Added logic to UINav toprevent needlessly adding duplicate pages whicn would break the navigation stack
Added logic to close the chooseLevelDlg page when the level is loaded to avoid the page being left hanging on the nav stack
Fixed assetId for no preview image fallback on the chooseLevelDlg page
Fixed display of icons in the shape editor shape helper section
Fixed name lookup on terrain material editor dialogue which would break saving of terrain materials
Disables TORQUE_SFX_DirectX which is currently not in use and nonfunctional
This commit is contained in:
JeffR 2022-06-02 20:17:23 -05:00
parent 956bd51d6d
commit c7763fe3ec
9 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript
View file

@ -14,6 +14,9 @@ function UINavigation::setRootPage(%this, %rootPage)
%this.pageStack = new ArrayObject();
}
if(%this.rootPage $= %rootPage)
return;
if(isObject(%this.rootPage))
{
%canClose = true;
@ -71,6 +74,10 @@ function UINavigation::pushPage(%this, %newPage, %callback)
%this.pageStack = new ArrayObject();
}
//don't re-add pages
if(%this.pageStack.getIndexFromKey(%newPage) != -1)
return;
%canChange = true;
if(%newPage.isMethod("canOpen"))
%canChange = %newPage.call("canOpen");