Merge pull request #150 from Azaezel/alpha40_particleEditorAugs

expose particle timer entries 4-8 to the editor

Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui

@@ -998,6 +998,94 @@ $PE_guielement_ext_colorpicker = "18 18";
                         };             
                      };
                      
+                     new GuiControl(){ // Emitter Angle Variance
+                        isContainer = "1";
+                        class = "AggregateControl";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiBitmapCtrl(){ // 0 Degrees
+                           HorizSizing = "left";
+                           position = getWord($PE_guielement_pos_slider,0)+4 SPC "0";
+                           Extent = "2 18";
+                           minExtent = "0 0";
+                           bitmap = "tools/gui/images/separator-h";
+                           tooltip = "0 Degrees ( Up )";
+                        };
+                        new GuiBitmapCtrl(){ // 90 Degrees
+                           HorizSizing = "left";
+                           position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/4)+1 SPC "0";
+                           Extent = "2 18";
+                           minExtent = "0 0";
+                           bitmap = "tools/gui/images/separator-h";
+                           tooltip = "45 Degrees";
+                        };
+                        new GuiBitmapCtrl(){ // 180 Degrees
+                           HorizSizing = "left";
+                           minExtent = "0 0";
+                           position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
+                           Extent = "2 18";
+                           bitmap = "tools/gui/images/separator-h";
+                           tooltip = "90 Degrees";
+                        };
+                        new GuiBitmapCtrl(){ // 270 Degrees
+                           HorizSizing = "left";
+                           position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2+mCeil(getWord($PE_guielement_ext_slider,0)/4))-4 SPC "0";
+                           Extent = "2 18";
+                           minExtent = "0 0";
+                           bitmap = "tools/gui/images/separator-h";
+                           tooltip = "135 Degrees";
+                        };
+                        new GuiBitmapCtrl(){ // 360 Degrees
+                           HorizSizing = "left";
+                           position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0))-5 SPC "0";
+                           Extent = "2 18";
+                           minExtent = "0 0";
+                           bitmap = "tools/gui/images/separator-h";
+                           tooltip = "180 Degrees";
+                        };
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Angle Variance";
+                        };
+                        new GuiSliderCtrl(PEE_thetaVar) {
+                           internalName = "PEE_thetaVar_slider";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "PE_EmitterEditor.updateEmitter( \"thetaVariance\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_EmitterEditor.updateEmitter( \"thetaVariance\", $ThisControl.getValue(), true, false );";
+                           hovertime = "1000";
+                           range = "0 180";
+                           ticks = "0";
+                           value = "0";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEE_thetaVar_textEdit";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_EmitterEditor.updateEmitter( \"thetaVariance\", $ThisControl.getText());";
+                        };             
+                     };
+                     
                      new GuiControl(){ // Spacer ----------------------------
                         isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
                         new GuiBitmapCtrl(){
@@ -1084,7 +1172,7 @@ $PE_guielement_ext_colorpicker = "18 18";
                            Command = "PE_EmitterEditor.updateEmitter( \"ejectionOffset\", $ThisControl.getValue(), true, true );";
                            altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_EmitterEditor.updateEmitter( \"ejectionOffset\", $ThisControl.getValue(), true, false );";
                            hovertime = "1000";
-                           range = "0 10";
+                           range = "0 50";
                            ticks = "0";
                            value = "0";
                         };
@@ -2797,7 +2885,7 @@ $PE_guielement_ext_colorpicker = "18 18";
                            Profile = "GuiInspectorSwatchButtonProfile";
                            HorizSizing = "left";
                            VertSizing = "bottom";
-                           position = "75 0";
+                           position = "20 0";
                            Extent = $PE_guielement_ext_colorpicker;
                            MinExtent = "8 2";
                            canSave = "1";
@@ -2818,7 +2906,7 @@ $PE_guielement_ext_colorpicker = "18 18";
                            Profile = "GuiInspectorSwatchButtonProfile";
                            HorizSizing = "left";
                            VertSizing = "bottom";
-                           position = "102 0";
+                           position = "40 0";
                            Extent = $PE_guielement_ext_colorpicker;
                            MinExtent = "8 2";
                            canSave = "1";
@@ -2839,7 +2927,7 @@ $PE_guielement_ext_colorpicker = "18 18";
                            Profile = "GuiInspectorSwatchButtonProfile";
                            HorizSizing = "left";
                            VertSizing = "bottom";
-                           position = "129 0";
+                           position = "60 0";
                            Extent = $PE_guielement_ext_colorpicker;
                            MinExtent = "8 2";
                            canSave = "1";
@@ -2860,7 +2948,7 @@ $PE_guielement_ext_colorpicker = "18 18";
                            Profile = "GuiInspectorSwatchButtonProfile";
                            HorizSizing = "left";
                            VertSizing = "bottom";
-                           position = "156 0";
+                           position = "80 0";
                            Extent = $PE_guielement_ext_colorpicker;
                            MinExtent = "8 2";
                            canSave = "1";
@@ -2874,6 +2962,90 @@ $PE_guielement_ext_colorpicker = "18 18";
                            arrayNum = "3";
                            class = "PE_ColorTintSwatch";
                         };
+                        new GuiSwatchButtonCtrl(PE_ColorTintSwatch4) {
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "GuiInspectorSwatchButtonProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = "100 0";
+                           Extent = $PE_guielement_ext_colorpicker;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "getColorF( PE_ParticleEditor.currParticle.colors[4], \"PE_ColorTintSwatch4.updateParticleColor\");";
+                           altCommand = "$ThisControl.updateParticleColor( $ThisControl.color );";
+                           hovertime = "1000";
+                           groupNum = "-1";
+                           buttonType = "PushButton";
+                           useMouseEvents = "1";
+                           arrayNum = "4";
+                           class = "PE_ColorTintSwatch";
+                        };
+                        new GuiSwatchButtonCtrl(PE_ColorTintSwatch5) {
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "GuiInspectorSwatchButtonProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = "120 0";
+                           Extent = $PE_guielement_ext_colorpicker;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "getColorF( PE_ParticleEditor.currParticle.colors[5], \"PE_ColorTintSwatch5.updateParticleColor\");";
+                           altCommand = "$ThisControl.updateParticleColor( $ThisControl.color );";
+                           hovertime = "1000";
+                           groupNum = "-1";
+                           buttonType = "PushButton";
+                           useMouseEvents = "1";
+                           arrayNum = "5";
+                           class = "PE_ColorTintSwatch";
+                        };
+                        new GuiSwatchButtonCtrl(PE_ColorTintSwatch6) {
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "GuiInspectorSwatchButtonProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = "140 0";
+                           Extent = $PE_guielement_ext_colorpicker;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "getColorF( PE_ParticleEditor.currParticle.colors[6], \"PE_ColorTintSwatch6.updateParticleColor\");";
+                           altCommand = "$ThisControl.updateParticleColor( $ThisControl.color );";
+                           hovertime = "1000";
+                           groupNum = "-1";
+                           buttonType = "PushButton";
+                           useMouseEvents = "1";
+                           arrayNum = "6";
+                           class = "PE_ColorTintSwatch";
+                        };
+                        new GuiSwatchButtonCtrl(PE_ColorTintSwatch7) {
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "GuiInspectorSwatchButtonProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = "160 0";
+                           Extent = $PE_guielement_ext_colorpicker;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "getColorF( PE_ParticleEditor.currParticle.colors[7], \"PE_ColorTintSwatch7.updateParticleColor\");";
+                           altCommand = "$ThisControl.updateParticleColor( $ThisControl.color );";
+                           hovertime = "1000";
+                           groupNum = "-1";
+                           buttonType = "PushButton";
+                           useMouseEvents = "1";
+                           arrayNum = "7";
+                           class = "PE_ColorTintSwatch";
+                        };
                      };
                      
                      new GuiControl(){ // Spacer ----------------------------
@@ -3072,6 +3244,194 @@ $PE_guielement_ext_colorpicker = "18 18";
                            altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[3]\", $ThisControl.getText());";
                         };
                      };
