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

4
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs
View file

@ -928,7 +928,7 @@ function AssetBrowser::showDeleteDialog( %this )
if( isObject( %material ) )
{
MessageBoxYesNoCancel("Delete Material?",
toolsMessageBoxYesNoCancel("Delete Material?",
"Are you sure you want to delete<br><br>" @ %material.getName() @ "<br><br> Material deletion won't take affect until the engine is quit.",
"AssetBrowser.deleteMaterial( " @ %material @ ", " @ %secondFilter @ ", " @ %secondFilterName @" );",
"",
@ -2320,7 +2320,7 @@ function AssetBrowserFilterTree::onControlDropped( %this, %payload, %position )
if(%path !$= AssetBrowser.dirHandler.CurrentAddress)
{
//we're trying to move the asset to a different module!
//MessageBoxYesNo( "Move Asset", "Do you wish to move asset " @ %assetName @ " to " @ %path @ "?",
//toolsMessageBoxYesNo( "Move Asset", "Do you wish to move asset " @ %assetName @ " to " @ %path @ "?",
// "AssetBrowser.moveAsset(\""@ %moduleName @ ":" @ %assetName @"\", \""@%path@"\");", "");
if(%assetType $= "Folder")

10
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.cs
View file

@ -422,19 +422,19 @@ function ImportAssetWindow::reloadImportOptionConfigs(%this)
EditorSettings.value("Assets/AssetImporDefaultConfig") $= "" ||
EditorSettings.value("Assets/AutoImport", false) == false)
{
MessageBoxOK("Unable to AutoImport", "Attempted to import a loose file " @ %filePath @ " with AutoImport but was unable to either due to lacking a valid import config, or the editor settings are not set to auto import.");
toolsMessageBoxOK("Unable to AutoImport", "Attempted to import a loose file " @ %filePath @ " with AutoImport but was unable to either due to lacking a valid import config, or the editor settings are not set to auto import.");
return false;
}
if(%assetType $= "folder" || %assetType $= "zip")
{
MessageBoxOK("Unable to AutoImport", "Unable to auto import folders or zips at this time");
toolsMessageBoxOK("Unable to AutoImport", "Unable to auto import folders or zips at this time");
return false;
}
if(%assetType $= "")
{
MessageBoxOK("Unable to AutoImport", "Unable to auto import unknown file type for file " @ %filePath);
toolsMessageBoxOK("Unable to AutoImport", "Unable to auto import unknown file type for file " @ %filePath);
return false;
}
}
@ -706,7 +706,7 @@ function ImportAssetWindow::doRefresh(%this)
if(ImportAssetWindow.importConfigsList.count() == 0)
{
MessageBoxOK( "Warning", "No base import config. Please create an import configuration set to simplify asset importing.");
toolsMessageBoxOK( "Warning", "No base import config. Please create an import configuration set to simplify asset importing.");
}
%this.dirty = false;
@ -978,7 +978,7 @@ function ImportAssetWindow::ImportAssets(%this)
if(!isObject(%module))
{
MessageBoxOK( "Error!", "No module selected. You must select or create a module for the assets to be added to.");
toolsMessageBoxOK( "Error!", "No module selected. You must select or create a module for the assets to be added to.");
return;
}

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.cs
View file

@ -168,7 +168,7 @@ function AssetImportConfigEditor::createNewImportConfig(%this)
function AssetImportConfigEditor::deleteConfig(%this)
{
%callback = "AssetImportConfigEditor.onDeleteConfig();";
MessageBoxOKCancel("Delete Import Config", "This will delete the " @ AssetImportConfigList.currentConfig @ " config. Continue?", %callback, "");
toolsMessageBoxOKCancel("Delete Import Config", "This will delete the " @ AssetImportConfigList.currentConfig @ " config. Continue?", %callback, "");
}
function AssetImportConfigEditor::onDeleteConfig(%this)

2
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs
View file

@ -349,7 +349,7 @@ function AssetBrowser::deleteAsset(%this)
//%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
//%assetType = %assetDef.getClassName();
MessageBoxOKCancel("Warning!", "This will delete the selected content and the files associated to it, do you wish to continue?",
toolsMessageBoxOKCancel("Warning!", "This will delete the selected content and the files associated to it, do you wish to continue?",
"AssetBrowser.confirmDeleteAsset();", "");
}

2
Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.cs
View file

@ -20,7 +20,7 @@ function AssetBrowser::CreateNewModule(%this)
function AssetBrowser::promptNewModuleFolders(%this)
{
MessageBoxYesNo("Create Folders?",
toolsMessageBoxYesNo("Create Folders?",
"Do you want to create some common folders for organization of your new Module?",
"AssetBrowser.makeModuleFolders();", //if yes, make the foldesr
"AssetBrowser.loadDirectories();"); //if no, just refresh

6
Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs
View file

@ -157,7 +157,7 @@ function CreateNewAsset()
if(%assetName $= "")
{
MessageBoxOK( "Error", "Attempted to make a new asset with no name!");
toolsMessageBoxOK( "Error", "Attempted to make a new asset with no name!");
return;
}
@ -166,7 +166,7 @@ function CreateNewAsset()
if(%moduleName $= "")
{
MessageBoxOK( "Error", "Attempted to make a new asset with no module!");
toolsMessageBoxOK( "Error", "Attempted to make a new asset with no module!");
return;
}
@ -175,7 +175,7 @@ function CreateNewAsset()
%assetType = AssetBrowser.newAssetSettings.assetType;
if(%assetType $= "")
{
MessageBoxOK( "Error", "Attempted to make a new asset with no type!");
toolsMessageBoxOK( "Error", "Attempted to make a new asset with no type!");
return;
}