Skip to content

Commit a840cf4

Browse files
committed
Merge branch 'release/1.4.0'
2 parents 7506f39 + 6bbc456 commit a840cf4

33 files changed

+644
-378
lines changed

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
/Library/KSP/
2-
/Library/NuGet/
3-
/Output/
4-
5-
AssemblyInfo.cs
1+
/.build/
62

73
*.suo
84
*.user

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: csharp
2+
3+
env:
4+
- BUILD_CONFIGURATION=Debug
5+
- BUILD_CONFIGURATION=Release
6+
7+
script:
8+
- ./build --configuration=$BUILD_CONFIGURATION
Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,70 @@
1+
## v1.4.0
2+
##### Changed
3+
- Context menu items have been consolidated into a single item that shows current control mode and allows you to toggle
4+
betwen them.
5+
16
## v1.3.1
2-
##### Changes
7+
##### Changed
38
- Compatability with KSP 1.1
49

510
## v1.3.0
6-
##### New
11+
##### Added
712
- Add actions to all applicables parts to change control modes, making them available to action groups. Available actions are:
813
- `Control Mode: Toggle`
914
- `Control Mode: Rocket`
1015
- `Control Mode: Plane`
1116

12-
##### Fixes
17+
##### Fixed
1318
- Fix example configuration patch to show how to actually change toggle keys.
1419

1520
## v1.2.0
16-
##### New
21+
##### Added
1722
- Add `defaultControlMode`, `defaultVabControlMode`, `defaultSphControlMode` configuration settings to control default
1823
control mode used for various situations.
1924

2025
## v1.1.0
21-
##### New
26+
##### Added
2227
- Add `KSPAssembly` attribute to assembly.
2328

24-
##### Changes
29+
##### Changed
2530
- `PLANEMODE_USER_SETTINGS` is deprecated (although still supported), a Module Manager patch should now be used to
2631
modify settings. An example patch is distributed in the `PlaneMode/Configuration` directory.
2732
- Clarified log message that made it appeared as if code was being executed more times than it was.
2833
- Simplified the way textures are loaded.
2934

30-
##### Fixes
35+
##### Fixed
3136
- Fix Plane mode settings being persisted in certain situations.
3237
- Fix the display of the log level for debug messages.
3338

3439
## v1.0.0
35-
##### Fixes
40+
##### Fixed
3641
- Initalize ControlMode to Rocket to avoid warning on vessel load
3742

3843
## v0.4.1
39-
##### Fixes
44+
##### Fixed
4045
- Kerbal Space Program v1.0 compatibility
4146

4247
## v0.4.0
43-
##### New
48+
##### Added
4449
- Added setting to disable Application Launcher (stock toolbar) button.
4550
- Docking controls are now supported.
4651

47-
##### Fixes
52+
##### Fixed
4853
- Interaction with trim controls should now be fixed.
4954
- Interaction with SAS/Autopilot should now be fixed.
5055

5156
## v0.3.0
52-
##### New
57+
##### Added
5358
- Use stock Application Launcher.
5459
- Control mode is persisted with command pods, probe cores, and docking ports. The mode used is determined by whichever
5560
part is selected with the *Control From Here* button.
5661
- Control mode is automatically selected for new parts in the editor. Parts in the VAB are placed in Rocket mode and
5762
parts in the SPH are placed in Plane mode.
5863

59-
##### Changes
64+
##### Changed
6065
- Renamed from "Aeroplane Mode" to "Plane Mode".
6166
- Settings configuration has been changed slightly and toggle and hold keys have both been defaulted to None rather
6267
than ScrollLock and Home.
6368

64-
##### Fixes
69+
##### Fixed
6570
- Handle switching vessels better.

