diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index 38cb2a3102c90cab37b1a0d83a707b3dd6bbebe1..75013de54b0525eca0ebc696438f4176a8b33471 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.2934")] +[assembly: AssemblyVersion("2.3.0.2936")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("4611aa1")] +[assembly: AssemblyHash("d8701b7")] diff --git a/Source/Core/Resources/UDMF_UI.cfg b/Source/Core/Resources/UDMF_UI.cfg index 1e266f3657d990c9a10808532c3f7c6954ffe654..dd5d7a0531e10d58f788f651fe1be6941623a42c 100755 --- a/Source/Core/Resources/UDMF_UI.cfg +++ b/Source/Core/Resources/UDMF_UI.cfg @@ -73,11 +73,11 @@ uifields ceilingglowcolor = 0; ceilingglowheight = 1; fogdensity = 0; - color_ceiling = 0; - color_walltop = 0; - color_things = 0; - color_wallbottom = 0; - color_floor = 0; + color_ceiling = 0; + color_walltop = 0; + color_sprites = 0; + color_wallbottom = 0; + color_floor = 0; } thing diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs index 4883826bcc48d2886c57cbe3066a1d0c76aa9ea3..6ed55d71ea94c4a331a705bf90ae8c0aef399724 100755 --- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs @@ -761,7 +761,7 @@ this.groupBox11.Size = new System.Drawing.Size(281, 85); this.groupBox11.TabIndex = 20; this.groupBox11.TabStop = false; - this.groupBox11.Text = " "; + this.groupBox11.Text = " "; // // floorGlowEnabled // @@ -947,7 +947,7 @@ // thingsColor // this.thingsColor.DefaultValue = 16777215; - this.thingsColor.Field = "color_things"; + this.thingsColor.Field = "color_sprites"; this.thingsColor.Label = "Things:"; this.thingsColor.Location = new System.Drawing.Point(6, 89); this.thingsColor.Name = "thingsColor"; @@ -1214,7 +1214,7 @@ // // floorAngleControl // - this.floorAngleControl.Angle = -1440; + this.floorAngleControl.Angle = -1530; this.floorAngleControl.AngleOffset = 90; this.floorAngleControl.DoomAngleClamping = false; this.floorAngleControl.Location = new System.Drawing.Point(6, 156); @@ -1511,7 +1511,7 @@ // // ceilAngleControl // - this.ceilAngleControl.Angle = -1440; + this.ceilAngleControl.Angle = -1530; this.ceilAngleControl.AngleOffset = 90; this.ceilAngleControl.DoomAngleClamping = false; this.ceilAngleControl.Location = new System.Drawing.Point(6, 156); diff --git a/Source/Core/Windows/SectorEditFormUDMF.cs b/Source/Core/Windows/SectorEditFormUDMF.cs index 15c072f6540e7a5d02f96712af7ad1100fd2562c..4bc261650c32f7dbbb566dcc8c6b9e0231d5f692 100755 --- a/Source/Core/Windows/SectorEditFormUDMF.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.cs @@ -171,7 +171,7 @@ namespace CodeImp.DoomBuilder.Windows D64ColorCeiling = s.Fields.GetValue("color_ceiling", PixelColor.INT_WHITE_NO_ALPHA); D64ColorWallTop = s.Fields.GetValue("color_walltop", PixelColor.INT_WHITE_NO_ALPHA); - D64ColorThings = s.Fields.GetValue("color_things", PixelColor.INT_WHITE_NO_ALPHA); + D64ColorThings = s.Fields.GetValue("color_sprites", PixelColor.INT_WHITE_NO_ALPHA); D64ColorWallBottom = s.Fields.GetValue("color_wallbottom", PixelColor.INT_WHITE_NO_ALPHA); D64ColorFloor = s.Fields.GetValue("color_floor", PixelColor.INT_WHITE_NO_ALPHA); } @@ -2084,7 +2084,7 @@ namespace CodeImp.DoomBuilder.Windows case "color_walltop": prevv = props.D64ColorWallTop; break; - case "color_things": + case "color_sprites": prevv = props.D64ColorThings; break; case "color_wallbottom": diff --git a/Source/Core/Windows/SectorEditFormUDMF.resx b/Source/Core/Windows/SectorEditFormUDMF.resx index f14d95d311d171676a3fd9a83736cc5c70ab8219..43411e0ea4194ac866bd4832d7d1de93589ed10d 100755 --- a/Source/Core/Windows/SectorEditFormUDMF.resx +++ b/Source/Core/Windows/SectorEditFormUDMF.resx @@ -126,21 +126,6 @@ <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> - <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> - <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> - <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> - <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> - <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> @@ -202,15 +187,6 @@ of a light level of 250, and 255 equalling the density of a light level of 0.</v <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> - <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> - <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> - <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </metadata> <metadata name="label17.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> @@ -229,9 +205,6 @@ of a light level of 250, and 255 equalling the density of a light level of 0.</v <metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <data name="resetdamagetype.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -420,4 +393,7 @@ of a light level of 250, and 255 equalling the density of a light level of 0.</v wV9YIWQTOVB9AON4z29oMNkJAAAAAElFTkSuQmCC </value> </data> + <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> </root> \ No newline at end of file diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index 5f1bf79147ea3f88ede3966715791dd5c448e831..d37e6e2b1fc1508b9c9f106f38fcc6168838b649 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.2934")] +[assembly: AssemblyVersion("2.3.0.2936")] [assembly: NeutralResourcesLanguageAttribute("en")]