Merge 2.4.2.0 to master

TriggerAu · Jul 22, 2014 · e93f995 · e93f995
2 parents 017872c + 9c4cc12
commit e93f995
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 67 deletions.
diff --git a/AlternateResourcePanel/ARP.cs b/AlternateResourcePanel/ARP.cs
@@ -892,67 +892,6 @@ internal void DestroyToolbarButton(IButton btnToDestroy)
 
     }
 
-    //[KSPAddon(KSPAddon.Startup.MainMenu, false)]
-    //public class DDLTest:MonoBehaviourWindowPlus
-    //{
-    //    DropDownList ddltest;
-
-    //    internal override void Awake()
-    //    {
-    //        WindowRect = new Rect(300, 0, 300, 200);
-    //        Visible = true;
-
-    //        List<String> Test = new List<String>() { "Option 1", "Option 2", "Option 3", "Option 4"};
-
-    //        ddltest = new DropDownList(Test,this);
-
-    //        ddltest.OnSelectionChanged += ddltest_OnSelectionChanged;
-    //        ddlManager.Add(ddltest);
-    //    }
-
-    //    void ddltest_OnSelectionChanged(MonoBehaviourWindowPlus.DropDownList sender, int OldIndex, int NewIndex)
-    //    {
-    //        ScreenMessages.PostScreenMessage(ddltest.SelectedValue, 3, ScreenMessageStyle.UPPER_RIGHT);
-    //    }
-
-    //    internal override void OnGUIOnceOnly()
-    //    {
-    //        ddlManager.DropDownGlyphs = new GUIContentWithStyle(Resources.btnDropDown, Styles.styleDropDownGlyph);
-    //        ddlManager.DropDownSeparators = new GUIContentWithStyle("", Styles.styleSeparatorV);
-    //    }
-
-    //    internal override void DrawWindow(int id)
-    //    {
-    //        if (GUILayout.Button("Add"))
-    //        {
-    //            ddltest.Items.Add("Option " + (ddltest.Items.Count + 1).ToString());
-    //        }
-    //        if (GUILayout.Button("Remove"))
-    //        {
-    //            ddltest.Items.RemoveAt(ddltest.Items.Count-1);
-    //        }
-
-    //        ddltest.DrawButton();
-
-    //        GUILayout.Label(String.Format("{0}",ddltest.SelectedIndex));
-    //        if(ddltest.ListVisible)
-    //            GUILayout.Label(((Int32)Math.Floor((Event.current.mousePosition.y - ddltest.rectListBox.y) / (ddltest.rectListBox.height / ddltest.ListPageLength))).ToString());
-    //    }
-    //}
-
-//#if DEBUG
-//    //This will kick us into the save called default and set the first vessel active
-//    [KSPAddon(KSPAddon.Startup.Flight, false)]
-//    public class Debug_Drawline : MonoBehaviourExtended
-//    {
-//        internal override void OnGUIEvery()
-//        {
-//            Vector2 pointA = new Vector2(Screen.width / 2, Screen.height / 2);
-//            Vector2 pointB = Event.current.mousePosition;
-//            Drawing.DrawLine(pointA, pointB, 3);
-//        }
-//    }
-//#endif
 
 #if DEBUG
     //This will kick us into the save called default and set the first vessel active

diff --git a/AlternateResourcePanel/ARPWindow.cs b/AlternateResourcePanel/ARPWindow.cs
@@ -147,13 +147,13 @@ internal override void DrawWindow(Int32 id)
                             SelectedResources.TogglePartResourceVisible(ResourceID);
 
                         //get last stage of this resource and set it
-                        //if (lstResourcesLastStage.ContainsKey(ResourceID))
-                        //{
+                        if (lstResourcesLastStage.ContainsKey(ResourceID))
+                        {
                             Highlight = SelectedResources.ContainsKey(ResourceID) && SelectedResources[ResourceID].LastStageVisible;
                             rectBar = Drawing.CalcBarRect(rectIcon, StageBarOffset, 120, 15);
                             if (Drawing.DrawResourceBar(rectBar, lstResourcesLastStage[ResourceID], Styles.styleBarBlue_Back, Styles.styleBarBlue, Styles.styleBarBlue_Thin, settings.ShowRates, Highlight, Styles.styleBarHighlight))
                                 SelectedResources.TogglePartResourceVisible(ResourceID, true);
-                        //}
+                        }
                     }
                     GUILayout.EndHorizontal();
                 }

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.4.1.0")]
-[assembly: AssemblyFileVersion("2.4.1.0")]
+[assembly: AssemblyVersion("2.4.2.0")]
+[assembly: AssemblyFileVersion("2.4.2.0")]
diff --git a/...iles/GameData/TriggerTech/KSPAlternateResourcePanel/ToolbarIcons/KSPARPaBig.png b/...iles/GameData/TriggerTech/KSPAlternateResourcePanel/ToolbarIcons/KSPARPaBig.png
diff --git a/...iles/GameData/TriggerTech/KSPAlternateResourcePanel/ToolbarIcons/KSPARPbBig.png b/...iles/GameData/TriggerTech/KSPAlternateResourcePanel/ToolbarIcons/KSPARPbBig.png
diff --git a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt
@@ -28,9 +28,13 @@ LICENSE
 Licensed under Creative Commons Attribution-NonCommercial-Sharealike 3.0 Unported License. Visit the documentation site for more details and Attribution
 
 VERSION HISTORY
+Version 2.4.2.0        -    KSP Version: 0.24.0
+- Fixed issue caused by overzealous commenting syndrome in previous release (Fixes #36)
+- Changed AppLauncher Icon to be more visible (Fixes #35)
+
 Version 2.4.1.0        -    KSP Version: 0.24.0
 - Fixed issue with AppLauncher button not displaying in MapView (Issue #32)
-- Added option to be able to choopse left or right for Last Stage Bars (Issue #30)
+- Added option to be able to choose left or right for Last Stage Bars (Issue #30)
 - Stopped displaying the insertion icon when dragging of no change would occur (Issue #33)
 - Adjusted Drag and Drop detection to better use the mouse position (Issue #34)