Merge 2.8.1.0 to master

TriggerAu · Jun 13, 2016 · ba4eb7a · ba4eb7a
2 parents 5f75a6b + cd5747d
commit ba4eb7a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/AlternateResourcePanel/ARP.cs b/AlternateResourcePanel/ARP.cs
@@ -612,7 +612,7 @@ internal override void RepeatingWorker()
                         }
 
                         //Update the whole vessel list
-                        lstResourcesVesselPerStage[p.DecoupledAt().Clamp(1, StageManager.StageCount)].UpdateResource(pr);
+                        lstResourcesVesselPerStage[p.DecoupledAt().Clamp(0, StageManager.StageCount)].UpdateResource(pr);
 
                         //is the resource in the selected list
                         if (SelectedResources.ContainsKey(pr.info.id) && SelectedResources[pr.info.id].AllVisible && !settings.Resources[pr.info.id].ShowReserveLevels)

diff --git a/AlternateResourcePanel/ARPWindowDebug.cs b/AlternateResourcePanel/ARPWindowDebug.cs
@@ -32,7 +32,7 @@ internal class ARPWindowDebug: MonoBehaviourWindowPlus
         public Int32 intTest2=40;
         public Int32 intTest3=299;
         public Int32 intTest4 = 20;
-        public Int32 intTest5 = 0;
+        public static Int32 intTest5 = 10;
 
 
         //ApplicationLauncherButton origResButton=null;
@@ -379,10 +379,10 @@ internal override void DrawWindow(int id)
 
             //foreach (ARPResource r in mbARP.lstResourcesVessel.Values)
             //{
-            ////    GUILayout.Label(String.Format("{0}-{1}-{2}-{3}-{4}-{5}-{6}-{7}", r.ResourceDef.name, r.AmountFormatted, r.MaxAmountFormatted, r.RateFormatted, r.IsEmpty, r.EmptyAt.ToString("HH:mm:ss"), r.IsFull, r.FullAt.ToString("HH:mm:ss")));  //, r.RateFormatted2, r.RateSamples.Count));
+            //    //    GUILayout.Label(String.Format("{0}-{1}-{2}-{3}-{4}-{5}-{6}-{7}", r.ResourceDef.name, r.AmountFormatted, r.MaxAmountFormatted, r.RateFormatted, r.IsEmpty, r.EmptyAt.ToString("HH:mm:ss"), r.IsFull, r.FullAt.ToString("HH:mm:ss")));  //, r.RateFormatted2, r.RateSamples.Count));
 
-            ////    //GUILayout.Label(String.Format("{0}-{1}-{2}-{3:0}-{4}-{5}", r.ResourceDef.name, r.AmountFormatted, r.MaxAmountFormatted, r.Amount / r.MaxAmount * 100, KSPAlternateResourcePanel.settings.Resources[r.ResourceDef.id].MonitorWarningLevel, r.MonitorWarning));  //, r.RateFormatted2, r.RateSamples.Count));
-            //    GUILayout.Label(String.Format("{0}-{1}-{2}", r.ResourceDef.name, r.MonitorState,r.AlarmState));  //, r.RateFormatted2, r.RateSamples.Count));
+            //    //    //GUILayout.Label(String.Format("{0}-{1}-{2}-{3:0}-{4}-{5}", r.ResourceDef.name, r.AmountFormatted, r.MaxAmountFormatted, r.Amount / r.MaxAmount * 100, KSPAlternateResourcePanel.settings.Resources[r.ResourceDef.id].MonitorWarningLevel, r.MonitorWarning));  //, r.RateFormatted2, r.RateSamples.Count));
+            //    GUILayout.Label(String.Format("{0}-{1}-{2}", r.ResourceDef.name, r.MonitorState, r.AlarmState));  //, r.RateFormatted2, r.RateSamples.Count));
             //}
 
             //foreach (Int32 item in mbARP.lstResourcesToDisplay)

diff --git a/AlternateResourcePanel/KSPAlternateResourcePanel.version b/AlternateResourcePanel/KSPAlternateResourcePanel.version
@@ -5,7 +5,7 @@
   "VERSION": {
     "MAJOR": 2,
     "MINOR": 8,
-    "PATCH": 0,
+    "PATCH": 1,
     "BUILD": 0
   },
   "KSP_VERSION": {

diff --git a/AlternateResourcePanel/Properties/AssemblyInfo.cs b/AlternateResourcePanel/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("2.8.0.0")]
-[assembly: AssemblyFileVersion("2.8.0.0")]
+[assembly: AssemblyVersion("2.8.1.0")]
+[assembly: AssemblyFileVersion("2.8.1.0")]
diff --git a/AlternateResourcePanel/SharedStuff/Drawing.cs b/AlternateResourcePanel/SharedStuff/Drawing.cs
@@ -57,7 +57,7 @@ internal static Boolean DrawFlowControlButton(Rect rectBar, Boolean FlowState)
             rectBar.x += rectBar.width + 5;
             rectBar.y -= 2;
             rectBar.width = 16;
-            rectBar.height = 10;
+            rectBar.height = 20;
 
             //Set Texture here based on flowstate
 

diff --git a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt
@@ -28,6 +28,10 @@ LICENSE
 This work is licensed under an MIT license as outlined at the OSI site. Visit the documentation site for more details and Attribution
 
 VERSION HISTORY
+Version 2.8.1.0        -    KSP Version: 1.1.2
+- Fixed issue with singe stage vessels showing no resources
+- Fixed issue with flow control buttons having small hitbox (Issue #83)
+
 Version 2.8.0.0        -    KSP Version: 1.1.2
 - Recompiled for 1.1
 - Added ability to Move to Top and Move to Bottom for resource config screens