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

Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend

Browse source
This commit is contained in:
LuisAntonRebollo 2014-11-30 04:47:38 +01:00
commit ff83e8c209
1455 changed files with 98353 additions and 15020 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
View file

@ -862,6 +862,14 @@ function ObjectBuilderGui::buildParticleEmitterNode(%this)
%this.process();
}
function ObjectBuilderGui::buildRibbonNode(%this)
{
%this.objectClassName = "RibbonNode";
%this.addField("dataBlock", "TypeDataBlock", "datablock", "RibbonNodeData");
%this.addField("ribbon", "TypeDataBlock", "Ribbon data", "RibbonData");
%this.process();
}
function ObjectBuilderGui::buildParticleSimulation(%this)
{
%this.objectClassName = "ParticleSimulation";

1
Templates/Full/game/tools/worldEditor/scripts/editors/creator.ed.cs
View file

@ -46,6 +46,7 @@ function EWCreatorWindow::init( %this )
%this.registerMissionObject( "SFXEmitter", "Sound Emitter" );
%this.registerMissionObject( "Precipitation" );
%this.registerMissionObject( "ParticleEmitterNode", "Particle Emitter" );
%this.registerMissionObject( "RibbonNode", "Ribbon" );
// Legacy features. Users should use Ground Cover and the Forest Editor.
//%this.registerMissionObject( "fxShapeReplicator", "Shape Replicator" );