From 00f38470bde7ab54aac6f876e1e7be7f35071fe3 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Mon, 4 May 2015 21:35:41 +1000 Subject: [PATCH 1/7] Updated .version file for CKAN compatability with patch versions --- PluginBuilder/AlternateResourcePanel.version | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/PluginBuilder/AlternateResourcePanel.version b/PluginBuilder/AlternateResourcePanel.version index 4de1758..d170836 100644 --- 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 } } \ No newline at end of file From f0a106845f9158bbf76631920b3b43369b6b8991 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Mon, 4 May 2015 21:41:42 +1000 Subject: [PATCH 2/7] Adding Ablator Resource Icon --- Images/Icons/Ablator.png | Bin 0 -> 584 bytes .../KSPAlternateResourcePanel/Icons/Ablator.png | Bin 0 -> 584 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Images/Icons/Ablator.png create mode 100644 PlugInFiles/GameData/TriggerTech/KSPAlternateResourcePanel/Icons/Ablator.png diff --git a/Images/Icons/Ablator.png b/Images/Icons/Ablator.png new file mode 100644 index 0000000000000000000000000000000000000000..796b99fd17d5abde5728fc75b0414402c0f7460b GIT binary patch literal 584 zcmV-O0=NB%P)$&&DaDxNO?D_va zGyj?0*;7;bpSGe2*9Hs%qrlGP5>U%3Fb?bhI)E)ePr^L|J_28X3E)911mqPs4r~Qx zfhmd#Yy>Vv^3}iqaHti@0ZRt6>hTl{N8pTU1uqpi83eB&8 zZ6)|=-~@05=uGfIV0)urset+L?G*yPm8_`&XMsBu+jK1BHv>0-v6z<%mmuZ?Huqa-kk>aW^wKTlaag+SXCwf ziZY#~@t*a?SEMbt7B~t>QGtWN9Di0}P53T~Hvayb$xh{Z^|Sg&?Z~*5>I?OC%op$> zbza?&U}F)dOPz`NE%lvxJB?e`8bj(&^|`t`u>I=GXwxIv`cvwK46Cb`!w;+b;`xl) zUL^pvU!7KG)rTSIP2kP$h<_f<$aU&{bxyr%aZ$B2x%$_?pv-!J_f?CQYKsxDto93w WK{FdMNYWkv0000$&&DaDxNO?D_va zGyj?0*;7;bpSGe2*9Hs%qrlGP5>U%3Fb?bhI)E)ePr^L|J_28X3E)911mqPs4r~Qx zfhmd#Yy>Vv^3}iqaHti@0ZRt6>hTl{N8pTU1uqpi83eB&8 zZ6)|=-~@05=uGfIV0)urset+L?G*yPm8_`&XMsBu+jK1BHv>0-v6z<%mmuZ?Huqa-kk>aW^wKTlaag+SXCwf ziZY#~@t*a?SEMbt7B~t>QGtWN9Di0}P53T~Hvayb$xh{Z^|Sg&?Z~*5>I?OC%op$> zbza?&U}F)dOPz`NE%lvxJB?e`8bj(&^|`t`u>I=GXwxIv`cvwK46Cb`!w;+b;`xl) zUL^pvU!7KG)rTSIP2kP$h<_f<$aU&{bxyr%aZ$B2x%$_?pv-!J_f?CQYKsxDto93w WK{FdMNYWkv0000 Date: Mon, 4 May 2015 21:51:10 +1000 Subject: [PATCH 3/7] Updated Drag Rect to cater to window size dynamically (Fixes #68) --- AlternateResourcePanel/ARPWindowResourceConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AlternateResourcePanel/ARPWindowResourceConfig.cs b/AlternateResourcePanel/ARPWindowResourceConfig.cs index 970136f..80fbcfc 100644 --- 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))); From b406566ffa953e207f0a5e22e0b48796b6466ef8 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Mon, 4 May 2015 21:55:24 +1000 Subject: [PATCH 4/7] Adding new resources to default order/config --- AlternateResourcePanel/ARP.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AlternateResourcePanel/ARP.cs b/AlternateResourcePanel/ARP.cs index 5b77b56..67ebb16 100644 --- 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")); } From 1b1927cc069c63ef2f18d6c79900b1b3146a3ff8 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Mon, 4 May 2015 22:15:14 +1000 Subject: [PATCH 5/7] Adjusting the file paths to use the formatted value to Fix toolbar icon (Fixes #69) --- AlternateResourcePanel/ARP.cs | 1 + AlternateResourcePanel/Resources.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AlternateResourcePanel/ARP.cs b/AlternateResourcePanel/ARP.cs index 67ebb16..fec096f 100644 --- a/AlternateResourcePanel/ARP.cs +++ b/AlternateResourcePanel/ARP.cs @@ -941,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/Resources.cs b/AlternateResourcePanel/Resources.cs index 57ac924..a152783 100644 --- 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); From 3acf2457c7f2b7b0c3a0b08252af68ff465a828d Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Mon, 4 May 2015 22:19:50 +1000 Subject: [PATCH 6/7] Version 2.7.1.0 ready --- .../KSPAlternateResourcePanel.version | 14 ++++++++++++-- AlternateResourcePanel/Properties/AssemblyInfo.cs | 4 ++-- PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt | 8 ++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/AlternateResourcePanel/KSPAlternateResourcePanel.version b/AlternateResourcePanel/KSPAlternateResourcePanel.version index b2c13d7..e948156 100644 --- 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 index 0250952..49faa57 100644 --- 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/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt index b9e72c0..ba826a3 100644 --- a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt +++ b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt @@ -28,6 +28,14 @@ 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 From b7ce19df9344f8da6413596fa328d79dcd23a976 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Mon, 4 May 2015 22:20:44 +1000 Subject: [PATCH 7/7] Readme typo --- PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt index ba826a3..9e8681b 100644 --- a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt +++ b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt @@ -34,7 +34,6 @@ Version 2.7.1.0 - KSP Version: 1.0.2 - 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