Merge 2.7.1.0 to master

TriggerAu · May 4, 2015 · 6d15ea7 · 6d15ea7
2 parents e1f9732 + b7ce19d
commit 6d15ea7
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 7 deletions.
diff --git a/AlternateResourcePanel/ARP.cs b/AlternateResourcePanel/ARP.cs
@@ -257,12 +257,15 @@ private void VerifyResources()
                 settings.Resources.Add(1576437329, new ResourceSettings(1576437329, "ElectricCharge"));
                 settings.Resources.Add(2001413032, new ResourceSettings(2001413032, "MonoPropellant"));
                 settings.Resources.Add(-792463147, new ResourceSettings(-792463147, "EVA Propellant"));
+                settings.Resources.Add(34, new ResourceSettings(34, "") { IsSeparator = true });
+                settings.Resources.Add(466598945, new ResourceSettings(466598945, "Ablator"));
                 settings.Resources.Add(35, new ResourceSettings(35, "") { IsSeparator = true });
                 settings.Resources.Add(374119730, new ResourceSettings(374119730, "LiquidFuel"));
                 settings.Resources.Add(-1823983486, new ResourceSettings(-1823983486, "Oxidizer"));
                 settings.Resources.Add(650317537, new ResourceSettings(650317537, "SolidFuel"));
                 settings.Resources.Add(36, new ResourceSettings(36, "") { IsSeparator = true });
                 settings.Resources.Add(-1909417378, new ResourceSettings(-1909417378, "IntakeAir"));
+                settings.Resources.Add(79554, new ResourceSettings(79554, "Ore"));
                 settings.Resources.Add(1447111193, new ResourceSettings(1447111193, "XenonGas"));
             }
 
@@ -938,6 +941,7 @@ private static void SetToolbarIcon(IButton btnReturn)
             //if (settings.ToggleOn) 
                 //btnReturn.TexturePath = "TriggerTech/KSPAlternateResourcePanel/ToolbarIcons/KSPARPa_On";
             //else
+                //btnReturn.TexturePath = "TriggerTech/KSPAlternateResourcePanel/ToolbarIcons/KSPARPa";
             String strToolbarIcon = Resources.PathPluginToolbarIcons.Substring(Resources.PathPluginToolbarIcons.ToLower().IndexOf("/gamedata/") + 10) + "/KSPARPa";
             btnReturn.TexturePath = strToolbarIcon;// "TriggerTech/TransferWindowPlanner/ToolbarIcons/TWPIcon";
         }

diff --git a/AlternateResourcePanel/ARPWindowResourceConfig.cs b/AlternateResourcePanel/ARPWindowResourceConfig.cs
@@ -360,7 +360,7 @@ void IconMouseEvents()
             MousePosition = Event.current.mousePosition;
 
             //If the Mouse is inside the scroll window
-            if (MousePosition.y > 54 && MousePosition.y < 374)
+            if (MousePosition.y > 54 && MousePosition.y < (WindowHeight-26) )
             {
                 //check what we are over
                 resourceOver = lstResPositions.FirstOrDefault(x => x.resourceRect.Contains(MousePosition + ScrollPosition - new Vector2(8, 54)));

diff --git a/AlternateResourcePanel/KSPAlternateResourcePanel.version b/AlternateResourcePanel/KSPAlternateResourcePanel.version
@@ -5,12 +5,22 @@
   "VERSION": {
     "MAJOR": 2,
     "MINOR": 7,
-    "PATCH": 0,
-	"BUILD": 0
+    "PATCH": 1,
+    "BUILD": 0
   },
   "KSP_VERSION": {
+    "MAJOR": 1,
+    "MINOR": 0,
+    "PATCH": 2
+  },
+  "KSP_VERSION_MIN": {
     "MAJOR": 1,
     "MINOR": 0,
     "PATCH": 0
+  },
+  "KSP_VERSION_MAX": {
+    "MAJOR": 1,
+    "MINOR": 0,
+    "PATCH": 99
   }
 }
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.7.0.0")]
-[assembly: AssemblyFileVersion("2.7.0.0")]
+[assembly: AssemblyVersion("2.7.1.0")]
+[assembly: AssemblyFileVersion("2.7.1.0")]
diff --git a/AlternateResourcePanel/Resources.cs b/AlternateResourcePanel/Resources.cs
@@ -17,7 +17,7 @@ internal class Resources
         internal static String PathApp = KSPUtil.ApplicationRootPath.Replace("\\", "/");
         internal static String PathTriggerTech = string.Format("{0}GameData/TriggerTech", PathApp);
         //internal static String PathPlugin = string.Format("{0}/{1}", PathTriggerTech, KSPAlternateResourcePanel._AssemblyName);
-        internal static String PathPlugin = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+        internal static String PathPlugin = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location).Replace("\\", "/");
         internal static String PathPluginToolbarIcons = string.Format("{0}/ToolbarIcons", PathPlugin);
         internal static String PathPluginTextures = string.Format("{0}/Textures", PathPlugin);
         //internal static String PathPluginData = string.Format("{0}/Data", PathPlugin);

diff --git a/Images/Icons/Ablator.png b/Images/Icons/Ablator.png
diff --git a/PlugInFiles/GameData/TriggerTech/KSPAlternateResourcePanel/Icons/Ablator.png b/PlugInFiles/GameData/TriggerTech/KSPAlternateResourcePanel/Icons/Ablator.png
diff --git a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt
@@ -28,6 +28,13 @@ 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.7.1.0        -    KSP Version: 1.0.2
+- Added 1.0.2 version
+- Added Ablator resource
+- Added new resources to default layout
+- changed version file to handle patches for CKAN
+- Fixed issue with resource config not allownig window drag for last 4 rows (Issue #68)
+
 Version 2.7.0.0        -    KSP Version: 1.0
 - Recompiled for 1.0
 - Fixes for AppLauncher Changes

diff --git a/PluginBuilder/AlternateResourcePanel.version b/PluginBuilder/AlternateResourcePanel.version
@@ -6,11 +6,21 @@
     "MAJOR": %PLUGIN_MAJOR%,
     "MINOR": %PLUGIN_MINOR%,
     "PATCH": %PLUGIN_PATCH%,
-	"BUILD": %PLUGIN_BUILD%
+    "BUILD": %PLUGIN_BUILD%
   },
   "KSP_VERSION": {
     "MAJOR": %KSP_MAJOR%,
     "MINOR": %KSP_MINOR%,
     "PATCH": %KSP_PATCH%
+  },
+  "KSP_VERSION_MIN": {
+    "MAJOR": %KSP_MAJOR%,
+    "MINOR": %KSP_MINOR%,
+    "PATCH": 0
+  },
+  "KSP_VERSION_MAX": {
+    "MAJOR": %KSP_MAJOR%,
+    "MINOR": %KSP_MINOR%,
+    "PATCH": 99
   }
 }