TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-23 13:25:36 +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

5
Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui
View file

@ -44,6 +44,7 @@ $guiContent = new GuiControl(AssetBrowser_SelectModule) {
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
closeCommand="Canvas.popDialog(AssetBrowser_SelectModule);";
new GuiPopUpMenuCtrlEx() {
maxPopupHeight = "200";
@ -95,7 +96,7 @@ $guiContent = new GuiControl(AssetBrowser_SelectModule) {
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
class = "SelectPackage_NewAssetModuleBtn";
class = "AssetBrowserSelModuleAddBtn";
canSave = "1";
canSaveDynamicFields = "0";
};
@ -132,7 +133,7 @@ $guiContent = new GuiControl(AssetBrowser_SelectModule) {
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "Canvas.popDialog(AssetBrowser_addModule);";
command = "Canvas.popDialog(AssetBrowser_SelectModule);";
tooltipProfile = "ToolsGuiToolTipProfile";
hovertime = "1000";
isContainer = "0";