+                     new GuiControl(){ // Particle Point Size
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Size 5";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointSize_slider4";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 50";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"sizes[4]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[4]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointSize_textEdit4";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[4]\", $ThisControl.getText());";
+                        };
+					};
+                     new GuiControl(){ // Particle Point Size
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Size 6";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointSize_slider5";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 50";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"sizes[5]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[5]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointSize_textEdit5";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[5]\", $ThisControl.getText());";
+                        };
+					};
+					new GuiControl(){ // Particle Point Size
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Size 7";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointSize_slider6";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 50";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"sizes[6]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[6]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointSize_textEdit6";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[6]\", $ThisControl.getText());";
+                        };
+					};
+                     new GuiControl(){ // Particle Point Size
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Size 8";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointSize_slider7";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 50";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"sizes[7]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[7]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointSize_textEdit7";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"sizes[7]\", $ThisControl.getText());";
+                        };
+                     };
                      
                      new GuiControl(){ // Spacer ----------------------------
                         isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
@@ -3269,6 +3629,194 @@ $PE_guielement_ext_colorpicker = "18 18";
                            altCommand = "$ThisControl.setText(mClamp( $ThisControl.getValue(), 0.0, 1.0)); $ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[3]\", $ThisControl.getText());";
                         };
                      };
