From b911768adc3c7642547d4f63156dca2a950c1dd5 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 25 Jul 2015 11:44:57 +1000 Subject: [PATCH 1/2] Add RibbonData::create functions to the world editor. --- .../tools/worldEditor/gui/objectBuilderGui.ed.gui | 11 +++++++++++ .../tools/worldEditor/gui/objectBuilderGui.ed.gui | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui index 33cb5de75..ddf2ef68a 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui @@ -1131,3 +1131,14 @@ function ProximityMineData::create( %datablock ) return %obj; } + +function RibbonData::create( %datablock ) +{ + %obj = new RibbonNode() + { + dataBlock = DefaultRibbonNodeData; + ribbon = %datablock; + }; + + return %obj; +} diff --git a/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui index 33cb5de75..ddf2ef68a 100644 --- a/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui +++ b/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui @@ -1131,3 +1131,14 @@ function ProximityMineData::create( %datablock ) return %obj; } + +function RibbonData::create( %datablock ) +{ + %obj = new RibbonNode() + { + dataBlock = DefaultRibbonNodeData; + ribbon = %datablock; + }; + + return %obj; +} From 8030c75acf1bee575f28ae29716c107ff2c5f867 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 25 Jul 2015 11:50:47 +1000 Subject: [PATCH 2/2] Put ribbons in the FX category so they can be created from the editor. --- Templates/Empty/game/art/ribbons/ribbons.cs | 2 ++ Templates/Full/game/art/ribbons/ribbons.cs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Templates/Empty/game/art/ribbons/ribbons.cs b/Templates/Empty/game/art/ribbons/ribbons.cs index b2184b74c..fdf5bf865 100644 --- a/Templates/Empty/game/art/ribbons/ribbons.cs +++ b/Templates/Empty/game/art/ribbons/ribbons.cs @@ -41,4 +41,6 @@ datablock RibbonData(BasicRibbon) fadeAwayStep = 0.1; UseFadeOut = true; RibbonMaterial = BasicRibbonMat; + + category = "FX"; }; diff --git a/Templates/Full/game/art/ribbons/ribbons.cs b/Templates/Full/game/art/ribbons/ribbons.cs index 8660ec4d2..675d813c3 100644 --- a/Templates/Full/game/art/ribbons/ribbons.cs +++ b/Templates/Full/game/art/ribbons/ribbons.cs @@ -41,6 +41,8 @@ datablock RibbonData(BasicRibbon) fadeAwayStep = 0.1; UseFadeOut = true; RibbonMaterial = BasicRibbonMat; + + category = "FX"; }; datablock RibbonData(TexturedRibbon) @@ -60,4 +62,6 @@ datablock RibbonData(TexturedRibbon) tileScale = 1; fixedTexCoords = true; TexcoordsRelativeToDistance = true; + + category = "FX"; }; \ No newline at end of file