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

7
Templates/BaseGame/game/tools/componentEditor/gui/SuperTooltipDlg.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="SuperTooltipDlg"
scriptFile="@assetFile=superToolTipDlg.ed.gui"
GUIFile="@assetFile=superToolTipDlg.ed.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="TypeMaskFieldGui"
scriptFile="@assetFile=TypeMaskFieldGui.gui"
GUIFile="@assetFile=TypeMaskFieldGui.gui"
VersionId="1" />

6
Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript
View file

@ -73,7 +73,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
position = "7 4";
extent = "64 64";
buttonType = "PushButton";
bitmap = "";
bitmapAsset = "";
Command = "";
text = "Loading...";
useStates = false;
@ -87,7 +87,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
extent = "64 64";
Variable = "";
buttonType = "toggleButton";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
groupNum = "0";
text = "";
tooltip = "Change material";
@ -281,4 +281,4 @@ function materialFieldBtn::onClick(%this)
function materialFieldBtn::setMaterial(%this, %matAssetName)
{
}
}

8
Templates/BaseGame/game/tools/componentEditor/main.tscript
View file

@ -21,15 +21,15 @@
//-----------------------------------------------------------------------------
//Scripts
exec("./scripts/componentEditor.ed." @ $TorqueScriptFileExtension);
exec("./scripts/stateMachineEditor.ed." @ $TorqueScriptFileExtension);
//exec("./scripts/componentEditor.ed." @ $TorqueScriptFileExtension);
//exec("./scripts/stateMachineEditor.ed." @ $TorqueScriptFileExtension);
exec("./scripts/superToolTipDlg.ed." @ $TorqueScriptFileExtension);
//gui
exec("./gui/superToolTipDlg.ed.gui");
exec("./gui/stateMachineDlg.ed.gui");
//exec("./gui/stateMachineDlg.ed.gui");
//field types
exec("./interface/materialFieldType." @ $TorqueScriptFileExtension);
exec("./interface/typeMaskFieldType." @ $TorqueScriptFileExtension);
exec("./interface/stateMachineField." @ $TorqueScriptFileExtension);
exec("./interface/stateMachineField." @ $TorqueScriptFileExtension);

4
Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript
View file

@ -65,7 +65,7 @@ function GuiInspectorEntityGroup::createAddComponentList(%this)
buttonMargin = "4 4";
iconLocation = "Left";
sizeIconToButton = "0";
iconBitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
hovertime = "100";
tooltip = "Add the selected component to the object";
tooltipProfile = "EditorToolTipProfile";
@ -323,4 +323,4 @@ function ComponentEditorRemoveComponent(%entity, %component)
%entity.removeComponent(%component, true);
inspector.removeInspect(%entity);
inspector.addInspect(%entity);
}
}