+                     new GuiControl(){ // Particle Point Time
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Time 5";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointTime_slider4";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 1";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"times[4]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[4]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointTime_textEdit4";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.setText(mClamp( $ThisControl.getValue(), 0.0, 1.0)); $ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[4]\", $ThisControl.getText());";
+                        };
+                     };
+                     new GuiControl(){ // Particle Point Time
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Time 6";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointTime_slider5";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 1";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"times[5]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[5]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointTime_textEdit5";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.setText(mClamp( $ThisControl.getValue(), 0.0, 1.0)); $ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[5]\", $ThisControl.getText());";
+                        };
+                     };
+                     new GuiControl(){ // Particle Point Time
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Time 7";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointTime_slider6";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 1";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"times[6]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[6]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointTime_textEdit6";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.setText(mClamp( $ThisControl.getValue(), 0.0, 1.0)); $ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[6]\", $ThisControl.getText());";
+                        };
+                     };
+                     new GuiControl(){ // Particle Point Time
+                        class = "AggregateControl";
+                        isContainer = "1";
+                        HorizSizing = "width";
+                        VertSizing = "bottom";
+                        Position = $PE_guielement_pos_single_container ;
+                        Extent = $PE_guielement_ext_single_container ;
+                        
+                        new GuiTextCtrl() {
+                           Profile = "ToolsGuiTextProfile";
+                           HorizSizing = "width";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_name;
+                           Extent = $PE_guielement_ext_name;
+                           text = "Time 8";
+                        };
+                        new GuiSliderCtrl() {
+                           internalName = "PEP_pointTime_slider7";
+                           canSaveDynamicFields = "0";
+                           Enabled = "1";
+                           isContainer = "0";
+                           Profile = "ToolsGuiSliderProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_slider;
+                           Extent = $PE_guielement_ext_slider;
+                           MinExtent = "8 2";
+                           canSave = "1";
+                           Visible = "1";
+                           Command = "";
+                           hovertime = "1000";
+                           range = "0 1";
+                           ticks = "0";
+                           value = "0";
+                           Command = "PE_ParticleEditor.updateParticle( \"times[7]\", $ThisControl.getValue(), true, true );";
+                           altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[7]\", $ThisControl.getValue(), true, false );";
+                        };
+                        new GuiTextEditCtrl() {
+                           internalName = "PEP_pointTime_textEdit7";
+                           Profile = "ToolsGuiTextEditProfile";
+                           HorizSizing = "left";
+                           VertSizing = "bottom";
+                           position = $PE_guielement_pos_value;
+                           Extent = $PE_guielement_ext_value;
+                           altCommand = "$ThisControl.setText(mClamp( $ThisControl.getValue(), 0.0, 1.0)); $ThisControl.getParent().updateFromChild($ThisControl); PE_ParticleEditor.updateParticle( \"times[7]\", $ThisControl.getText());";
+                        };
+                     };
                   }; // end stack
                }; // end "Overtime" rollout
             };// end stack "Particles"

Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.cs

@@ -71,6 +71,7 @@ function PE_EmitterEditor::guiSync( %this )
    PE_EmitterEditor-->PEE_orientParticles.setValue( %data.orientParticles );
    PE_EmitterEditor-->PEE_alignParticles.setValue( %data.alignParticles );
    PE_EmitterEditor-->PEE_alignDirection.setText( %data.alignDirection );
+   PE_EmitterEditor-->PEE_ribbonParticles.setValue( %data.ribbonParticles );
    
    PE_EmitterEditor-->PEE_thetaMin_slider.setValue( %data.thetaMin );
    PE_EmitterEditor-->PEE_thetaMin_textEdit.setText( %data.thetaMin );
