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:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript
View file

@ -862,11 +862,11 @@ function GuiEditorTabBook::onTabSelected( %this, %text, %index )
%sidebar-->button3.setVisible( true );
%sidebar-->button4.setVisible( true );
%sidebar-->button4.setBitmap( "tools/gui/images/delete" );
%sidebar-->button4.setBitmap( "ToolsModule:iconDelete_image" );
%sidebar-->button4.command = "GuiEditor.deleteSelection();";
%sidebar-->button4.tooltip = "Delete Selected Control(s)";
%sidebar-->button3.setBitmap( "tools/gui/images/visible" );
%sidebar-->button3.setBitmap( "ToolsModule:visible_n_image" );
%sidebar-->button3.command = "GuiEditor.toggleHideSelection();";
%sidebar-->button3.tooltip = "Hide Selected Control(s)";
@ -877,19 +877,19 @@ function GuiEditorTabBook::onTabSelected( %this, %text, %index )
%sidebar-->button3.setVisible( true );
%sidebar-->button4.setVisible( true );
%sidebar-->button4.setBitmap( "tools/gui/images/delete" );
%sidebar-->button4.setBitmap( "ToolsModule:iconDelete_image" );
%sidebar-->button4.command = "GuiEditor.showDeleteProfileDialog( GuiEditorProfilesTree.getSelectedProfile() );";
%sidebar-->button4.tooltip = "Delete Selected Profile";
%sidebar-->button3.setBitmap( "tools/gui/images/new" );
%sidebar-->button3.setBitmap( "ToolsModule:new_n_image" );
%sidebar-->button3.command = "GuiEditor.createNewProfile( \"Unnamed\" );";
%sidebar-->button3.tooltip = "Create New Profile with Default Values";
%sidebar-->button2.setBitmap( "tools/gui/images/copy-btn" );
%sidebar-->button2.setBitmap( "ToolsModule:copy_btn_n_image" );
%sidebar-->button2.command = "GuiEditor.createNewProfile( GuiEditorProfilesTree.getSelectedProfile().getName(), GuiEditorProfilesTree.getSelectedProfile() );";
%sidebar-->button2.tooltip = "Create New Profile by Copying the Selected Profile";
%sidebar-->button1.setBitmap( "tools/gui/images/reset-icon" );
%sidebar-->button1.setBitmap( "ToolsModule:reset_icon_n_image" );
%sidebar-->button1.command = "GuiEditor.revertProfile( GuiEditorProfilesTree.getSelectedProfile() );";
%sidebar-->button1.tooltip = "Revert Changes to the Selected Profile";