Merge 1.1.0.0 to master

TriggerAu · Oct 15, 2014 · a36588e · a36588e
2 parents 183bd9a + 6e32751
commit a36588e
Show file tree

Hide file tree

Showing 16 changed files with 835 additions and 47 deletions.
diff --git a/PluginFiles/GameData/TriggerTech/Flags/TriggerTechLogo.png b/PluginFiles/GameData/TriggerTech/Flags/TriggerTechLogo.png
diff --git a/PluginFiles/GameData/TriggerTech/Flags/TriggerTechLogo2.png b/PluginFiles/GameData/TriggerTech/Flags/TriggerTechLogo2.png
diff --git a/PluginFiles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_buttonKAC.png b/PluginFiles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_buttonKAC.png
diff --git a/...iles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_fa-info-circle.png b/...iles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_fa-info-circle.png
diff --git a/PluginFiles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_fa-recycle.png b/PluginFiles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_fa-recycle.png
diff --git a/PluginFiles/ReadMe-TransferWindowPlanner.txt b/PluginFiles/ReadMe-TransferWindowPlanner.txt
@@ -27,6 +27,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 1.1.0.0		-	KSP Version: 0.25.0
+- Added Ejection Burn Details and fiddle Start Date calcs
+- Added KAC Alarm Integration - Requires at least KAC 3.0.0.5 (Issue #16)
+
 Version 1.0.1.0		-	KSP Version: 0.24.2
 - Fixed Framerate Issue (Issue #17)
 - Updated links and version code

diff --git a/TransferWindowPlanner/Properties/AssemblyInfo.cs b/TransferWindowPlanner/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("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/TransferWindowPlanner/Resources.cs b/TransferWindowPlanner/Resources.cs
@@ -31,7 +31,9 @@ internal class Resources
 
         internal static Texture2D btnDropDown = new Texture2D(10, 10, TextureFormat.ARGB32, false);
         internal static Texture2D btnCopy = new Texture2D(16, 16, TextureFormat.ARGB32, false);
+        internal static Texture2D btnKAC = new Texture2D(16, 16, TextureFormat.ARGB32, false);
         internal static Texture2D btnInfo = new Texture2D(16, 16, TextureFormat.ARGB32, false);
+        internal static Texture2D btnReset = new Texture2D(16, 16, TextureFormat.ARGB32, false);
 
         internal static Texture2D texBox = new Texture2D(9, 9, TextureFormat.ARGB32, false);
         internal static Texture2D texBoxUnity = new Texture2D(9, 9, TextureFormat.ARGB32, false);
@@ -65,7 +67,9 @@ internal static void LoadTextures()
 
             LoadImageFromFile(ref btnDropDown, "img_DropDown.png");
             LoadImageFromFile(ref btnCopy, "img_buttonCopy.png");
+            LoadImageFromFile(ref btnKAC, "img_buttonKAC.png");
             LoadImageFromFile(ref btnInfo, "img_fa-info-circle.png");
+            LoadImageFromFile(ref btnReset, "img_fa-recycle.png");
 
             LoadImageFromFile(ref texBox, "tex_Box.png");
             LoadImageFromFile(ref texBoxUnity, "tex_BoxUnity.png");

diff --git a/TransferWindowPlanner/Settings.cs b/TransferWindowPlanner/Settings.cs
@@ -54,22 +54,22 @@ internal enum DisplaySkin
             [Description("Unity/KSP Buttons")]  UnityWKSPButtons
         }
 
+        [Persistent] internal TWP_KACWrapper.KACWrapper.KACAPI.AlarmActionEnum KACAlarmAction = TWP_KACWrapper.KACWrapper.KACAPI.AlarmActionEnum.KillWarp;
+        [Persistent] internal Double KACMargin = 24;
+
         [Persistent] internal Boolean ClickThroughProtect_KSC=true;
         [Persistent] internal Boolean ClickThroughProtect_Editor=true;
         [Persistent] internal Boolean ClickThroughProtect_Flight=true;
 
         //Version Stuff
-        [Persistent]
-        internal Boolean DailyVersionCheck = true;
+        [Persistent] internal Boolean DailyVersionCheck = true;
         internal Boolean VersionAttentionFlag = false;
         //When did we last check??
         internal DateTime VersionCheckDate_Attempt = new DateTime();
-        [Persistent]
-        internal String VersionCheckDate_AttemptStored;
+        [Persistent] internal String VersionCheckDate_AttemptStored;
         public String VersionCheckDate_AttemptString { get { return ConvertVersionCheckDateToString(this.VersionCheckDate_Attempt); } }
         internal DateTime VersionCheckDate_Success = new DateTime();
-        [Persistent]
-        internal String VersionCheckDate_SuccessStored;
+        [Persistent] internal String VersionCheckDate_SuccessStored;
         public String VersionCheckDate_SuccessString { get { return ConvertVersionCheckDateToString(this.VersionCheckDate_Success); } }
 
         public override void OnEncodeToConfigNode()