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

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
This commit is contained in:
Jeff Hutchinson 2021-09-01 22:26:23 -04:00
commit 17231ca9fb
51 changed files with 736 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Templates/BaseGame/game/tools/navEditor/main.tscript
View file

@ -42,13 +42,11 @@ function initializeNavEditor()
// Add ourselves to EditorGui, where all the other tools reside
NavEditorGui.setVisible(false);
NavEditorToolbar.setVisible(false);
NavEditorOptionsWindow.setVisible(false);
NavEditorTreeWindow.setVisible(false);
NavEditorConsoleDlg.setVisible(false);
EditorGui.add(NavEditorGui);
EditorGui.add(NavEditorToolbar);
EditorGui.add(NavEditorOptionsWindow);
EditorGui.add(NavEditorTreeWindow);
EditorGui.add(NavEditorConsoleDlg);
@ -123,7 +121,8 @@ function NavEditorPlugin::onActivated(%this)
NavEditorGui.setVisible(true);
NavEditorGui.makeFirstResponder(true);
NavEditorToolbar.setVisible(true);
EditorGuiToolbarStack.remove( EWorldEditorToolbar );
EditorGuiToolbarStack.add( NavEditorToolbar );
NavEditorOptionsWindow.setVisible(true);
NavEditorTreeWindow.setVisible(true);
@ -167,7 +166,10 @@ function NavEditorPlugin::onDeactivated(%this)
$Nav::EditorOpen = false;
NavEditorGui.setVisible(false);
NavEditorToolbar.setVisible(false);
EditorGuiToolbarStack.add( EWorldEditorToolbar );
EditorGuiToolbarStack.remove( NavEditorToolbar );
NavEditorOptionsWindow.setVisible(false);
NavEditorTreeWindow.setVisible(false);
%this.map.pop();