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

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

11
Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript
View file

@ -61,7 +61,8 @@ function VPathEditorPlugin::onWorldEditorStartup( %this )
}
// Add Toolbar.
EditorGuiToolbar.add( VPathEditorToolbar );
//EditorGuiToolbar.add( VPathEditorToolbar );
// Populate Type Menu.
VPathEditorToolbarPathTypeMenu.clear();
@ -119,7 +120,9 @@ function VPathEditorPlugin::onActivated( %this )
EVPathEditor.setVisible( true );
EVPathEditor.makeFirstResponder( true );
EditorGui.bringToFront( EVPathEditor );
VPathEditorToolbar.setVisible( true );
EditorGuiToolbarStack.remove( EWorldEditorToolbar );
EditorGuiToolbarStack.add( VPathEditorToolbar );
VPathTreeView.open( GetServerPathSet(), true );
// Sync Gizmo.
@ -147,7 +150,9 @@ function VPathEditorPlugin::onDeactivated( %this )
{
// Hide Editor.
EVPathEditor.setVisible( false );
VPathEditorToolbar.setVisible( false );
EditorGuiToolbarStack.add( EWorldEditorToolbar );
EditorGuiToolbarStack.remove( VPathEditorToolbar );
// Disable Map.
%this.EditorMap.pop();