1.1.5.4

jrbudda · Oct 16, 2018 · b96e997 · b96e997
1 parent e4d8370
commit b96e997
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 17 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,9 @@
+1.1.5.4, 2018-10-15, KSP 1.5.0 #2332
+ - Version bump for 1.5.0
+ - VAB bottom overlay respects KER Gui Size setting
+ - VAB bottom overlay can be moved left and right in the setting menu
+ - Minor bugfixes
+
 1.1.5.3, 2018-7-27, KSP 1.4.5 #2243
  - Total overhaul of impact and suicide burn calculations.
  - Added impact marker to map and flight view. Toggleable via the Impact Marker readout button.

diff --git a/KerbalEngineer/Editor/BuildAdvanced.cs b/KerbalEngineer/Editor/BuildAdvanced.cs
@@ -573,6 +573,22 @@ private void DrawSettings()
             }
             GUILayout.EndHorizontal();
 
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("VAB Overlay X Pos.: " + BuildOverlay.BuildOverlayVessel.WindowX, settingStyle);
+            if (GUILayout.Button("<<", buttonStyle, GUILayout.Width(50 * GuiDisplaySize.Offset))) {
+                BuildOverlay.BuildOverlayVessel.WindowX-=10;
+            }
+            if (GUILayout.Button("<", buttonStyle, GUILayout.Width(50 * GuiDisplaySize.Offset))) {
+                BuildOverlay.BuildOverlayVessel.WindowX--;
+            }
+            if (GUILayout.Button(">", buttonStyle, GUILayout.Width(50 * GuiDisplaySize.Offset))) {
+                BuildOverlay.BuildOverlayVessel.WindowX++;
+            }
+            if (GUILayout.Button(">>", buttonStyle, GUILayout.Width(50 * GuiDisplaySize.Offset))) {
+                BuildOverlay.BuildOverlayVessel.WindowX+=10;
+            }
+            GUILayout.EndHorizontal();
+
             GUILayout.Label("Minimum delay between simulations: " + SimManager.minSimTime.TotalMilliseconds + "ms", settingStyle);
             GUI.skin = HighLogic.Skin;
             SimManager.minSimTime = TimeSpan.FromMilliseconds(GUILayout.HorizontalSlider((float)SimManager.minSimTime.TotalMilliseconds, 0, 2000.0f));

