Merge branch 'develop'

CHANGELOG.md

@@ -1,6 +1,30 @@
 kOS Mod Changelog
 =================
 
+# v1.3.2.0 - Don't Steer Me wronger
+
+A quick patch to v1.3.0.0 that fixes issue #2857 that would
+zero controls for just a brief single physics frame if
+raw control neutralize had been previously used or if a
+reboot had occurred while raw controls were in use.  Most
+players won't notice a single physics frame of zeroed
+controls, but if you're using realism mods with limited
+engine ignitions, it would unfairly consume an engine
+ignition when the throttle zeroed for an instant. (Which
+was disasterous for those engines that only get one
+ignition.)
+
+Normally one bug fix wouldn't warrant a release, but this
+bug was caused by changes in v1.3.0.0, and the consumed
+ignition was unfair.
+
+# v1.3.1.0 - Don't Steer Me Wrong, this time
+
+A quick patch to v1.3.0.0 that fixed issue #2850 where
+one or two places in the code still used TimeSpan where
+they were supposed to have been changed to use TimeStamp.
+
+
 # v1.3.0.0 - Don't Steer Me Wrong
 
 There's a lot of small changes over the last year that have added

RELEASECHECKLIST.md

@@ -5,11 +5,12 @@ older version of KSP instead of the most recent version.  Please
 note where it says "(*backport*)" below if you are doing a backport.
 
 ### Pre-Build
-- [ ] Update AssemblyInfo for kOS project
-- [ ] Update AssemblyInfo for kOS.Safe project
-- [ ] Update AssemblyInfo for kOS.Safe.Test project
+- [ ] Assign the new kOS version number to `AssemblyVersion` and `AssemblyFileVersion` in these C# files:
+  - [ ] In `src/kOS/Properties/AssemblyInfo.cs`
+  - [ ] In `src/kOS.Safe/Properties/AssemblyInfo.cs`
+  - [ ] In `src/kOS.Safe.Test/Properties/AssemblyInfo.cs`
 - [ ] Update `Resources\GameData\kOS\kOS.version`
-- [ ] Update `CHANGELOG.MD`
+- [ ] Update `CHANGELOG.MD``
 - [ ] If this is a normal release for the most recent KSP version supported:
   - [ ] Update `doc\source\conf.py`
   - [ ] Update `doc\source\changes.rst`
@@ -18,7 +19,8 @@ note where it says "(*backport*)" below if you are doing a backport.
   - [ ] Above changes merged into `backport-for-KSPversion.number.here` branch on repo instead of into `develop` branch.
 
 ### Build
-- [ ] Build kOS solution in release mode
+- [ ] Configure build for "Release" mode not Debug
+- [ ] Fully rebuild kOS solution (clean, then build) in release mode
 - [ ] Run all unit tests
 - [ ] Ensure that all required resources are in place (module manager) (*backport* : Note if this is a backport you may need to use an older modulemanager DLL here.)
 - [ ] Create a ZIP file that has only the `GameData` folder of the `\Resources\` directory in it.  Make sure the ZIP's folder structure starts with `GameData`.

Resources/GameData/kOS/kOS.version

@@ -11,7 +11,7 @@
   "VERSION": {
     "MAJOR": 1,
     "MINOR": 3,
-    "PATCH": 1,
+    "PATCH": 2,
     "BUILD": 0
   },
   "KSP_VERSION": {

doc/source/conf.py

@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.0.0'
+version = '1.3.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.0.0'
+release = '1.3.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/kOS.Safe.Test/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: AssemblyFileVersion("1.3.1.0")]
-[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.3.2.0")]

src/kOS.Safe/Properties/AssemblyInfo.cs

@@ -31,5 +31,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: AssemblyFileVersion("1.3.1.0")]
-[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.3.2.0")]

src/kOS.Safe/kOS.Safe.csproj

@@ -236,7 +236,6 @@
     <Compile Include="Utilities\MovingAverage.cs" />
     <Compile Include="Utilities\ReflectUtil.cs" />
     <Compile Include="Utilities\SafeHouse.cs" />
-    <Compile Include="Utilities\Flushable.cs" />
     <Compile Include="Utilities\kOSKeys.cs" />
     <Compile Include="Utilities\kosMath.cs" />
     <Compile Include="Utilities\TickGen.cs" />

src/kOS.sln

@@ -15,16 +15,16 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

src/kOS/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@
 // 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: AssemblyFileVersion("1.3.1.0")]
-[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.3.2.0")]
 [assembly: KSPAssembly("kOS", 1, 3)]

src/kOS/Suffixed/FlightControl.cs

@@ -33,13 +33,11 @@ public class FlightControl : Structure , IDisposable, IFlightControlParameter
         private float wheelThrottleTrim;
         private float mainThrottle;
         private bool bound;
-        private Flushable<bool> neutral;
         private readonly List<string> floatSuffixes;
         private readonly List<string> vectorSuffixes;
 
         public FlightControl(Vessel vessel)
         {
-            neutral = new Flushable<bool>(); 
             bound = false;
             Vessel = vessel;
 
@@ -273,29 +271,17 @@ private void ResetControls()
             wheelSteerTrim = default(float);
             wheelThrottle = default(float);
             wheelThrottleTrim = default(float);
-            neutral.Value = true;
-            neutral.SetStale();
         }
 
         private BooleanValue IsNeutral()
         {
             return (yaw == yawTrim && pitch == pitchTrim && roll == rollTrim &&
                 fore == 0 && starboard == 0 && top == 0 &&
                 wheelSteer == wheelSteerTrim && wheelThrottle == wheelSteerTrim);
-
         }
 
         private void OnFlyByWire(FlightCtrlState st)
         {
-            if (neutral.IsStale)
-            {
-                if (neutral.FlushValue)
-                {
-                    st.Neutralize();
-                    neutral.Value = false;
-                }
-            }
-
             PushNewSetting(ref st);
         }