TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
This commit is contained in:
Jeff Hutchinson 2021-05-06 21:08:53 -04:00
commit 69d7a2f4a1
12 changed files with 90 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -2552,7 +2552,7 @@ function MaterialEditorGui::saveCompositeMap(%this)
%saveAs = "";
%dlg = new SaveFileDialog()
{
Filters = "png";
Filters = "PNG File (*.png)|*.png";
DefaultPath = EditorSettings.value("data/");
ChangePath = false;
OverwritePrompt = true;
@ -2566,6 +2566,9 @@ function MaterialEditorGui::saveCompositeMap(%this)
%saveAs = %dlg.FileName;
}
if( fileExt( %saveAs ) !$= ".png" )
%saveAs = %saveAs @ ".png";
%material = %this.currentMaterial;
%layer = %this.currentLayer;

14
Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
View file

@ -1072,6 +1072,20 @@ function ObjectBuilderGui::buildObserverDropPoint(%this)
%this.process();
}
function ObjectBuilderGui::buildGeneralDropPoint(%this)
{
%this.objectClassName = "SpawnSphere";
%this.addField("dataBlock", "TypeDataBlock", "dataBlock", "MissionMarkerData SpawnSphereMarker");
%this.addField("radius", "TypeFloat", "Radius", 1);
%this.addField("sphereWeight", "TypeFloat", "Sphere Weight", 1);
%this.addField("spawnClass", "TypeString", "Spawn Class", "");
%this.addField("spawnDatablock", "TypeString", "Spawn Data", "");
%this.addField("spawnTransform", "TypeBool", "Spawn Here", "true");
%this.addField("canSaveDynamicFields", "TypeBool", "Save metadata", "false");
%this.process();
}
function ObjectBuilderGui::buildNotesObject(%this)
{
%this.objectClassName = "NotesObject";

1
Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript
View file

@ -87,6 +87,7 @@ function EWCreatorWindow::init( %this )
%this.registerMissionObject( "Portal", "Zone Portal" );
%this.registerMissionObject( "SpawnSphere", "Player Spawn Sphere", "PlayerDropPoint" );
%this.registerMissionObject( "SpawnSphere", "Observer Spawn Sphere", "ObserverDropPoint" );
%this.registerMissionObject( "SpawnSphere", "General Spawn Sphere", "GeneralDropPoint" );
%this.registerMissionObject( "SFXSpace", "Sound Space" );
%this.registerMissionObject( "OcclusionVolume", "Occlusion Volume" );
%this.registerMissionObject( "AccumulationVolume", "Accumulation Volume" );