@@ -78,6 +79,9 @@ function PE_EmitterEditor::guiSync( %this )
    PE_EmitterEditor-->PEE_thetaMax_slider.setValue( %data.thetaMax );
    PE_EmitterEditor-->PEE_thetaMax_textEdit.setText( %data.thetaMax );
    
+   PE_EmitterEditor-->PEE_thetaVar_slider.setValue( %data.thetaVariance );
+   PE_EmitterEditor-->PEE_thetaVar_textEdit.setText( %data.thetaVariance );
+   
    PE_EmitterEditor-->PEE_phiVariance_slider.setValue( %data.phiVariance );
    PE_EmitterEditor-->PEE_phiVariance_textEdit.setText( %data.phiVariance );
    

Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.cs

@@ -110,6 +110,10 @@ function PE_ParticleEditor::guiSync( %this )
    PE_ColorTintSwatch1.color = %data.colors[ 1 ];
    PE_ColorTintSwatch2.color = %data.colors[ 2 ];
    PE_ColorTintSwatch3.color = %data.colors[ 3 ];
+   PE_ColorTintSwatch4.color = %data.colors[ 4 ];
+   PE_ColorTintSwatch5.color = %data.colors[ 5 ];
+   PE_ColorTintSwatch6.color = %data.colors[ 6 ];
+   PE_ColorTintSwatch7.color = %data.colors[ 7 ];
    
    PE_ParticleEditor-->PEP_pointSize_slider0.setValue( %data.sizes[ 0 ] );
    PE_ParticleEditor-->PEP_pointSize_textEdit0.setText( %data.sizes[ 0 ] );
@@ -123,6 +127,18 @@ function PE_ParticleEditor::guiSync( %this )
    PE_ParticleEditor-->PEP_pointSize_slider3.setValue( %data.sizes[ 3 ] );
    PE_ParticleEditor-->PEP_pointSize_textEdit3.setText( %data.sizes[ 3 ] );
    
+   PE_ParticleEditor-->PEP_pointSize_slider4.setValue( %data.sizes[ 4 ] );
+   PE_ParticleEditor-->PEP_pointSize_textEdit4.setText( %data.sizes[ 4 ] );
+   
+   PE_ParticleEditor-->PEP_pointSize_slider5.setValue( %data.sizes[ 5 ] );
+   PE_ParticleEditor-->PEP_pointSize_textEdit5.setText( %data.sizes[ 5 ] );
+   
+   PE_ParticleEditor-->PEP_pointSize_slider6.setValue( %data.sizes[ 6 ] );
+   PE_ParticleEditor-->PEP_pointSize_textEdit6.setText( %data.sizes[ 6 ] );
+   
+   PE_ParticleEditor-->PEP_pointSize_slider7.setValue( %data.sizes[ 7 ] );
+   PE_ParticleEditor-->PEP_pointSize_textEdit7.setText( %data.sizes[ 7 ] );
+   
    PE_ParticleEditor-->PEP_pointTime_slider0.setValue( %data.times[ 0 ] );
    PE_ParticleEditor-->PEP_pointTime_textEdit0.setText( %data.times[ 0 ] );
    
@@ -134,6 +150,18 @@ function PE_ParticleEditor::guiSync( %this )
    
    PE_ParticleEditor-->PEP_pointTime_slider3.setValue( %data.times[ 3 ] );
    PE_ParticleEditor-->PEP_pointTime_textEdit3.setText( %data.times[ 3 ] );
+
+   PE_ParticleEditor-->PEP_pointTime_slider4.setValue( %data.times[ 4 ] );
+   PE_ParticleEditor-->PEP_pointTime_textEdit4.setText( %data.times[ 4 ] );
+   
+   PE_ParticleEditor-->PEP_pointTime_slider5.setValue( %data.times[ 5 ] );
+   PE_ParticleEditor-->PEP_pointTime_textEdit5.setText( %data.times[ 5 ] );
+   
+   PE_ParticleEditor-->PEP_pointTime_slider6.setValue( %data.times[ 6 ] );
+   PE_ParticleEditor-->PEP_pointTime_textEdit6.setText( %data.times[ 6 ] );
+   
+   PE_ParticleEditor-->PEP_pointTime_slider7.setValue( %data.times[ 7 ] );
+   PE_ParticleEditor-->PEP_pointTime_textEdit7.setText( %data.times[ 7 ] );   
    
    //particle animation
    PE_ParticleEditor-->PEP_animateTexture.setValue( %data.animateTexture );