Merge branch 'release/0.4.1'

Apokee · Apr 27, 2015 · 342a672 · 342a672
2 parents 20b84c2 + bd5f7de
commit 342a672
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 236 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,8 @@
-## Unreleased
+## v0.4.1
+#### Fixes
+- Kerbal Space Program v1.0 compatability
+
+## v0.4.0
 ##### New
 - Added setting to disable Application Launcher (stock toolbar) button.
 - Docking controls are now supported.

diff --git a/Source/PlaneMode/Manipulators/FlightInputManipulator.cs b/Source/PlaneMode/Manipulators/FlightInputManipulator.cs
diff --git a/Source/PlaneMode/Manipulators/GameSettingsManipulator.cs b/Source/PlaneMode/Manipulators/GameSettingsManipulator.cs
@@ -2,116 +2,78 @@
 
 namespace PlaneMode.Manipulators
 {
-    internal class GameSettingsManipulator : IManipulator
+    internal sealed class GameSettingsManipulator : IManipulator
     {
-        // ReSharper disable NotAccessedField.Local
-        private readonly KeyBinding _pitchUpStagingBinding;
-        private readonly KeyBinding _pitchDownStagingBinding;
-        private readonly KeyBinding _yawLeftStagingBinding;
-        private readonly KeyBinding _yawRightStagingBinding;
-        private readonly KeyBinding _rollLeftStagingBinding;
-        private readonly KeyBinding _rollRightStagingBinding;
+        private readonly KeyBinding _pitchUp;
+        private readonly KeyBinding _pitchDown;
+        private readonly bool _pitchAxisPrimaryInverted;
+        private readonly bool _pitchAxisSecondaryInverted;
 
-        private readonly AxisBinding _pitchAxisStagingBinding;
-        private readonly AxisBinding _rollAxisStagingBinding;
-        private readonly AxisBinding _yawAxisStagingBinding;
+        private readonly KeyBinding _rollLeft;
+        private readonly KeyBinding _rollRight;
+        private readonly AxisBinding _rollAxis;
 
-        private readonly KeyBinding _pitchUpDockingBinding;
-        private readonly KeyBinding _pitchDownDockingBinding;
-        private readonly KeyBinding _yawLeftDockingBinding;
-        private readonly KeyBinding _yawRightDockingBinding;
-        private readonly KeyBinding _rollLeftDockingBinding;
-        private readonly KeyBinding _rollRightDockingBinding;
-        private readonly AxisBinding _pitchAxisDockingBinding;
-        private readonly AxisBinding _rollAxisDockingBinding;
-        private readonly AxisBinding _yawAxisDockingBinding;
-
-        private readonly bool _pitchAxisStagingInverted;
-        private readonly bool _pitchAxisDockingInverted;
-        // ReSharper restore NotAccessedField.Local
+        private readonly KeyBinding _yawLeft;
+        private readonly KeyBinding _yawRight;
+        private readonly AxisBinding _yawAxis;
 
         public bool InvertPitch { get; set; }
 
         public GameSettingsManipulator()
         {
-            _pitchUpStagingBinding      = GameSettings.PITCH_UP;
-            _pitchDownStagingBinding    = GameSettings.PITCH_DOWN;
-            _yawLeftStagingBinding      = GameSettings.YAW_LEFT;
-            _yawRightStagingBinding     = GameSettings.YAW_RIGHT;
-            _rollLeftStagingBinding     = GameSettings.ROLL_LEFT;
-            _rollRightStagingBinding    = GameSettings.ROLL_RIGHT;
-            _pitchAxisStagingBinding    = GameSettings.AXIS_PITCH;
-            _rollAxisStagingBinding     = GameSettings.AXIS_ROLL;
-            _yawAxisStagingBinding      = GameSettings.AXIS_YAW;
-
-            _pitchUpDockingBinding      = GameSettings.Docking_pitchUp;
-            _pitchDownDockingBinding    = GameSettings.Docking_pitchDown;
-            _yawLeftDockingBinding      = GameSettings.Docking_yawLeft;
-            _yawRightDockingBinding     = GameSettings.Docking_yawRight;
-            _rollLeftDockingBinding     = GameSettings.Docking_rollLeft;
-            _rollRightDockingBinding    = GameSettings.Docking_rollRight;
-            _pitchAxisDockingBinding    = GameSettings.axis_Docking_pitch;
-            _rollAxisDockingBinding     = GameSettings.axis_Docking_roll;
-            _yawAxisDockingBinding      = GameSettings.axis_Docking_yaw;
-
-            _pitchAxisStagingInverted = GameSettings.AXIS_PITCH.inverted;
-            _pitchAxisDockingInverted = GameSettings.axis_Docking_pitch.inverted;
+            _pitchUp                    = GameSettings.PITCH_UP;
+            _pitchDown                  = GameSettings.PITCH_DOWN;
+            _pitchAxisPrimaryInverted   = GameSettings.AXIS_PITCH.primary.inverted;
+            _pitchAxisSecondaryInverted = GameSettings.AXIS_PITCH.secondary.inverted;
+
+            _rollLeft    = GameSettings.ROLL_LEFT;
+            _rollRight   = GameSettings.ROLL_RIGHT;
+            _rollAxis    = GameSettings.AXIS_ROLL;
+
+            _yawLeft     = GameSettings.YAW_LEFT;
+            _yawRight    = GameSettings.YAW_RIGHT;
+            _yawAxis     = GameSettings.AXIS_YAW;
         }
 
         public void SetControlMode(ControlMode newControlMode)
         {
             switch (newControlMode)
             {
                 case ControlMode.Rocket:
-                    GameSettings.YAW_LEFT = _yawLeftStagingBinding;
-                    GameSettings.YAW_RIGHT = _yawRightStagingBinding;
-                    GameSettings.AXIS_YAW = _yawAxisStagingBinding;
-                    GameSettings.Docking_yawLeft = _yawLeftDockingBinding;
-                    GameSettings.Docking_yawRight = _yawRightDockingBinding;
-                    GameSettings.axis_Docking_yaw = _yawAxisDockingBinding;
-
-                    GameSettings.ROLL_LEFT = _rollLeftStagingBinding;
-                    GameSettings.ROLL_RIGHT = _rollRightStagingBinding;
-                    GameSettings.AXIS_ROLL = _rollAxisStagingBinding;
-                    GameSettings.Docking_rollLeft = _rollLeftDockingBinding;
-                    GameSettings.Docking_rollRight = _rollRightDockingBinding;
-                    GameSettings.axis_Docking_roll = _rollAxisDockingBinding;
-
+                    if (InvertPitch)
+                    {
+                        GameSettings.PITCH_UP                       = _pitchUp;
+                        GameSettings.PITCH_DOWN                     = _pitchDown;
+                        GameSettings.AXIS_PITCH.primary.inverted    = _pitchAxisPrimaryInverted;
+                        GameSettings.AXIS_PITCH.secondary.inverted  = _pitchAxisSecondaryInverted;
+                    }
 
-                    GameSettings.PITCH_UP = _pitchUpStagingBinding;
-                    GameSettings.PITCH_DOWN = _pitchDownStagingBinding;
-                    GameSettings.AXIS_PITCH.inverted = _pitchAxisStagingInverted;
+                    GameSettings.ROLL_LEFT  = _rollLeft;
+                    GameSettings.ROLL_RIGHT = _rollRight;
+                    GameSettings.AXIS_ROLL  = _rollAxis;
 
-                    GameSettings.Docking_pitchUp = _pitchUpDockingBinding;
-                    GameSettings.Docking_pitchDown = _pitchDownDockingBinding;
-                    GameSettings.axis_Docking_pitch.inverted = _pitchAxisDockingInverted;
+                    GameSettings.YAW_LEFT   = _yawLeft;
+                    GameSettings.YAW_RIGHT  = _yawRight;
+                    GameSettings.AXIS_YAW   = _yawAxis;
 
                     break;
                 case ControlMode.Plane:
-                    GameSettings.YAW_LEFT = _rollLeftStagingBinding;
-                    GameSettings.YAW_RIGHT = _rollRightStagingBinding;
-                    GameSettings.AXIS_YAW = _rollAxisStagingBinding;
-                    GameSettings.Docking_yawLeft = _rollLeftDockingBinding;
-                    GameSettings.Docking_yawRight = _rollRightDockingBinding;
-                    GameSettings.axis_Docking_yaw = _rollAxisDockingBinding;
-
-                    GameSettings.ROLL_LEFT = _yawLeftStagingBinding;
-                    GameSettings.ROLL_RIGHT = _yawRightStagingBinding;
-                    GameSettings.AXIS_ROLL = _yawAxisStagingBinding;
-                    GameSettings.Docking_rollLeft = _yawLeftDockingBinding;
-                    GameSettings.Docking_rollRight = _yawRightDockingBinding;
-                    GameSettings.axis_Docking_roll = _yawAxisDockingBinding;
-
                     if (InvertPitch)
                     {
-                        GameSettings.PITCH_UP = _pitchDownStagingBinding;
-                        GameSettings.PITCH_DOWN = _pitchUpStagingBinding;
-                        GameSettings.AXIS_PITCH.inverted = !_pitchAxisStagingInverted;
-
-                        GameSettings.Docking_pitchUp = _pitchDownDockingBinding;
-                        GameSettings.Docking_pitchDown = _pitchUpDockingBinding;
-                        GameSettings.axis_Docking_pitch.inverted = !_pitchAxisDockingInverted;
+                        GameSettings.PITCH_UP                       = _pitchDown;
+                        GameSettings.PITCH_DOWN                     = _pitchUp;
+                        GameSettings.AXIS_PITCH.primary.inverted    = !_pitchAxisPrimaryInverted;
+                        GameSettings.AXIS_PITCH.secondary.inverted  = !_pitchAxisSecondaryInverted;
                     }
+
+                    GameSettings.ROLL_LEFT  = _yawLeft;
+                    GameSettings.ROLL_RIGHT = _yawRight;
+                    GameSettings.AXIS_ROLL  = _yawAxis;
+
+                    GameSettings.YAW_LEFT   = _rollLeft;
+                    GameSettings.YAW_RIGHT  = _rollRight;
+                    GameSettings.AXIS_YAW   = _rollAxis;
+
                     break;
                 default:
                     throw new ArgumentOutOfRangeException("newControlMode");

diff --git a/Source/PlaneMode/PlaneMode.cs b/Source/PlaneMode/PlaneMode.cs
@@ -57,11 +57,6 @@ public void Start()
             InitializeSettings();
             InitializeInterface();
 
-            _manipulators.Add(new FlightInputManipulator(FlightInputHandler.fetch)
-            {
-                InvertPitch = _pitchInvert
-            });
-
             _manipulators.Add(new GameSettingsManipulator
             {
                 InvertPitch = _pitchInvert

diff --git a/Source/PlaneMode/PlaneMode.csproj b/Source/PlaneMode/PlaneMode.csproj
@@ -47,7 +47,6 @@
   <ItemGroup>
     <Compile Include="ControlMode.cs" />
     <Compile Include="IManipulator.cs" />
-    <Compile Include="Manipulators\FlightInputManipulator.cs" />
     <Compile Include="Manipulators\GameSettingsManipulator.cs" />
     <Compile Include="Log.cs" />
     <Compile Include="LogLevel.cs" />

diff --git a/Source/PlaneMode/Properties/AssemblyInfo.cs b/Source/PlaneMode/Properties/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 [assembly: AssemblyDescription("Kerbal Space Program mod to swap roll/yaw axes")]
 [assembly: AssemblyProduct("PlaneMode")]
 [assembly: AssemblyCompany("PlaneMode Contributors")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © 2014-2015")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]
@@ -13,5 +13,5 @@
 #endif
 
 [assembly: AssemblyVersion("0")]
-[assembly: AssemblyFileVersion("0.4.0")]
-[assembly: AssemblyInformationalVersion("0.4.0")]
+[assembly: AssemblyFileVersion("0.4.1")]
+[assembly: AssemblyInformationalVersion("0.4.1")]
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.0
+0.4.1
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,7 +7,7 @@ configuration:
 install:
     ps: |
         $kspLibs = "Assembly-CSharp.dll", "Assembly-CSharp-firstpass.dll", "UnityEngine.dll"
-        $kspLibsUrl = "http://build.apokee.com/dependencies/ksp/0.90"
+        $kspLibsUrl = "http://build.apokee.com/dependencies/ksp/1.0"
         $kspLibsDir = "$env:APPVEYOR_BUILD_FOLDER/Library/KSP"
 
         New-Item $kspLibsDir -Type Directory -Force | Out-Null