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

14
Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.cs
View file

@ -420,7 +420,7 @@ function PE_EmitterEditor::updateParticlesFields( %this )
if( %changedEditParticle && PE_ParticleEditor.dirty )
{
MessageBoxYesNoCancel("Save Particle Changes?",
toolsMessageBoxYesNoCancel("Save Particle Changes?",
"Do you wish to save the changes made to the <br>current particle before changing the particle?",
"PE_ParticleEditor.saveParticle( " @ PE_ParticleEditor.currParticle.getName() @ " ); PE_EmitterEditor.updateEmitter( \"particles\"," @ %particles @ ");",
"PE_ParticleEditor.saveParticleDialogDontSave( " @ PE_ParticleEditor.currParticle.getName() @ " ); PE_EmitterEditor.updateEmitter( \"particles\"," @ %particles @ ");",
@ -447,14 +447,14 @@ function PE_EmitterEditor::onNewEmitter( %this )
if( PE_ParticleEditor.dirty )
{
MessageBoxYesNo("Save Existing Particle?",
toolsMessageBoxYesNo("Save Existing Particle?",
"Do you want to save changes to <br><br>" @ PE_ParticleEditor.currParticle.getName(),
"PE_ParticleEditor.saveParticle(" @ PE_ParticleEditor.currParticle @ ");"
);
}
%savedEmitter = PE_EmitterEditor.currEmitter;
MessageBoxYesNoCancel("Save Existing Emitter?",
toolsMessageBoxYesNoCancel("Save Existing Emitter?",
"Do you want to save changes to <br><br>" @ %savedEmitter.getName(),
"PE_EmitterEditor.saveEmitter(" @ %savedEmitter@ "); PE_EmitterEditor.loadNewEmitter();",
"PE_EmitterEditor.saveEmitterDialogDontSave(" @ %savedEmitter @ "); PE_EmitterEditor.loadNewEmitter();"
@ -527,7 +527,7 @@ function PE_EmitterEditor::showNewDialog( %this )
if( PE_ParticleEditor.dirty )
{
MessageBoxYesNo("Save Existing Particle?",
toolsMessageBoxYesNo("Save Existing Particle?",
"Do you want to save changes to <br><br>" @ PE_ParticleEditor.currParticle.getName(),
"PE_ParticleEditor.saveParticle(" @ PE_ParticleEditor.currParticle @ ");"
);
@ -535,7 +535,7 @@ function PE_EmitterEditor::showNewDialog( %this )
if( PE_EmitterEditor.dirty )
{
MessageBoxYesNoCancel("Save Emitter Changes?",
toolsMessageBoxYesNoCancel("Save Emitter Changes?",
"Do you wish to save the changes made to the <br>current emitter before changing the emitter?",
"PE_EmitterEditor.saveEmitter( " @ PE_EmitterEditor.currEmitter.getName() @ " ); PE_EmitterEditor.createEmitter();",
"PE_EmitterEditor.saveEmitterDialogDontSave( " @ PE_EmitterEditor.currEmitter.getName() @ " ); PE_EmitterEditor.createEmitter();"
@ -579,13 +579,13 @@ function PE_EmitterEditor::showDeleteDialog( %this )
{
if( PE_EmitterEditor.currEmitter.getName() $= "DefaultEmitter" )
{
MessageBoxOK( "Error", "Cannot delete DefaultEmitter");
toolsMessageBoxOK( "Error", "Cannot delete DefaultEmitter");
return;
}
if( isObject( PE_EmitterEditor.currEmitter ) )
{
MessageBoxYesNoCancel("Delete Emitter?",
toolsMessageBoxYesNoCancel("Delete Emitter?",
"Are you sure you want to delete<br><br>" @ PE_EmitterEditor.currEmitter.getName() @ "<br><br> Emitter deletion won't take affect until the level is exited.",
"PE_EmitterEditor.saveEmitterDialogDontSave( " @ PE_EmitterEditor.currEmitter.getName() @ " ); PE_EmitterEditor.deleteEmitter();"
);

12
Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.cs
View file

@ -366,7 +366,7 @@ function PE_ParticleEditor::onNewParticle( %this )
// Load new particle if we're not in a dirty state
if( PE_ParticleEditor.dirty )
{
MessageBoxYesNoCancel("Save Existing Particle?",
toolsMessageBoxYesNoCancel("Save Existing Particle?",
"Do you want to save changes to <br><br>" @ PE_ParticleEditor.currParticle.getName(),
"PE_ParticleEditor.saveParticle(" @ PE_ParticleEditor.currParticle @ ");",
"PE_ParticleEditor.saveParticleDialogDontSave(" @ PE_ParticleEditor.currParticle @ "); PE_ParticleEditor.loadNewParticle();"
@ -430,7 +430,7 @@ function PE_ParticleEditor::showNewDialog( %this, %replaceSlot )
// Open a dialog if the current Particle is dirty
if( PE_ParticleEditor.dirty )
{
MessageBoxYesNoCancel("Save Particle Changes?",
toolsMessageBoxYesNoCancel("Save Particle Changes?",
"Do you wish to save the changes made to the <br>current particle before changing the particle?",
"PE_ParticleEditor.saveParticle( " @ PE_ParticleEditor.currParticle.getName() @ " ); PE_ParticleEditor.createParticle( " @ %replaceSlot @ " );",
"PE_ParticleEditor.saveParticleDialogDontSave( " @ PE_ParticleEditor.currParticle.getName() @ " ); PE_ParticleEditor.createParticle( " @ %replaceSlot @ " );"
@ -453,7 +453,7 @@ function PE_ParticleEditor::createParticle( %this, %replaceSlot )
%numExistingParticles = getWordCount( PE_EmitterEditor.currEmitter.particles );
if( %numExistingParticles > 3 )
{
MessageBoxOK( "Error", "An emitter cannot have more than 4 particles assigned to it." );
toolsMessageBoxOK( "Error", "An emitter cannot have more than 4 particles assigned to it." );
return;
}
@ -493,7 +493,7 @@ function PE_ParticleEditor::showDeleteDialog( %this )
if( PE_ParticleEditor.currParticle.getName() $= "DefaultParticle" )
{
MessageBoxOK( "Error", "Cannot delete DefaultParticle");
toolsMessageBoxOK( "Error", "Cannot delete DefaultParticle");
return;
}
@ -501,7 +501,7 @@ function PE_ParticleEditor::showDeleteDialog( %this )
if( getWordCount( PE_EmitterEditor.currEmitter.particles ) == 1 )
{
MessageBoxOK( "Error", "At least one particle must remain on the particle emitter.");
toolsMessageBoxOK( "Error", "At least one particle must remain on the particle emitter.");
return;
}
@ -509,7 +509,7 @@ function PE_ParticleEditor::showDeleteDialog( %this )
if( isObject( PE_ParticleEditor.currParticle ) )
{
MessageBoxYesNoCancel( "Delete Particle?",
toolsMessageBoxYesNoCancel( "Delete Particle?",
"Are you sure you want to delete<br><br>" @ PE_ParticleEditor.currParticle.getName() @ "<br><br> Particle deletion won't take affect until the engine is quit.",
"PE_ParticleEditor.saveParticleDialogDontSave( " @ PE_ParticleEditor.currParticle.getName() @ " ); PE_ParticleEditor.deleteParticle();",
"",