From 41ff93461691be75a324933f08127bc49ecac3e4 Mon Sep 17 00:00:00 2001 From: Daniel Walder Date: Mon, 30 Dec 2013 10:56:48 +1000 Subject: [PATCH] 0.1.0.16 --- Sledge.Editor/Milestones.txt | 7 ++++ Sledge.Editor/Properties/AssemblyInfo.cs | 4 +- .../Settings/SettingsForm.Designer.cs | 40 +++++++++---------- Sledge.Providers/Model/MdlProvider.cs | 2 +- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Sledge.Editor/Milestones.txt b/Sledge.Editor/Milestones.txt index f43a255db..d64f4c7c0 100644 --- a/Sledge.Editor/Milestones.txt +++ b/Sledge.Editor/Milestones.txt @@ -34,6 +34,13 @@ Post-Alpha Animation? Fix rotations Set angles value on rotate/transform + Helpers + Entity text labels (2D) + Box dimension labels (2D) + Tools + Select tool + Advanced manipulator (3D) + 1. Goldsource Support Formats diff --git a/Sledge.Editor/Properties/AssemblyInfo.cs b/Sledge.Editor/Properties/AssemblyInfo.cs index f85c64bdd..a4413bed8 100644 --- a/Sledge.Editor/Properties/AssemblyInfo.cs +++ b/Sledge.Editor/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.0.15")] -[assembly: AssemblyFileVersion("0.1.0.15")] +[assembly: AssemblyVersion("0.1.0.16")] +[assembly: AssemblyFileVersion("0.1.0.16")] diff --git a/Sledge.Editor/Settings/SettingsForm.Designer.cs b/Sledge.Editor/Settings/SettingsForm.Designer.cs index cf7152e0e..495b7f563 100644 --- a/Sledge.Editor/Settings/SettingsForm.Designer.cs +++ b/Sledge.Editor/Settings/SettingsForm.Designer.cs @@ -115,6 +115,8 @@ private void InitializeComponent() this.DefaultGridSize = new System.Windows.Forms.DomainUpDown(); this.tab3DViews = new System.Windows.Forms.TabPage(); this.groupBox12 = new System.Windows.Forms.GroupBox(); + this.label39 = new System.Windows.Forms.Label(); + this.ViewportBackgroundColour = new System.Windows.Forms.Panel(); this.CameraFOV = new System.Windows.Forms.NumericUpDown(); this.label29 = new System.Windows.Forms.Label(); this.groupBox13 = new System.Windows.Forms.GroupBox(); @@ -294,8 +296,6 @@ private void InitializeComponent() this.btnCancelSettings = new System.Windows.Forms.Button(); this.btnApplyAndCloseSettings = new System.Windows.Forms.Button(); this.btnApplySettings = new System.Windows.Forms.Button(); - this.label39 = new System.Windows.Forms.Label(); - this.ViewportBackgroundColour = new System.Windows.Forms.Panel(); this.tbcSettings.SuspendLayout(); this.tabGeneral.SuspendLayout(); this.groupBox20.SuspendLayout(); @@ -463,7 +463,7 @@ private void InitializeComponent() this.RenderMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.RenderMode.FormattingEnabled = true; this.RenderMode.Items.AddRange(new object[] { - "OpenGL 3.0 (Fastest, requires compatible GPU)", + "OpenGL 2.1 (Fastest, requires compatible GPU)", "OpenGL 1.0 Display Lists (Should work for most GPUs)", "OpenGL 1.0 Immediate (Slow, most compatible)"}); this.RenderMode.Location = new System.Drawing.Point(72, 16); @@ -1287,6 +1287,23 @@ private void InitializeComponent() this.groupBox12.TabStop = false; this.groupBox12.Text = "General"; // + // label39 + // + this.label39.Location = new System.Drawing.Point(12, 46); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(74, 17); + this.label39.TabIndex = 3; + this.label39.Text = "Background:"; + // + // ViewportBackgroundColour + // + this.ViewportBackgroundColour.BackColor = System.Drawing.Color.Black; + this.ViewportBackgroundColour.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.ViewportBackgroundColour.Location = new System.Drawing.Point(92, 46); + this.ViewportBackgroundColour.Name = "ViewportBackgroundColour"; + this.ViewportBackgroundColour.Size = new System.Drawing.Size(51, 17); + this.ViewportBackgroundColour.TabIndex = 4; + // // CameraFOV // this.CameraFOV.Location = new System.Drawing.Point(92, 20); @@ -3206,23 +3223,6 @@ private void InitializeComponent() this.btnApplySettings.UseVisualStyleBackColor = true; this.btnApplySettings.Click += new System.EventHandler(this.Apply); // - // label39 - // - this.label39.Location = new System.Drawing.Point(12, 46); - this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(74, 17); - this.label39.TabIndex = 3; - this.label39.Text = "Background:"; - // - // ViewportBackgroundColour - // - this.ViewportBackgroundColour.BackColor = System.Drawing.Color.Black; - this.ViewportBackgroundColour.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.ViewportBackgroundColour.Location = new System.Drawing.Point(92, 46); - this.ViewportBackgroundColour.Name = "ViewportBackgroundColour"; - this.ViewportBackgroundColour.Size = new System.Drawing.Size(51, 17); - this.ViewportBackgroundColour.TabIndex = 4; - // // SettingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Sledge.Providers/Model/MdlProvider.cs b/Sledge.Providers/Model/MdlProvider.cs index 6d6e6edfa..6f1dde331 100644 --- a/Sledge.Providers/Model/MdlProvider.cs +++ b/Sledge.Providers/Model/MdlProvider.cs @@ -677,7 +677,7 @@ private static void ReadAnimationGoldsource(BinaryReader br, DataStructures.Mode for (var i = 0; i < 6; i++) // For each offset [X, Y, Z, XR, YR, ZR] { - if (offsets[i] == 0) continue; + if (offsets[i] <= 0) continue; br.BaseStream.Position = offsetPos + offsets[i]; var values = ReadRLEEncodedAnimationFrameValues(br, numframes); for (var f = 0; f < numframes; f++)