TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +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

2
Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui
View file

@ -10,7 +10,7 @@ $guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
Extent = "800 32";
MinExtent = "8 2";
canSave = "1";
Visible = "0";
Visible = "1";
hovertime = "1000";
new GuiTextCtrl() {

11
Templates/BaseGame/game/tools/riverEditor/main.tscript
View file

@ -31,12 +31,10 @@ function initializeRiverEditor()
// Add ourselves to EditorGui, where all the other tools reside
RiverEditorGui.setVisible( false );
RiverEditorToolbar.setVisible(false);
RiverEditorOptionsWindow.setVisible( false );
RiverEditorTreeWindow.setVisible( false );
EditorGui.add( RiverEditorGui );
EditorGui.add( RiverEditorToolbar );
EditorGui.add( RiverEditorOptionsWindow );
EditorGui.add( RiverEditorTreeWindow );
@ -97,7 +95,9 @@ function RiverEditorPlugin::onActivated( %this )
RiverEditorGui.setVisible(true);
RiverEditorGui.makeFirstResponder( true );
RiverEditorToolbar.setVisible(true);
EditorGuiToolbarStack.remove( EWorldEditorToolbar );
EditorGuiToolbarStack.add( RiverEditorToolbar );
RiverEditorOptionsWindow.setVisible( true );
RiverEditorTreeWindow.setVisible( true );
@ -130,7 +130,10 @@ function RiverEditorPlugin::onDeactivated( %this )
$River::EditorOpen = false;
RiverEditorGui.setVisible(false);
RiverEditorToolbar.setVisible(false);
EditorGuiToolbarStack.add( EWorldEditorToolbar );
EditorGuiToolbarStack.remove( RiverEditorToolbar );
RiverEditorOptionsWindow.setVisible( false );
RiverEditorTreeWindow.setVisible( false );
%this.map.pop();