Merge 2.6.2.0 to master

TriggerAu · Dec 19, 2014 · 0b8c4ae · 0b8c4ae
2 parents a395c1d + 6eb615c
commit 0b8c4ae
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/AlternateResourcePanel/ARPPartWindow.cs b/AlternateResourcePanel/ARPPartWindow.cs
@@ -161,7 +161,7 @@ void ARPPartWindow_OnMouseEnter()
             //linePart2Window.material.SetColor("_EmissiveColor", colorLineHighlight);
             colorLineCurrent = colorLineHighlight;
             PartRef.SetHighlightColor(colorHighlight);
-            PartRef.SetHighlight(true);
+            PartRef.SetHighlight(true,false);
 
         }
         void ARPPartWindow_OnMouseLeave()

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.6.1.0")]
-[assembly: AssemblyFileVersion("2.6.1.0")]
+[assembly: AssemblyVersion("2.6.2.0")]
+[assembly: AssemblyFileVersion("2.6.2.0")]
diff --git a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt
@@ -28,9 +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.6.2.0        -    KSP Version: 0.90
+- Recomiled for 0.90 and fixed code changes
+
 Version 2.6.1.0        -    KSP Version: 0.25
 - Reattached References for 0.25
 - Added extra logging and null checks re AppLauncher
+- Added configurable setting for ReplaceStockAppTimeOut (default 20 secs) in case the stock app is taking too long to load
 
 Version 2.6.0.0        -    KSP Version: 0.25
 - Recompiled with 0.25 binaries

diff --git a/PluginBuilder/PublishKSPARP.ps1 b/PluginBuilder/PublishKSPARP.ps1
@@ -1,6 +1,7 @@
 $GitHubName="AlternateResourcePanel"
 $PluginName="KSPAlternateResourcePanel"
 $CurseID="220649"
+$CurseName="220649-alternate-resource-panel"
 $KerbalStuffModID = 195
 $UploadDir = "$($PSScriptRoot)\..\..\_Uploads\$($PluginName)"
 $KerbalStuffWrapper = "D:\Programming\KSP\_Scripts\KerbalStuffWrapper\KerbalStuffWrapper.exe"
@@ -106,12 +107,12 @@ function CreateKerbalStuffRelease() {
 function UpdateVersionCheckGHPagesAndPublish() {
     write-host -ForegroundColor Yellow "`r`nMERGING GHPages Dev to Master"
 
-    $GHPagesPath = "$($PSScriptRoot)\..\..\$($PluginName)_gh-pages"
+    $GHPagesPath = "$($PSScriptRoot)\..\..\$($GitHubName)_gh-pages"
 
 	git --git-dir="$($GHPagesPath)\.git" --work-tree="$($GHPagesPath)" checkout gh-pages_develop
     #update the version file
 
-    "|LATESTVERSION|$($Version)|LATESTVERSION|" | Out-File "$($GHPagesPath)\versioncheck.txt"
+    "|LATESTVERSION|$($Version)|LATESTVERSION|" | Out-File "$($GHPagesPath)\versioncheck.txt" -Encoding ascii
 
     #Commit these changes
     git --git-dir="$($GHPagesPath)\.git" --work-tree="$($GHPagesPath)" add "$($GHPagesPath)\versioncheck.txt"
@@ -179,8 +180,8 @@ else
             #}
 
             if ($KerbalStuffPW -eq $null) {
-                $KerbalStuffLogin = Read-Host -Prompt "KerbalStuff Login"
-                $KerbalStuffPW = Read-Host -Prompt "KerbalStuff Password"
+                $global:KerbalStuffLogin = Read-Host -Prompt "KerbalStuff Login"
+                $global:KerbalStuffPW = Read-Host -Prompt "KerbalStuff Password"
             }
 
         }
@@ -224,6 +225,8 @@ if($ChoiceRtn -eq 0)
 	$reldescr = $reldescr.Replace("`r`n","\r\n")
 	$reldescr = $reldescr.Replace("`"","\`"")
 
+    $ForumHeader = "[B][SIZE=4][COLOR=`"#FF0000`"]v$($Version) Now Available [/COLOR][/SIZE][/B]- [SIZE=3][B][URL=`"https://github.com/TriggerAu/$($GitHubName)/releases/tag/v$($Version)`"]Download from GitHub[/URL][/B] [/SIZE] or [SIZE=3][B][URL=`"http://kerbal.curseforge.com/ksp-mods/$($CurseName)/files`"]Download from Curse*[/URL][/B][/SIZE] or [SIZE=3][B][URL=`"https://kerbalstuff.com/mod/$($KerbalStuffModID)`"]Download from Kerbal Stuff[/URL][/B] [/SIZE]  [COLOR=`"#A9A9A9`"]* Once it's approved[/COLOR]"
+
     $ForumList = "[LIST]`r`n" + $reldescr + "`r`n[/LIST]"
     $ForumList = $ForumList.Replace("\r\n","`r`n").Replace("`r`n* ","`r`n[*]")
 
@@ -232,6 +235,24 @@ if($ChoiceRtn -eq 0)
     $relKStuff = $reldescr.Replace("\r\n","`r`n")
 
 
+    "GitHub Description:"
+    "-------------------"
+    "$($reldescr)`r`n"
+
+    "KStuff Description:"
+    "-------------------"
+    "$($relKStuff)`r`n"
+
+    "Forum Info:"
+    "-------------------"
+    "$($ForumHeader)`r`n"
+    "$($ForumList)`r`n"
+
+    $Choices= [System.Management.Automation.Host.ChoiceDescription[]] @("&Yes","&No")
+    $ChoiceRtn = $host.ui.PromptForChoice("Do you wish to Continue?","Confirm Readme Notes",$Choices,0)
+
+    if($ChoiceRtn -eq 0) {
+
     MergeDevToMaster
 
     CreateGitHubRelease
@@ -256,10 +277,13 @@ if($ChoiceRtn -eq 0)
     "-------------------"
     "$($relKStuff)`r`n"
 
-    "Forum List text:"
+    "Forum Info:"
     "-------------------"
+    "$($ForumHeader)`r`n"
     "$($ForumList)`r`n"
 
+    }
+
 }
 else
 {