TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44: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

68
Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui
View file

@ -31,7 +31,7 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "328 140";
position = "328 159";
extent = "368 450";
minExtent = "48 92";
horizSizing = "center";
@ -54,7 +54,7 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "12 54";
position = "12 29";
extent = "116 17";
minExtent = "8 2";
horizSizing = "right";
@ -68,6 +68,35 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiPopUpMenuCtrlEx(NewAssetTargetModule) {
maxPopupHeight = "200";
sbUsesNAColor = "0";
reverseTextList = "0";
bitmapBounds = "16 16";
hotTrackCallback = "0";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "135 28";
extent = "202 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiPopUpMenuProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "ModuleList";
class = "AssetBrowserModuleList";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Target Path:";
maxLength = "1024";
@ -77,7 +106,7 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "12 30";
position = "12 54";
extent = "116 17";
minExtent = "8 2";
horizSizing = "right";
@ -104,7 +133,7 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "135 30";
position = "135 54";
extent = "201 18";
minExtent = "8 2";
horizSizing = "width";
@ -128,7 +157,7 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "343 27";
position = "340 51";
extent = "22 22";
minExtent = "8 2";
horizSizing = "left";
@ -144,33 +173,6 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextEditCtrl(NewAssetTargetModule) {
historySize = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "135 53";
extent = "202 18";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
profile = "ToolsGuiTextEditProfile";
visible = "1";
active = "0";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiScrollCtrl() {
willFirstRespond = "1";
hScrollBar = "alwaysOn";
@ -213,7 +215,7 @@ $guiContent = new GuiControl(AssetBrowser_newAsset) {
changeChildSizeToFit = "1";
changeChildPosition = "1";
position = "1 1";
extent = "337 338";
extent = "337 56";
minExtent = "16 16";
horizSizing = "width";
vertSizing = "height";