CONTRIBUTING.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Contributing
2+
3+
## Copyright
4+
5+
All code contributions must be made under either the [MIT](LICENSE.md) license or the public domain. All non-code
6+
contributions must be made under the [CC-BY 4.0](http://creativecommons.org/licenses/by/4.0/) license or the public
7+
domain. No copyright assignment is necessary. If your contribution is not public domain add your name and contribution
8+
years to the [LICENSE](LICENSE.md) file.
9+
10+
## Building
11+
12+
In order to build the code you should have Microsoft Visual Studio installed on Windows systems or Mono installed on
13+
Linux or Mac systems.
14+
15+
- Copy `build.example.yml` to `build.yml` or `../PlaneMode.build.yml` relative to the project root.
16+
- Edit the variables `ksp_dir` and `ksp_bin` as appropriate.
17+
- From a command line shell, execute `./build` in the project root.
18+
- On Windows, you *must* use PowerShell as your command line shell.
19+
- On Linux and Mac systems `/bin/sh` must be a POSIX-compliant shell.
20+
- If the build was successful you should have a ZIP file in `.build/pkg/Debug`, packaged ready for distribution.
21+
- If you would like to deploy to and execute KSP automatically after a build use `./build run`.

NuGet.config

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<config>
4-
<add key="repositoryPath" value="Library\NuGet" />
4+
<add key="repositoryPath" value=".build\lib\nuget" />
55
</config>
6-
<solution>
7-
<add key="disableSourceControlIntegration" value="true" />
8-
</solution>
96
<packageSources>
10-
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
11-
<add key="Apokee" value="https://www.myget.org/F/apokee/" />
7+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
8+
<add key="Apokee" value="https://www.myget.org/F/apokee/api/v3/index.json" />
129
</packageSources>
1310
</configuration>

PlaneMode.netkan

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"identifier": "PlaneMode",
44
"$kref": "#/ckan/github/Apokee/PlaneMode",
55
"name": "Plane Mode",
6-
"abstract": "Swap Yaw/Roll in Flight",
6+
"abstract": "Swap yaw/roll in flight.",
77
"author": "Dwayne Bent",
88
"license": "MIT",
99
"resources": {
@@ -55,6 +55,13 @@
5555
"ksp_version_min": "1.1.0",
5656
"ksp_version_max": "1.1.2"
5757
}
58+
},
59+
{
60+
"version": ">=1.4.0",
61+
"override": {
62+
"ksp_version_min": "1.1.2",
63+
"ksp_version_max": "1.1.2"
64+
}
5865
}
5966
]
6067
}

PlaneMode.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.22823.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlaneMode", "Source\PlaneMode\PlaneMode.csproj", "{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlaneMode", "src\PlaneMode\PlaneMode.csproj", "{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

PlaneMode.sln.DotSettings

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
3+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
4+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
5+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
6+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String></wpf:ResourceDictionary>

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Plane Mode [![Build status][build-badge]][build]
1+
# Plane Mode [![AppVeyor Status][build-badge-appveyor]][build-appveyor] [![Travis CI Status][build-badge-travis]][build-travis]
22

33
**Plane Mode** is a Kerbal Space Program mod that allows you to easily swap control input for roll/yaw while in
44
flight. This is especially useful for joystick users who will typically want their joystick to control yaw for rockets
@@ -46,7 +46,9 @@ please see the Module Manager documentation for more information.
4646
This is a continuation of the [Aeroplane Mode](http://forum.kerbalspaceprogram.com/threads/90034) mod created by
4747
Phillip "Belisarius" Reiss.
4848

49-
[build]: https://ci.appveyor.com/project/Apokee/planemode/branch/develop
50-
[build-badge]: https://ci.appveyor.com/api/projects/status/nlnofph4shq6t7ic/branch/develop?svg=true
49+
[build-appveyor]: https://ci.appveyor.com/project/Apokee/planemode/branch/develop
50+
[build-travis]: https://travis-ci.org/Apokee/PlaneMode
51+
[build-badge-appveyor]: https://ci.appveyor.com/api/projects/status/nlnofph4shq6t7ic/branch/develop?svg=true
52+
[build-badge-travis]: https://api.travis-ci.org/Apokee/PlaneMode.svg?branch=develop
5153
[github-releases]: https://github.com/Apokee/PlaneMode/releases
5254
[module-manager]: http://forum.kerbalspaceprogram.com/threads/55219

Source/PlaneMode/Extensions.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)