Merge branch 'develop' into support/rt-ksp131

RemoteTechnologiesGroup · Dec 24, 2018 · 81931b2 · 81931b2
2 parents 72e604d + f6c06c1
commit 81931b2
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,48 @@
+# Version 1.9.1.131
+**Released December 24, 2018**
+
+What's New?
+===========
+
+* Recompiled RemoteTech 1.9.1 for KSP 1.3.1
+
+Detailed Changelog
+==================
+
+Fixed Issues
+------------
+
+Pull Requests
+-------------
+
+***
+
+# Version 1.9.1
+**Released December 24, 2018**
+
+What's New?
+===========
+
+* Recompiled for KSP 1.6
+* Update ModuleManager to 3.1.1
+* Fixed critical bug of Flight Computer executing timed commands wrongly
+* Fixed syntax error in RemoteTech's MM patch for RLA Probes
+
+Detailed Changelog
+==================
+
+Fixed Issues
+------------
+
+* Issue #781: Signal delay timer error when executing timed commands. [requested by: DrToonhattan]
+
+Pull Requests
+-------------
+
+* PR #779: RLA syntax error [PR by: Gordon-Dry]
+
+***
+
 # Version 1.9.0.145
 **Released October 29, 2018**
 

diff --git a/GameData/RemoteTech/RemoteTech.version b/GameData/RemoteTech/RemoteTech.version
@@ -12,7 +12,7 @@
 	"VERSION":{
     "MAJOR":1,
     "MINOR":9,
-    "PATCH":0,
+    "PATCH":1,
     "BUILD":131
   },
   "KSP_VERSION":{

diff --git a/GameData/RemoteTech/RemoteTech_RLA_Probes.cfg b/GameData/RemoteTech/RemoteTech_RLA_Probes.cfg
@@ -1,7 +1,7 @@
 // Support for RLA probe cores
 // issue submitted by marosciacchitano; config made by kitoma.
 
-@PART[RLA_*]:HAS[@MODULE[ModuleCommand]]:!HAS[@MODULE[ModuleSPU]]:FOR[RemoteTech]
+@PART[RLA_*]:HAS[@MODULE[ModuleCommand],!MODULE[ModuleSPU]]:FOR[RemoteTech]
 {
     %MODULE[ModuleSPU] {
     }

diff --git a/appveyor.yml b/appveyor.yml
@@ -13,7 +13,7 @@
   #---------------------------------#
 
   # version format (you need to bump it when changing version)
-  version: 1.9.0.131
+  version: 1.9.1.131
 
   # branches
   branches:
@@ -218,7 +218,7 @@
   #---------------------------------#
 
   # version format (you need to bump it when changing version)
-  version: 1.9.0-{build}-{branch}
+  version: 1.9.1-{build}-{branch}
 
   # branches
   branches:
@@ -270,7 +270,7 @@
     - cmd: set GAMEDATA_FOLDER=%APPVEYOR_BUILD_FOLDER%\GameData
     - cmd: set ASSEMBLY_FOLDER=%GAMEDATA_FOLDER%\RemoteTech\Plugins
     # download required KSP DLLs
-    - cmd: curl -fsS -o%DOWNLOAD_FOLDER%\dlls.7z https://d237kiopfuf7h0.cloudfront.net/download/KSPDLL_1_5_1.zip
+    - cmd: curl -fsS -o%DOWNLOAD_FOLDER%\dlls.7z https://d237kiopfuf7h0.cloudfront.net/download/KSPDLL_1_3_1.zip
     # extract them
     - cmd: cd %DOWNLOAD_FOLDER% & dir
     - cmd: 7z.exe e -p%DLL_ARCH_PASS% -o%ASSEMBLY_FOLDER% %DOWNLOAD_FOLDER%\dlls.7z

diff --git a/src/RemoteTech/FlightComputer/FlightComputer.cs b/src/RemoteTech/FlightComputer/FlightComputer.cs
@@ -259,7 +259,7 @@ public void Enqueue(ICommand cmd, bool ignoreControl = false, bool ignoreDelay =
             if (!ignoreExtra)
             {
                 cmd.ExtraDelay += Math.Max(0, TotalDelay - Delay);
-                cmd.ExtraDelayScheduledTimeStamp = RTUtil.GameTime + cmd.ExtraDelay;
+                cmd.ExtraDelayScheduledTimeStamp = cmd.TimeStamp + cmd.ExtraDelay;
             }
 
             var pos = _commandQueue.BinarySearch(cmd);

diff --git a/src/RemoteTech/NetworkRenderer.cs b/src/RemoteTech/NetworkRenderer.cs
@@ -64,15 +64,11 @@ static NetworkRenderer()
             {
                 switch(Versioning.version_minor)
                 {
-                    case 3:
-                    case 5:
-                        mLineWidth = 3f; //1f is too thin in 1.3 and 1.5
-                        break;
                     case 4:
                         mLineWidth = 1f; //1f is matching to CommNet's line width
                         break;
                     default:
-                        mLineWidth = 1f;
+                        mLineWidth = 3f;
                         break;
                 }
             }

diff --git a/src/RemoteTech/Properties/AssemblyInfo.cs b/src/RemoteTech/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("RemoteTechnologiesGroup")]
 [assembly: AssemblyProduct("RemoteTech")]
-[assembly: AssemblyCopyright("Copyright © 2013-2018")]
+[assembly: AssemblyCopyright("Copyright © 2013-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -37,7 +37,7 @@
 // DLLs any time it changes.  Breaking on a minor revision is probably acceptable - it's
 // unlikely that there wouldn't be other breaking changes on a minor version change.
 [assembly: AssemblyVersion("1.9")]
-[assembly: AssemblyFileVersion("1.9.0.131")]
+[assembly: AssemblyFileVersion("1.9.1.131")]
 
 // Use KSPAssembly to allow other DLLs to make this DLL a dependency in a
 // non-hacky way in KSP.  Format is (AssemblyProduct, major, minor), and it