TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 16:43:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into BugfixQOL_20210909

Browse source
This commit is contained in:
Areloch 2021-09-10 02:20:13 -05:00
commit dec9f54a9b
322 changed files with 10473 additions and 10241 deletions
Download patch file Download diff file Expand all files Collapse all files

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/guiEditor/scripts/guiEditorProfiles.ed.tscript
View file

@ -69,6 +69,8 @@ function GuiEditor::createNewProfile( %this, %name, %copySource )
function GuiEditor::getProfileCategory( %this, %profile )
{
// TODO
%name = "";
if( %this.isDefaultProfile( %name ) )
return "Default";
else if( %profile.category !$= "" )

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

@ -364,6 +364,10 @@ function GenericUndoAction::learn(%this, %object)
%oldFieldNames = %this.fieldNames[%object];
%numNewFields = getWordCount(%newFieldNames);
%numOldFields = getWordCount(%oldFieldNames);
%newNullFields = "";
%oldNullFields = "";
// compare the old field list to the new field list.
// if a field is on the old list that isn't on the new list,
// add it to the newNullFields list.