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

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

4
Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
View file

@ -125,7 +125,7 @@ $guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
};
new GuiIconButtonCtrl() {
buttonMargin = "4 4";
iconBitmap = "tools/gui/images/iconCancel.png";
bitmapAsset = "ToolsModule:iconCancel_image";
iconLocation = "Left";
sizeIconToButton = "0";
makeIconSquare = "0";
@ -152,7 +152,7 @@ $guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
};
new GuiIconButtonCtrl() {
buttonMargin = "4 4";
iconBitmap = "tools/gui/images/iconAccept.png";
bitmapAsset = "ToolsModule:iconAccept_image";
iconLocation = "Left";
sizeIconToButton = "0";
makeIconSquare = "0";