diff --git a/Build/Configurations/Includes/Hexen_linedefs.cfg b/Build/Configurations/Includes/Hexen_linedefs.cfg index 28c82e19..c0e202ba 100644 --- a/Build/Configurations/Includes/Hexen_linedefs.cfg +++ b/Build/Configurations/Includes/Hexen_linedefs.cfg @@ -1196,13 +1196,13 @@ teleport arg0 { - title = "Target MapSpot Tag (0=ignore)"; + title = "Target MapSpot Tag"; type = 14; } arg1 { - title = "Target Sector Tag (0=ignore)"; + title = "Target Sector Tag"; type = 13; } } @@ -1213,7 +1213,7 @@ teleport arg0 { - title = "Target MapSpot Tag (0=ignore)"; + title = "Target MapSpot Tag"; type = 14; } @@ -1226,7 +1226,7 @@ teleport arg2 { - title = "Target Sector Tag (0=ignore)"; + title = "Target Sector Tag"; type = 13; } } diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg index 8af486e8..48dcbb8f 100644 --- a/Build/Configurations/Includes/ZDoom_linedefs.cfg +++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg @@ -1807,12 +1807,12 @@ zdoom arg0 { - title = "Thing ID"; + title = "Thing Tag"; type = 14; } arg1 { - title = "Target Thing ID"; + title = "Target Thing Tag"; type = 14; } arg2 @@ -1828,17 +1828,17 @@ zdoom arg0 { - title = "Group Thing ID"; + title = "Group Thing Tag"; type = 14; } arg1 { - title = "Source Thing ID"; + title = "Source Thing Tag"; type = 14; } arg2 { - title = "Target Thing ID"; + title = "Target Thing Tag"; type = 14; } arg3 @@ -1865,12 +1865,12 @@ zdoom } arg1 { - title = "Source Thing ID"; + title = "Source Thing Tag"; type = 14; } arg2 { - title = "Target Thing ID"; + title = "Target Thing Tag"; type = 14; } arg3 @@ -1881,7 +1881,7 @@ zdoom } arg4 { - title = "Group Thing ID"; + title = "Group Thing Tag"; type = 14; } } diff --git a/Build/Configurations/Includes/ZDoom_sectors.cfg b/Build/Configurations/Includes/ZDoom_sectors.cfg index f407b2d8..03bda334 100644 --- a/Build/Configurations/Includes/ZDoom_sectors.cfg +++ b/Build/Configurations/Includes/ZDoom_sectors.cfg @@ -35,7 +35,7 @@ zdoom 65 = "Light Flicker"; 66 = "Light Strobe Fast"; 67 = "Light Strobe Slow"; - 68 = "Light Strobe Hurt -20% health (~2% chance protection fails)"; + 68 = "Light Strobe Hurt -20% health"; 69 = "Damage Hellslime -10% health"; 71 = "Damage Nukage -5% health"; 72 = "Light Glow"; @@ -45,7 +45,7 @@ zdoom 77 = "Light StrobeFastSync"; 78 = "Sector Door Raise (5 min)"; 79 = "Low Friction"; - 80 = "Damage Super Hellslime -20% health (~2% chance protection fails)"; + 80 = "Damage Super Hellslime -20% health"; 81 = "Light Fire Flicker"; 82 = "Damage -5% health (no protection)"; 83 = "Damage -8% health (no protection)"; diff --git a/Source/Core/Controls/SectorInfoPanel.Designer.cs b/Source/Core/Controls/SectorInfoPanel.Designer.cs index 66778d71..da200e17 100644 --- a/Source/Core/Controls/SectorInfoPanel.Designer.cs +++ b/Source/Core/Controls/SectorInfoPanel.Designer.cs @@ -93,7 +93,7 @@ namespace CodeImp.DoomBuilder.Controls // // label13 // - label13.Location = new System.Drawing.Point(103, 79); + label13.Location = new System.Drawing.Point(183, 64); label13.Name = "label13"; label13.Size = new System.Drawing.Size(70, 14); label13.TabIndex = 14; @@ -238,7 +238,7 @@ namespace CodeImp.DoomBuilder.Controls this.sectorinfo.Location = new System.Drawing.Point(0, 0); this.sectorinfo.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.sectorinfo.Name = "sectorinfo"; - this.sectorinfo.Size = new System.Drawing.Size(220, 100); + this.sectorinfo.Size = new System.Drawing.Size(300, 100); this.sectorinfo.TabIndex = 2; this.sectorinfo.TabStop = false; this.sectorinfo.Text = " Sector "; @@ -246,7 +246,7 @@ namespace CodeImp.DoomBuilder.Controls // panelFadeColor // this.panelFadeColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panelFadeColor.Location = new System.Drawing.Point(180, 65); + this.panelFadeColor.Location = new System.Drawing.Point(260, 50); this.panelFadeColor.Name = "panelFadeColor"; this.panelFadeColor.Size = new System.Drawing.Size(20, 12); this.panelFadeColor.TabIndex = 21; @@ -254,14 +254,14 @@ namespace CodeImp.DoomBuilder.Controls // panelLightColor // this.panelLightColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panelLightColor.Location = new System.Drawing.Point(180, 50); + this.panelLightColor.Location = new System.Drawing.Point(260, 35); this.panelLightColor.Name = "panelLightColor"; this.panelLightColor.Size = new System.Drawing.Size(20, 12); this.panelLightColor.TabIndex = 20; // // labelFade // - this.labelFade.Location = new System.Drawing.Point(103, 64); + this.labelFade.Location = new System.Drawing.Point(183, 49); this.labelFade.Name = "labelFade"; this.labelFade.Size = new System.Drawing.Size(70, 14); this.labelFade.TabIndex = 19; @@ -270,7 +270,7 @@ namespace CodeImp.DoomBuilder.Controls // // labelLight // - this.labelLight.Location = new System.Drawing.Point(103, 49); + this.labelLight.Location = new System.Drawing.Point(183, 34); this.labelLight.Name = "labelLight"; this.labelLight.Size = new System.Drawing.Size(70, 14); this.labelLight.TabIndex = 18; @@ -279,7 +279,7 @@ namespace CodeImp.DoomBuilder.Controls // // brightness // - this.brightness.Location = new System.Drawing.Point(177, 79); + this.brightness.Location = new System.Drawing.Point(257, 64); this.brightness.Name = "brightness"; this.brightness.Size = new System.Drawing.Size(38, 14); this.brightness.TabIndex = 17; @@ -297,7 +297,7 @@ namespace CodeImp.DoomBuilder.Controls // this.tag.Location = new System.Drawing.Point(55, 79); this.tag.Name = "tag"; - this.tag.Size = new System.Drawing.Size(42, 14); + this.tag.Size = new System.Drawing.Size(239, 14); this.tag.TabIndex = 7; this.tag.Text = "0"; // @@ -363,7 +363,7 @@ namespace CodeImp.DoomBuilder.Controls this.ceilingpanel.Controls.Add(this.ceilingInfo); this.ceilingpanel.Controls.Add(this.ceilingname); this.ceilingpanel.Controls.Add(this.ceilingtex); - this.ceilingpanel.Location = new System.Drawing.Point(426, 0); + this.ceilingpanel.Location = new System.Drawing.Point(506, 0); this.ceilingpanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.ceilingpanel.Name = "ceilingpanel"; this.ceilingpanel.Size = new System.Drawing.Size(200, 100); @@ -424,7 +424,7 @@ namespace CodeImp.DoomBuilder.Controls this.floorpanel.Controls.Add(this.floorInfo); this.floorpanel.Controls.Add(this.floorname); this.floorpanel.Controls.Add(this.floortex); - this.floorpanel.Location = new System.Drawing.Point(223, 0); + this.floorpanel.Location = new System.Drawing.Point(303, 0); this.floorpanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.floorpanel.Name = "floorpanel"; this.floorpanel.Size = new System.Drawing.Size(200, 100); @@ -528,7 +528,7 @@ namespace CodeImp.DoomBuilder.Controls // flagsPanel // this.flagsPanel.Controls.Add(this.flags); - this.flagsPanel.Location = new System.Drawing.Point(629, 0); + this.flagsPanel.Location = new System.Drawing.Point(709, 0); this.flagsPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.flagsPanel.Name = "flagsPanel"; this.flagsPanel.Size = new System.Drawing.Size(455, 100); @@ -560,7 +560,7 @@ namespace CodeImp.DoomBuilder.Controls this.MaximumSize = new System.Drawing.Size(10000, 100); this.MinimumSize = new System.Drawing.Size(100, 100); this.Name = "SectorInfoPanel"; - this.Size = new System.Drawing.Size(1090, 100); + this.Size = new System.Drawing.Size(1400, 100); this.sectorinfo.ResumeLayout(false); this.sectorinfo.PerformLayout(); this.ceilingpanel.ResumeLayout(false); diff --git a/Source/Core/Windows/FlagsForm.cs b/Source/Core/Windows/FlagsForm.cs index 09389f52..0a0875d0 100644 --- a/Source/Core/Windows/FlagsForm.cs +++ b/Source/Core/Windows/FlagsForm.cs @@ -92,7 +92,7 @@ namespace CodeImp.DoomBuilder.Windows if (lf.Value == c.Text) { if (value != "") value += ","; - value += lf.Key.ToString(); + value += lf.Key; } } } diff --git a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs index 44377933..1f1f0d8f 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs @@ -363,7 +363,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Render selection if(renderer.StartOverlay(true)) { - if (!panning) { //mxd + if(!panning && !selecting) { //mxd for (int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]); if ((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd } @@ -570,6 +570,10 @@ namespace CodeImp.DoomBuilder.BuilderModes //render preview if(renderer.StartOverlay(true)) { + if(!panning) { + for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]); + if((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd + } float dist = Math.Min(Vector2D.Distance(mousemappos, insertPreview), BuilderPlug.Me.SplitLinedefsRange); byte alpha = (byte)(255 - (dist / BuilderPlug.Me.SplitLinedefsRange) * 128); float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale; @@ -582,6 +586,10 @@ namespace CodeImp.DoomBuilder.BuilderModes //undraw preveiw if(renderer.StartOverlay(true)) { + if(!panning) { + for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.Me.RenderAssociations(renderer, association[i]); + if((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.Me.RenderReverseAssociations(renderer, highlightasso); //mxd + } renderer.Finish(); renderer.Present(); }