diff --git a/KerbalEngineer/Editor/BuildOverlay.cs b/KerbalEngineer/Editor/BuildOverlay.cs
@@ -81,13 +81,13 @@ public static GUIStyle NameStyle
         {
             get
             {
-                return nameStyle ?? (nameStyle = new GUIStyle
+                return (nameStyle !=null && !hasChanged) ? nameStyle : (nameStyle = new GUIStyle
                 {
                     normal =
                     {
                         textColor = Color.white
                     },
-                    fontSize = 11,
+                    fontSize = (int)(11 * GuiDisplaySize.Offset),
                     fontStyle = FontStyle.Bold,
                     alignment = TextAnchor.UpperLeft,
                     stretchWidth = true
@@ -105,7 +105,7 @@ public static GUIStyle TabStyle
         {
             get
             {
-                return tabStyle ?? (tabStyle = new GUIStyle
+                return (tabStyle !=null & !hasChanged) ? tabStyle : (tabStyle = new GUIStyle
                 {
                     normal =
                     {
@@ -128,7 +128,7 @@ public static GUIStyle TabStyle
                         textColor = Color.yellow
                     },
                     padding = new RectOffset(20, 20, 0, 0),
-                    fontSize = 11,
+                    fontSize = (int)(11 * GuiDisplaySize.Offset),
                     fontStyle = FontStyle.Bold,
                     alignment = TextAnchor.MiddleCenter,
                     fixedHeight = 15.0f,
@@ -141,30 +141,36 @@ public static GUIStyle TitleStyle
         {
             get
             {
-                return titleStyle ?? (titleStyle = new GUIStyle
+                return (titleStyle != null && !hasChanged ) ? titleStyle : (titleStyle = new GUIStyle
                 {
                     normal =
                     {
                         textColor = Color.yellow
                     },
-                    fontSize = 11,
+                    fontSize = (int)(11 * GuiDisplaySize.Offset),
                     fontStyle = FontStyle.Bold,
                     stretchWidth = true
                 });
             }
         }
 
+        private static bool hasChanged;
+
+        protected void OnGUI() {
+           // hasChanged = false;
+        }
+
         public static GUIStyle ValueStyle
         {
             get
             {
-                return valueStyle ?? (valueStyle = new GUIStyle
+                return (valueStyle !=null && !hasChanged) ? valueStyle : (valueStyle = new GUIStyle
                 {
                     normal =
                     {
                         textColor = Color.white
                     },
-                    fontSize = 11,
+                    fontSize = (int)(11 * GuiDisplaySize.Offset),
                     fontStyle = FontStyle.Normal,
                     alignment = TextAnchor.UpperRight,
                     stretchWidth = true
@@ -235,13 +241,18 @@ protected void Awake()
                 buildOverlayVessel = this.gameObject.AddComponent<BuildOverlayVessel>();
                 buildOverlayResources = this.gameObject.AddComponent<BuildOverlayResources>();
                 Load();
+                GuiDisplaySize.OnSizeChanged += OnSizeChanged;
             }
             catch (Exception ex)
             {
                 MyLogger.Exception(ex);
             }
         }
 
+        private void OnSizeChanged() {
+            hasChanged = true;
+        }
+
         protected void OnDestroy()
         {
             try
@@ -259,6 +270,7 @@ protected void OnDestroy()
                 {
                     Destroy(buildOverlayResources);
                 }
+                GuiDisplaySize.OnSizeChanged -= OnSizeChanged;
             }
             catch (Exception ex)
             {

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.5.3";
+        public const string ASSEMBLY_VERSION = "1.1.5.4";
 
         private static string assemblyFile;
         private static string assemblyName;

diff --git a/KerbalEngineer/Flight/Readouts/Rendezvous/RendezvousProcessor.cs b/KerbalEngineer/Flight/Readouts/Rendezvous/RendezvousProcessor.cs
@@ -263,7 +263,6 @@ public void Update() {
                     vessel = TrackingStationSource.GetVessel();
                 else
                     TrackingStationSource = target;
-
             }
 
             activeTarget = target;
@@ -312,8 +311,7 @@ public void Update() {
                 targetOrbit = actualTargetOrbit;
                 originOrbit = null;
             }
-
-
+
             { //These are not 'rendezvous' calculations, just raw data about the target object.
                 AltitudeSeaLevel = targetOrbit.altitude;
                 ApoapsisHeight = targetOrbit.ApA;

diff --git a/KerbalEngineer/Flight/Readouts/Surface/ImpactProcessor.cs b/KerbalEngineer/Flight/Readouts/Surface/ImpactProcessor.cs
@@ -435,7 +435,7 @@ private double getBrakingDistanceForDT(global::Vessel vessel, double t, Celestia
         public static bool ShowMarker = true;
 
         public static void drawImpact(Color color) {
-            if (ShowDetails && ShowMarker)
+            if (ShowDetails && ShowMarker && FlightGlobals.fetch !=null && FlightGlobals.ActiveVessel != null && FlightGlobals.ActiveVessel.mainBody != null )
                 Drawing.DebugDrawing.DrawGroundMarker(FlightGlobals.ActiveVessel.mainBody, Latitude, Longitude, color, MapView.MapIsEnabled, 0, 0);
         }
 

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,13 +7,13 @@
 		"MAJOR":1,
 		"MINOR":1,
 		"PATCH":5,
-		"BUILD":3
+		"BUILD":4
 	},
 	"KSP_VERSION":
 	{
 		"MAJOR":1,
-		"MINOR":4,
-		"PATCH":5
+		"MINOR":5,
+		"PATCH":0
 	},
 	"KSP_VERSION_MIN":
 	{
@@ -24,7 +24,7 @@
 	"KSP_VERSION_MAX":
 	{
 		"MAJOR":1,
-		"MINOR":4,
+		"MINOR":5,
 		"PATCH":9
 	}
 }