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

lotsa fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-05-04 21:18:15 -04:00
parent db047275f1
commit 6f7fdca87d
178 changed files with 230 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiContainer(NewEditorGui) {
$guiContent = new GuiContainer(NewEditorGui) {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";

2
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui
View file

@ -3,7 +3,7 @@
// Copyright (C) - Violent Tulip
//-----------------------------------------------------------------------------
%guiContent = new GuiControl(VPathEditorToolbar)
$guiContent = new GuiControl(VPathEditorToolbar)
{
canSaveDynamicFields = "0";
internalName = "VPathEditorToolbar";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorGui) {
$guiContent = new GuiControl(VerveEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
$guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
isContainer = "1";
Profile = "GuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
$guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
isContainer = "1";
Profile = "GuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorPreferenceGui) {
$guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiDefaultProfile";

2
Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetImportConfigEditor) {
$guiContent = new GuiControl(AssetImportConfigEditor) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GameObjectCreator) {
$guiContent = new GuiControl(GameObjectCreator) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_AddModule) {
$guiContent = new GuiControl(AssetBrowser_AddModule) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_AddPackage) {
$guiContent = new GuiControl(AssetBrowser_AddPackage) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser) {
$guiContent = new GuiControl(AssetBrowser) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetImportCtrl) {
$guiContent = new GuiControl(AssetImportCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowserImportLog) {
$guiContent = new GuiControl(AssetBrowserImportLog) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_assetNameEdit) {
$guiContent = new GuiControl(AssetBrowser_assetNameEdit) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetPreviewButtonsTemplate) {
$guiContent = new GuiControl(AssetPreviewButtonsTemplate) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
$guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_editAsset) {
$guiContent = new GuiControl(AssetBrowser_editAsset) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_editModule) {
$guiContent = new GuiControl(AssetBrowser_editModule) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(LooseFileAudit) {
$guiContent = new GuiControl(LooseFileAudit) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

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

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_newAsset) {
$guiContent = new GuiControl(AssetBrowser_newAsset) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_newComponentAsset) {
$guiContent = new GuiControl(AssetBrowser_newComponentAsset) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_newFolder) {
$guiContent = new GuiControl(AssetBrowser_newFolder) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

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

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_SelectModule) {
$guiContent = new GuiControl(AssetBrowser_SelectModule) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_SelectPackage) {
$guiContent = new GuiControl(AssetBrowser_SelectPackage) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(SelectAssetPath) {
$guiContent = new GuiControl(SelectAssetPath) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(@@)
$guiContent = new GuiControl(@@)
{
position = "0 0";
extent = "100 100";

2
Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TypeMaskFieldGui) {
$guiContent = new GuiControl(TypeMaskFieldGui) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(SuperTooltipDlg) {
$guiContent = new GuiControl(SuperTooltipDlg) {
canSaveDynamicFields = "0";
Profile = "GuiTransparentProfileModeless";
class = "SuperTooltip";

2
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
$guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/convexEditor/convexEditorSettingsTab.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
$guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "";
isContainer = "1";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorCreatePrompt.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DatablockEditorCreatePrompt,EditorGuiGroup) {
$guiContent = new GuiControl(DatablockEditorCreatePrompt,EditorGuiGroup) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/debugger/gui/breakConditionDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/connectDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/debugger.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) {
profile = "ToolsGuiWindowProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/watchDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
$guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
$guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) {
$guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) {
renderMissionArea = "0";
missionAreaFillColor = "255 0 0 20";
missionAreaFrameColor = "255 0 0 128";

2
Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(EditorLoadingGui,EditorGuiGroup) {
$guiContent = new GuiControl(EditorLoadingGui,EditorGuiGroup) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
$guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) {
$guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/gui/assimpImport.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) {
$guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";

6
Templates/BaseGame/game/tools/gui/colladaImport.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) {
$guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";
@ -1754,8 +1754,8 @@ function convertColladaModels(%pattern)
function showImportDialog(%shapePath, %cmd)
{
%this.path = %shapePath;
%this.cmd = %cmd;
ColladaImportDlg.path = %shapePath;
ColladaImportDlg.cmd = %cmd;
if ( fileExt(%shapePath) $= ".dts" || fileExt(%shapePath) $= ".dsq"
|| fileExt(%shapePath) $= ".dae" || fileExt(%shapePath) $= ".kmz" )

2
Templates/BaseGame/game/tools/gui/colorPicker.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
$guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
displayMode = "Dropper"; // this makes the background visible
actionOnMove = "1";
position = "0 0";

2
Templates/BaseGame/game/tools/gui/cubemapEditor.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(CubemapEditor) {
$guiContent = new GuiControl(CubemapEditor) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

3
Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript
View file

@ -255,8 +255,7 @@ function FileDialogOkButton::onClick( %this )
// Callback
eval( %this.parent.SuccessCallback @ "(\"" @ %fullPath @"\");" );
%parent.SuccessCallback = 0;
%this.parent.SuccessCallback = 0;
//error("Ok");

2
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl() {
$guiContent = new GuiWindowCollapseCtrl() {
collapseGroup = "-1";
collapseGroupNum = "-1";
resizeWidth = "1";

6
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript
View file

@ -37,7 +37,7 @@ function inspectObject( %object )
// Create a new object inspector window.
exec( "./guiObjectInspector.ed.gui" );
if( !isObject( %guiContent) )
if( !isObject( $guiContent) )
{
error( "InspectObject: failed to create GUI from 'guiObjectInspector.ed.gui'" );
return;
@ -45,9 +45,9 @@ function inspectObject( %object )
// Initialize the inspector.
%guiContent.init( %object );
$guiContent.init( %object );
Canvas.getContent().add( %guiContent );
Canvas.getContent().add( $guiContent );
}
//=============================================================================================

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

@ -778,6 +778,8 @@ function MaterialSelector::buildStaticFilters( %this )
// if you want to add any more containers to staticFilterObjects, here's
// where to do it
%filterArray = MaterialSelector-->filterArray;
%staticFilterContainer = new GuiControl (){
new GuiContainer(){
profile = "ToolsGuiDefaultProfile";
@ -1366,7 +1368,7 @@ function MaterialSelector::loadMaterialFilters( %this )
// create category and update current material if there is one
function MaterialSelector::createFilter( %this, %filter )
{
if( %filter $= %existingFilters )
if( %filter $= "" )
{
toolsMessageBoxOK( "Error", "Can not create blank filter.");
return;

2
Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(IODropdownDlg) {
$guiContent = new GuiControl(IODropdownDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
$guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
$guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessagePopupDlg) {
$guiContent = new GuiControl(MessagePopupDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/postFxEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(postFXEditor) {
$guiContent = new GuiControl(postFXEditor) {
position = "0 0";
extent = "1920 1200";
minExtent = "8 8";

2
Templates/BaseGame/game/tools/gui/profilerGraph.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ProfilerGraphGui) {
$guiContent = new GuiControl(ProfilerGraphGui) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(RenderTargetVisualizer) {
$guiContent = new GuiControl(RenderTargetVisualizer) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
$guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";

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

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
$guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultNonModalProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(simViewDlg, EditorGuiGroup) {
$guiContent = new GuiControl(simViewDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) {
$guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui
View file

@ -3,7 +3,7 @@
// Copyright (C) GarageGames.com, Inc.
//---------------------------------------------------------------------------------------------
%guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
$guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";

2
Templates/BaseGame/game/tools/guiEditor/gui/guiEditorNewGuiDialog.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GuiEditorNewGuiDialog,EditorGuiGroup) {
$guiContent = new GuiControl(GuiEditorNewGuiDialog,EditorGuiGroup) {
isContainer = "1";
profile = "ToolsGuiOverlayProfile";
horizSizing = "right";

2
Templates/BaseGame/game/tools/guiEditor/gui/guiEditorPrefsDlg.ed.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(GuiEditorPrefsDlg, EditorGuiGroup) {
$guiContent = new GuiControl(GuiEditorPrefsDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/guiEditor/gui/guiEditorSelectDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GuiEditorSelectDlgContainer,EditorGuiGroup) {
$guiContent = new GuiControl(GuiEditorSelectDlgContainer,EditorGuiGroup) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

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

@ -49,7 +49,7 @@ function GE_OpenGUIFile()
// The level file should have contained a scenegraph, which should now be in the instant
// group. And, it should be the only thing in the group.
if( !isObject( %guiContent ) )
if( !isObject( $guiContent ) )
{
toolsMessageBox( getEngineName(),
"You have loaded a Gui file that was created before this version. It has been loaded but you must open it manually from the content list dropdown",
@ -58,7 +58,7 @@ function GE_OpenGUIFile()
return 0;
}
GuiEditContent( %guiContent );
GuiEditContent( $guiContent );
}
function GE_GUIList::onURL(%this, %url)

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

@ -281,7 +281,7 @@ function GuiEditCanvas::load( %this, %filename )
// The GUI file should have contained a GUIControl which should now be in the instant
// group. And, it should be the only thing in the group.
if( !isObject( %guiContent ) )
if( !isObject( $guiContent ) )
{
toolsMessageBox( getEngineName(),
"You have loaded a Gui file that was created before this version. It has been loaded but you must open it manually from the content list dropdown",
@ -289,7 +289,7 @@ function GuiEditCanvas::load( %this, %filename )
return 0;
}
GuiEditor.openForEditing( %guiContent );
GuiEditor.openForEditing( $guiContent );
GuiEditorStatusBar.print( "Loaded '" @ %filename @ "'" );
}
@ -449,7 +449,7 @@ function GuiEditCanvas::save( %this, %selectedOnly, %noPrompt )
%fo.writeLine( %beforeNewFileLines[ %i ] );
%fo.writeLine("//--- OBJECT WRITE BEGIN ---");
%fo.writeObject(%currentObject, "%guiContent = ");
%fo.writeObject(%currentObject, "$guiContent = ");
%fo.writeLine("//--- OBJECT WRITE END ---");
// Write out captured TorqueScript below Gui object
@ -488,19 +488,19 @@ function GuiEditCanvas::append( %this )
// Find guiContent.
if( !isObject( %guiContent ) )
if( !isObject( $guiContent ) )
{
toolsMessageBox( "Error loading GUI file", "The GUI content controls could not be found. This function can only be used with files saved by the GUI editor.", "Ok", "Error" );
return;
}
if( !GuiEditorContent.getCount() )
GuiEditor.openForEditing( %guiContent );
GuiEditor.openForEditing( $guiContent );
else
{
GuiEditor.getCurrentAddSet().add( %guiContent );
GuiEditor.readGuides( %guiContent );
GuiEditor.onAddNewCtrl( %guiContent );
GuiEditor.getCurrentAddSet().add( $guiContent );
GuiEditor.readGuides( $guiContent );
GuiEditor.onAddNewCtrl( $guiContent );
GuiEditor.onHierarchyChanged();
}

2
Templates/BaseGame/game/tools/main.tscript
View file

@ -252,7 +252,7 @@ function EditorCreateFakeGameSession(%fileName)
$Game::MissionGroup = "MissionGroup";
exec(%file);
exec(%fileName);
}
function fastLoadWorldEdit(%val)

2
Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MaterialEditorToolbar) {
$guiContent = new GuiControl(MaterialEditorToolbar) {
canSaveDynamicFields = "0";
internalName = "ShapeEditorToolbar";
Enabled = "1";

2
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
canSaveDynamicFields = "0";
internalName = "MatEdPreviewWindowContainer";
Enabled = "1";

2
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
$guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "MatEdPropertiesWindowContainer";
Enabled = "1";

2
Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MaterialInstanceViewCtrl) {
$guiContent = new GuiControl(MaterialInstanceViewCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) {
$guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorSettingsTab.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MeshRoadEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(MeshRoadEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
$guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "MeshRoadEditorToolbar";
Enabled = "1";

2
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) {
$guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/navEditor/CreateNewNavMeshDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(CreateNewNavMeshDlg) {
$guiContent = new GuiControl(CreateNewNavMeshDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/navEditor/NavEditorConsoleDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCtrl(NavEditorConsoleDlg) {
$guiContent = new GuiWindowCtrl(NavEditorConsoleDlg) {
text = "Nav Console";
resizeWidth = "1";
resizeHeight = "1";

2
Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
$guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiTabPageCtrl(ENavEditorSettingsPage) {
$guiContent = new GuiTabPageCtrl(ENavEditorSettingsPage) {
fitBook = "1";
text = "Navigation Editor";
maxLength = "1024";

2
Templates/BaseGame/game/tools/navEditor/NavEditorToolbar.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(NavEditorToolbar,EditorGuiGroup) {
$guiContent = new GuiControl(NavEditorToolbar,EditorGuiGroup) {
position = "306 0";
extent = "800 32";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -20,7 +20,7 @@ $PE_guielement_pos_colorpicker = "158 0";
$PE_guielement_ext_colorpicker = "18 18";
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl(PE_Window) {
$guiContent = new GuiWindowCollapseCtrl(PE_Window) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) {
$guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/riverEditor/RiverEditorSettingsTab.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(RiverEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(RiverEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
$guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "MeshRoadEditorToolbar";
Enabled = "1";

2
Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiRoadEditorCtrl(RoadEditorGui) {
$guiContent = new GuiRoadEditorCtrl(RoadEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(RoadEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(RoadEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(RoadEditorToolbar) {
$guiContent = new GuiControl(RoadEditorToolbar) {
canSaveDynamicFields = "0";
internalName = "RoadEditorToolbar";
Enabled = "1";

2
Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorSettingsTab.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ShapeEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(ShapeEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
$guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "";
isContainer = "1";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
$guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
text = "Advanced Properties";
resizeWidth = "0";
resizeHeight = "0";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
$guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiToolbarWindowProfile";

Some files were not shown because too many files have changed in this diff Show more