TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 20:05:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shifts the tools messageboxes to be distinct from any messageboxes in the main game

Browse source 
Reorged the canvas handling of gamepad inputs for the axis and triggers to use the SI_ versions in the right spots
Fixed issue where pause menu would be hidden and not display again
Made the pause menu active from the gamepad start button rather than back
This commit is contained in:
Areloch 2020-07-24 00:40:03 -05:00
parent ef4cc8b573
commit 5b289bce5e
57 changed files with 217 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs
View file

@ -265,7 +265,7 @@ function ShapeEdSelectWindow::onSelect( %this, %path )
if ( ShapeEditor.isDirty() )
{
%cmd = "showImportDialog( \"" @ %path @ "\", \"ShapeEditor.selectShape( \\\"" @ %path @ "\\\", ";
MessageBoxYesNoCancel( "Shape Modified", "Would you like to save your changes?", %cmd @ "true );\" );", %cmd @ "false );\" );" );
toolsMessageBoxYesNoCancel( "Shape Modified", "Would you like to save your changes?", %cmd @ "true );\" );", %cmd @ "false );\" );" );
}
else
{
@ -296,7 +296,7 @@ function ShapeEditor::selectShape( %this, %path, %saveOld )
// Initialise the shape preview window
if ( !ShapeEdShapeView.setModel( %path ) )
{
MessageBoxOK( "Error", "Failed to load '" @ %path @ "'. Check the console for error messages." );
toolsMessageBoxOK( "Error", "Failed to load '" @ %path @ "'. Check the console for error messages." );
return;
}
ShapeEdShapeView.fitToShape();
@ -1617,7 +1617,7 @@ function ShapeEdSequences::onEditBlend( %this )
%blendFrame = %this-->blendFrame.getText();
if ( ( %blendSeq $= "" ) || ( %blendFrame $= "" ) )
{
MessageBoxOK( "Blend reference not set", "The blend reference sequence and " @
toolsMessageBoxOK( "Blend reference not set", "The blend reference sequence and " @
"frame must be set before changing the blend flag or frame." );
ShapeEdSequences-->blendFlag.setStateOn( %oldBlend );
return;
@ -2231,7 +2231,7 @@ function ShapeEdSequences::onAddTrigger( %this )
%frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText();
if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText()))
{
MessageBoxOK( "Error", "Trigger out of range of the selected animation." );
toolsMessageBoxOK( "Error", "Trigger out of range of the selected animation." );
}
else
{
@ -3157,7 +3157,7 @@ function ShapeEdColWindow::editCollision( %this )
if ( ( ShapeEditor.shape.getDetailLevelIndex( -1 ) >= 0 ) &&
( getField(%this.lastColSettings, 0) $= "" ) )
{
MessageBoxYesNo( "Warning", "Existing collision geometry at detail size " @
toolsMessageBoxYesNo( "Warning", "Existing collision geometry at detail size " @
"-1 will be removed, and this cannot be undone. Do you want to continue?",
"ShapeEdColWindow.editCollisionOK();", "" );
}
@ -3366,7 +3366,7 @@ function ShapeEdMountWindow::mountShape( %this, %slot )
}
else
{
MessageBoxOK( "Error", "Failed to mount \"" @ %model @ "\". Check the console for error messages.", "" );
toolsMessageBoxOK( "Error", "Failed to mount \"" @ %model @ "\". Check the console for error messages.", "" );
}
}

6
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorActions.ed.cs
View file

@ -95,7 +95,7 @@ function ShapeEditor::doAction( %this, %action )
}
else
{
MessageBoxOK( "Error", %action.actionName SPC "failed. Check the console for error messages.", "" );
toolsMessageBoxOK( "Error", %action.actionName SPC "failed. Check the console for error messages.", "" );
}
}
@ -108,7 +108,7 @@ function BaseShapeEdAction::redo( %this )
}
else
{
MessageBoxOK( "Error", "Redo" SPC %this.actionName SPC "failed. Check the console for error messages.", "" );
toolsMessageBoxOK( "Error", "Redo" SPC %this.actionName SPC "failed. Check the console for error messages.", "" );
}
}
@ -122,7 +122,7 @@ function BaseShapeEdAction::undo( %this )
function ShapeEditor::doRemoveShapeData( %this, %type, %name )
{
// Removing data from the shape cannot be undone => so warn the user first
MessageBoxYesNo( "Warning", "Deleting a " @ %type @ " cannot be undone. Do " @
toolsMessageBoxYesNo( "Warning", "Deleting a " @ %type @ " cannot be undone. Do " @
"you want to continue?", "ShapeEditor.doRemove" @ %type @ "( \"" @ %name @ "\" );", "" );
}