1171

jrbudda · Oct 18, 2019 · ab684cb · ab684cb
1 parent 986e407
commit ab684cb
Show file tree

Hide file tree

Showing 12 changed files with 177 additions and 157 deletions.
diff --git a/Assets/Plugins/KerbalEngineer.Unity.dll b/Assets/Plugins/KerbalEngineer.Unity.dll
diff --git a/Documents/CHANGES.txt b/Documents/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.7.1, 2019-10-18, KSP 1.8.0 #2686
+ - Fix impact marker rendering.
+ - Further improvements to handling old xml settings.
+
 1.1.7.0, 2019-10-16, KSP 1.8.0 #2686
  - Update to KSP 1.8, target .NET 4.
  - Fix readout colors reverting to default on GUI size change.

diff --git a/KerbalEngineer.dll b/KerbalEngineer.dll
diff --git a/KerbalEngineer/Drawing/DebugDrawing.cs b/KerbalEngineer/Drawing/DebugDrawing.cs
@@ -10,8 +10,9 @@ class DebugDrawing {
 
         static Material _material;
         static Material material {
-            get {
-                if (_material == null) _material = new Material(Shader.Find("Particles/Additive"));
+            get
+            {
+                if (_material == null) _material = new Material(Shader.Find("Legacy Shaders/Particles/Additive"));
                 return _material;
             }
         }

diff --git a/KerbalEngineer/EngineerGlobals.cs b/KerbalEngineer/EngineerGlobals.cs
@@ -21,7 +21,7 @@ public static class EngineerGlobals
         /// <summary>
         /// Current version of the Kerbal Engineer assembly.
         /// </summary>
-        public const string ASSEMBLY_VERSION = "1.1.7.0";
+        public const string ASSEMBLY_VERSION = "1.1.7.1";
 
         private static string assemblyFile;
         private static string assemblyName;

diff --git a/KerbalEngineer/Flight/FlightEngineerCore.cs b/KerbalEngineer/Flight/FlightEngineerCore.cs
@@ -313,11 +313,11 @@ void OnRenderObject() {
         private void Start() {
             try {
                 SectionLibrary.Load();
-                ReadoutLibrary.Reset();
-                MyLogger.Log("FlightEngineerCore->Start");
             } catch (Exception ex) {
                 MyLogger.Exception(ex);
             }
+            ReadoutLibrary.Reset();
+            MyLogger.Log("FlightEngineerCore->Start");
         }
 
         /// <summary>

diff --git a/KerbalEngineer/Flight/Readouts/Miscellaneous/Separator.cs b/KerbalEngineer/Flight/Readouts/Miscellaneous/Separator.cs
@@ -60,7 +60,7 @@ public Separator()
 
         public override void Draw(Unity.Flight.ISectionModule section)
         {
-            GUILayout.Box("WHY THO", section.IsHud ? this.boxStyleHud : this.boxStyle);
+            GUILayout.Box("", section.IsHud ? this.boxStyleHud : this.boxStyle);
         }
 
         #endregion

diff --git a/KerbalEngineer/Settings/SettingHandler.cs b/KerbalEngineer/Settings/SettingHandler.cs
@@ -25,6 +25,7 @@
 using System.Linq;
 using System.Xml;
 using System.Xml.Serialization;
+using KSP.UI.Screens;
 
 #endregion
 
@@ -200,7 +201,6 @@ public T GetSet<T>(string name, T defaultObject)
         public void Save(string fileName)
         {
             fileName = Path.Combine(settingsDirectory, fileName);
-
             this.Serialise(fileName);
         }
 
@@ -227,6 +227,11 @@ private void Serialise(string fileName)
         {
             this.CreateDirectory(fileName);
 
+            //foreach (var i in Items)
+            //{
+            //    MyLogger.Log("Name " + i.Name + " value " + i.Value.GetType());
+            //}
+
             XmlWriterSettings xmlWriterSettings = new XmlWriterSettings {
                 Encoding = System.Text.Encoding.UTF8,
                 Indent = true              
@@ -281,7 +286,17 @@ public static SettingHandler Load(string fileName, Type[] extraTypes = null)
         {
             fileName = Path.Combine(settingsDirectory, fileName);
 
-            return Deserialise(fileName, extraTypes);
+            var items = Deserialise(fileName, extraTypes);
+
+            for (var i = items.Items.Count - 1; i >= 0; i--) {
+                if (items.Items[i].Value is XmlNode[])
+                {
+                    MyLogger.Log("fixed old or invalid setting: " + items.Items[i].Name);
+                    items.Items[i].Value = items.Items[i].Value.ToString();
+                }
+            }
+
+            return items;
         }
 
         #endregion

diff --git a/Output/KerbalEngineer/KerbalEngineer.Unity.dll b/Output/KerbalEngineer/KerbalEngineer.Unity.dll
diff --git a/Output/KerbalEngineer/KerbalEngineer.dll b/Output/KerbalEngineer/KerbalEngineer.dll
diff --git a/Output/KerbalEngineer/KerbalEngineer.version b/Output/KerbalEngineer/KerbalEngineer.version
@@ -7,7 +7,7 @@
 		"MAJOR":1,
 		"MINOR":1,
 		"PATCH":7,
-		"BUILD":0
+		"BUILD":1
 	},
 	"KSP_VERSION":
 	{

diff --git a/Output/KerbalEngineer/Settings/HelpStrings.xml b/Output/KerbalEngineer/Settings/HelpStrings.xml