Merge branch 'release/1.3.0'

dbent · dbent · commit ea90ae8e5318 · 2015-07-25T22:07:33.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,51 +1,61 @@
-## v1.2.0
-##### New
-- Add `defaultControlMode`, `defaultVabControlMode`, `defaultSphControlMode` configuration settings to control default
-  control mode used for various situations.
-
-## v1.1.0
-##### New
-- Add `KSPAssembly` attribute to assembly.
-
-##### Changes
-- `PLANEMODE_USER_SETTINGS` is deprecated (although still supported), a Module Manager patch should now be used to
-  modify settings.  An example patch is distributed in the `PlaneMode/Configuration` directory.
-- Clarified log message that made it appeared as if code was being executed more times than it was.
-- Simplified the way textures are loaded.
-
-##### Fixes
-- Fix Plane mode settings being persisted in certain situations.
-- Fix the display of the log level for debug messages.
-
-## v1.0.0
-##### Fixes
-- Initalize ControlMode to Rocket to avoid warning on vessel load
-
-## v0.4.1
-##### Fixes
-- Kerbal Space Program v1.0 compatibility
-
-## v0.4.0
-##### New
-- Added setting to disable Application Launcher (stock toolbar) button.
-- Docking controls are now supported.
-
-##### Fixes
-- Interaction with trim controls should now be fixed.
-- Interaction with SAS/Autopilot should now be fixed.
-
-## v0.3.0
-##### New
-- Use stock Application Launcher.
-- Control mode is persisted with command pods, probe cores, and docking ports. The mode used is determined by whichever
-  part is selected with the *Control From Here* button.
-- Control mode is automatically selected for new parts in the editor. Parts in the VAB are placed in Rocket mode and
-  parts in the SPH are placed in Plane mode.
-
-##### Changes
-- Renamed from "Aeroplane Mode" to "Plane Mode".
-- Settings configuration has been changed slightly and toggle and hold keys have both been defaulted to None rather
-  than ScrollLock and Home.
-
-##### Fixes
-- Handle switching vessels better.
+## v1.3.0
+##### New
+- Add actions to all applicables parts to change control modes, making them available to action groups. Available actions are:
+  - `Control Mode: Toggle`
+  - `Control Mode: Rocket`
+  - `Control Mode: Plane`
+
+##### Fixes
+- Fix example configuration patch to show how to actually change toggle keys.
+
+## v1.2.0
+##### New
+- Add `defaultControlMode`, `defaultVabControlMode`, `defaultSphControlMode` configuration settings to control default
+  control mode used for various situations.
+
+## v1.1.0
+##### New
+- Add `KSPAssembly` attribute to assembly.
+
+##### Changes
+- `PLANEMODE_USER_SETTINGS` is deprecated (although still supported), a Module Manager patch should now be used to
+  modify settings.  An example patch is distributed in the `PlaneMode/Configuration` directory.
+- Clarified log message that made it appeared as if code was being executed more times than it was.
+- Simplified the way textures are loaded.
+
+##### Fixes
+- Fix Plane mode settings being persisted in certain situations.
+- Fix the display of the log level for debug messages.
+
+## v1.0.0
+##### Fixes
+- Initalize ControlMode to Rocket to avoid warning on vessel load
+
+## v0.4.1
+##### Fixes
+- Kerbal Space Program v1.0 compatibility
+
+## v0.4.0
+##### New
+- Added setting to disable Application Launcher (stock toolbar) button.
+- Docking controls are now supported.
+
+##### Fixes
+- Interaction with trim controls should now be fixed.
+- Interaction with SAS/Autopilot should now be fixed.
+
+## v0.3.0
+##### New
+- Use stock Application Launcher.
+- Control mode is persisted with command pods, probe cores, and docking ports. The mode used is determined by whichever
+  part is selected with the *Control From Here* button.
+- Control mode is automatically selected for new parts in the editor. Parts in the VAB are placed in Rocket mode and
+  parts in the SPH are placed in Plane mode.
+
+##### Changes
+- Renamed from "Aeroplane Mode" to "Plane Mode".
+- Settings configuration has been changed slightly and toggle and hold keys have both been defaulted to None rather
+  than ScrollLock and Home.
+
+##### Fixes
+- Handle switching vessels better.
diff --git a/Configuration/UserSettings.cfg.example b/Configuration/UserSettings.cfg.example
@@ -1,26 +1,26 @@
 // This is an example file for how to modify PlaneMode's configuration using a Module Manager patch.
 // Remove the `.example` from the end of the filename and uncomment lines for settings you wish to change.
 
