Merge 1.2.3.0 to master

TriggerAu · Jan 11, 2015 · 317072e · 317072e
2 parents d93285c + 2adeade
commit 317072e
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 7 deletions.
diff --git a/PluginBuilder/CommitVersionReady.ps1 b/PluginBuilder/CommitVersionReady.ps1
@@ -0,0 +1,15 @@
+$PluginName = (get-item $PSScriptRoot).Parent.Name
+$UploadDir = "$($PSScriptRoot)\..\..\_Uploads\$($PluginName)"
+
+#Get newest version
+$Version =  (Get-ChildItem $UploadDir -Filter "v*.*.*.*"|sort -Descending)[0].name.replace("v","")
+
+$Choices= [System.Management.Automation.Host.ChoiceDescription[]] @("&Yes","&No")
+$ChoiceRtn = $host.ui.PromptForChoice("`r`nGit Commit - v$($Version)","Do you wish to Commit the version ready message?",$Choices,0)
+if ($ChoiceRtn -eq 0 )
+{
+    git checkout develop
+    git add -A * ..\*
+    git commit -m "Version $($Version) ready"
+	git push
+}
diff --git a/...iles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_buttonCalendar.png b/...iles/GameData/TriggerTech/TransferWindowPlanner/Textures/img_buttonCalendar.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.2.3.0		-	KSP Version: 0.90
+- Fixed missing icon (Issue #29)
+- Changed input lock in flight mode (Issue #30)
+
 Version 1.2.2.0		-	KSP Version: 0.90
 - All backend stuff...
 - Added AVC version files (Issue #25)

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.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
diff --git a/TransferWindowPlanner/TWP.cs b/TransferWindowPlanner/TWP.cs
@@ -298,7 +298,7 @@ void DrawGUI()
                         switch (HighLogic.LoadedScene) {
                             case GameScenes.SPACECENTER: InputLockManager.SetControlLock(ControlTypes.KSC_FACILITIES, "TWPControlLock"); break;
                             case GameScenes.EDITOR: InputLockManager.SetControlLock(ControlTypes.EDITOR_LOCK, "TWPControlLock"); break;
-                            case GameScenes.FLIGHT: InputLockManager.SetControlLock(ControlTypes.All, "TWPControlLock"); break;
+                            case GameScenes.FLIGHT: InputLockManager.SetControlLock(ControlTypes.ALL_SHIP_CONTROLS, "TWPControlLock"); break;
                             case GameScenes.TRACKSTATION:
                                 break;
                             default:

diff --git a/TransferWindowPlanner/TWPWindowDebug.cs b/TransferWindowPlanner/TWPWindowDebug.cs
@@ -102,6 +102,12 @@ internal override void DrawWindow(int id)
 
                 DrawLabel("{0}", KSPDateStructure.CalendarType);
 
+                //if (mbTWP.btnAppLauncher != null)
+                //{
+                //    DrawLabel(Camera.current.WorldToScreenPoint(mbTWP.btnAppLauncher.GetAnchor()).ToString());
+
+                //    DrawLabel(Camera.current.WorldToScreenPoint(mbTWP.btnAppLauncher.transform.localPosition).ToString());
+                //}
                 //if (GUILayout.Button("Make Date"))
                 //{
                 //    LogFormatted("a");

diff --git a/TransferWindowPlanner/TWPWindowSettings.cs b/TransferWindowPlanner/TWPWindowSettings.cs
@@ -23,7 +23,7 @@ class TWPWindowSettings:MonoBehaviourWindowPlus
         private DropDownList ddlSettingsButtonStyle;
         internal DropDownList ddlSettingsCalendar;
 
-        internal Int32 WindowWidth = 320;
+        internal Int32 WindowWidth = 360;
         internal Int32 WindowHeight = 200;
 
         internal enum SettingsTabs
@@ -273,7 +273,7 @@ private void DrawWindow_Alarm()
                 //Alarm Area
                 GUILayout.BeginVertical(Styles.styleSettingsArea);
                 //if (KACWrapper.KAC.DrawAlarmActionChoice(ref KACAlarmAction, "On Alarm:", 108, 61))
-                if (KACWrapper.KAC.DrawAlarmActionChoice(ref settings.KACAlarmAction, "Action:", 90 , 50))
+                if (KACWrapper.KAC.DrawAlarmActionChoice(ref settings.KACAlarmAction, "Action:", 90 , 38))
                     {
                     settings.Save();
                 }
@@ -378,7 +378,7 @@ private void DrawWindow_About()
             GUILayout.EndHorizontal();
 
             GUILayout.BeginHorizontal();
-            GUILayout.BeginVertical(GUILayout.Width(160));
+            GUILayout.BeginVertical(GUILayout.Width(200));
             GUILayout.Space(4);
             GUILayout.Label("Last Check Attempt:");
             GUILayout.Label("Current Version:");

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