-@PLANEMODE:NEEDS[PlaneMode]
+@PLANEMODE:NEEDS[PlaneMode]:AFTER[PlaneMode]
 {
     // Key to toggle control mode
     // Set `primary` to one of the KeyCodes specified here: http://docs.unity3d.com/ScriptReference/KeyCode.html
     //@TOGGLE_CONTROL_MODE
     //{
-    //    primary = None
-    //    secondary = None
-    //    group = 0
-    //    switchState = Any
+    //    @primary = None
+    //    @secondary = None
+    //    @group = 0
+    //    @switchState = Any
     //}
 
     // Key to temporarily toggle control mode
     // Set `primary` to one of the KeyCodes specified here: http://docs.unity3d.com/ScriptReference/KeyCode.html
     //@HOLD_CONTROL_MODE
     //{
-    //    primary = None
-    //    secondary = None
-    //    group = 0
-    //    switchState = Any
+    //    @primary = None
+    //    @secondary = None
+    //    @group = 0
+    //    @switchState = Any
     //}
 
     // Set true to invert pitch in plane mode
diff --git a/README.md b/README.md
@@ -32,7 +32,8 @@ The control mode is stored with command pods, probe cores, and docking ports. Th
 whether the part was created in the VAB (Rocket) or SPH (Plane). Existing parts in flight will default to Rocket mode.
 The part used is determined by which is selected by the *Control From Here* button. You can toggle the control mode of
 a part by right clicking on it in the editor or in flight and press *Toggle Control Mode*. Pressing the Application
-Launcher button will also toggle the control mode of the current controlling part.
+Launcher button will also toggle the control mode of the current controlling part. Actions are also available for use
+in action groups to toggle the control mode or switch to a specific mode.
 
 ## Configuration
 
diff --git a/Source/PlaneMode/ModulePlaneMode.cs b/Source/PlaneMode/ModulePlaneMode.cs
@@ -125,6 +125,24 @@ public void ToggleControlMode()
             Log.Trace("Leaving ModulePlaneMode.ToggleControlMode()");
         }
 
+        [KSPAction("Control Mode: Toggle")]
+        public void ActionToggleControlMode(KSPActionParam p)
+        {
+            ToggleControlMode();
+        }
+
+        [KSPAction("Control Mode: Rocket")]
+        public void ActionSetRocketControlMode(KSPActionParam p)
+        {
+            SetControlMode(ControlMode.Rocket);
+        }
+
+        [KSPAction("Control Mode: Plane")]
+        public void ActionSetPlaneControlMode(KSPActionParam p)
+        {
+            SetControlMode(ControlMode.Plane);
+        }
+
         public void SetControlMode(ControlMode controlMode)
         {
             Log.Trace("Entering ModulePlaneMode.SetControlMode()");
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2015 RC
+os: Visual Studio 2015
 version: "{build}"
 
 configuration:
diff --git a/packages.config b/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Apokee.Artwork" version="0.2.0" />
-  <package id="Cake" version="0.4.3" />
+  <package id="Cake" version="0.5.0" />
   <package id="YamlDotNet" version="3.6.1" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-os: Visual Studio 2015 RC`
	`1`	`+os: Visual Studio 2015`
`2`	`2`	`version: "{build}"`
`3`	`3`
`4`	`4`	`configuration:`