Skip to content

Commit

Permalink
Merge pull request #258 from ihsoft/next
Browse files Browse the repository at this point in the history
KIS v1.12
  • Loading branch information
ihsoft authored May 7, 2018
2 parents 31d8217 + 9e69995 commit 40d8b1b
Show file tree
Hide file tree
Showing 15 changed files with 307 additions and 94 deletions.
Binary file removed Binaries/KSPDev_Utils.0.31.dll
Binary file not shown.
Binary file added Binaries/KSPDev_Utils.0.33.dll
Binary file not shown.
356 changes: 285 additions & 71 deletions Binaries/KSPDev_Utils.0.31.xml → Binaries/KSPDev_Utils.0.33.xml

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.12 (May 6th, 2018):
* [Fix #257] Helmet doesn't remove on the female kerbal models.
* [Change] Upgrade to KSPDev Utils v0.33.

# 1.11 (March 26th, 2018):
* [Fix #248] Broken inventory for the new DLC suits.
* [Fix #252] Allow setting type of the inventory via config.
Expand Down
Binary file removed Deps/ModuleManager.3.0.5.dll
Binary file not shown.
Binary file added Deps/ModuleManager.3.0.6.dll
Binary file not shown.
6 changes: 3 additions & 3 deletions KIS.version
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"NAME": "Kerbal Inventory System",
"URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version",
"VERSION": {
"BUILD": 38842,
"BUILD": 37736,
"MAJOR": 1,
"MINOR": 11,
"PATCH": 6659
"MINOR": 12,
"PATCH": 6700
}
}
4 changes: 2 additions & 2 deletions Source/KIS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<HintPath>Q:\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="KSPDev_Utils.0.31">
<HintPath>..\Binaries\KSPDev_Utils.0.31.dll</HintPath>
<Reference Include="KSPDev_Utils.0.33">
<HintPath>..\Binaries\KSPDev_Utils.0.33.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions Source/KISAddonConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ sealed class KISAddonConfig : MonoBehaviour {
public readonly static List<string> stackableModules = new List<string>();

[PersistentField("Global/breathableAtmoPressure")]
public readonly static float breathableAtmoPressure = 0.5f;
public static float breathableAtmoPressure = 0.5f;

[PersistentField("EvaInventory")]
readonly static PersistentConfigNode evaInventory = new PersistentConfigNode();

[PersistentField("EvaPickup")]
readonly static PersistentConfigNode evaPickup = new PersistentConfigNode();

Expand Down
2 changes: 1 addition & 1 deletion Source/KISAddonPointer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ static void MakePointer() {
//TODO: When there are no nodes try finding ones in the parent or in the children.
// Ideally, the caller should have checked if this part has free nodes. Now the only
// way is to pick *any* node. The surface one always exists so, it's a good
// candidate. Though, for many details it may result in a weird representation.
// candidate. However, for many details it may result in a weird representation.
DebugEx.Error(
"Part {0} has no free nodes, use {1}", partToAttach, partToAttach.srfAttachNode);
attachNodes.Add(partToAttach.srfAttachNode);
Expand Down
7 changes: 1 addition & 6 deletions Source/KIS_Shared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -588,14 +588,9 @@ public static ConfigNode GetBaseConfigNode(PartModule partModule) {

/// <summary>Returns a rotation for the attach node.</summary>
/// <param name="attachNode">A node to get orientation from.</param>
/// <param name="mirrorZ">If <c>true</c> then Z axis in the node's orientation will be mirrored.
/// E.g. <c>(1, 1, 1)</c> will be translated into <c>(1, 1, -1)</c>.</param>
/// <returns>Rotation quaternion.</returns>
public static Quaternion GetNodeRotation(AttachNode attachNode, bool mirrorZ = false) {
public static Quaternion GetNodeRotation(AttachNode attachNode) {
var orientation = attachNode.orientation;
if (mirrorZ) {
orientation.z = -orientation.z;
}
return Quaternion.LookRotation(orientation);
}

Expand Down
4 changes: 2 additions & 2 deletions Source/MainScreenTweaker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public class ModelTweak {

/// <summary>Tells if tweaks should be applied.</summary>
[PersistentField("MainScreenTweaker/enabled")]
public readonly bool twekerEnabled = false;
public bool twekerEnabled = false;

/// <summary>Tells if all object paths in the scene needs to be logged.</summary>
/// <remarks>Only enable it to get the full hierarchy dump.</remarks>
[PersistentField("MainScreenTweaker/logAllObjects")]
public readonly bool logAllObjects = false;
public bool logAllObjects = false;

/// <summary>Full list of configured tweaks on the screan.</summary>
[PersistentField("MainScreenTweaker/modelTweak", isCollection = true)]
Expand Down
2 changes: 1 addition & 1 deletion Source/ModuleKISInventory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ public bool SetHelmet(bool active, bool checkAtmo = false) {
// Disable helmet and visor.
var helmet = Hierarchy.FindTransformByPath(part.transform, "**/helmet*");
if (helmet != null) {
HostedDebugLog.Fine(this, "Disable helmet renderers and lights on {0}", part);
HostedDebugLog.Fine(this, "Set helmet renderers and lights to {0} on {1}", active, part);
helmet.GetComponentsInChildren<Renderer>(includeInactive: true)
.ToList()
.ForEach(r => r.enabled = active);
Expand Down
6 changes: 3 additions & 3 deletions Source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,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: AssemblyVersion("1.11.*")]
[assembly: AssemblyInformationalVersion("1.11 for KSP 1.4")]
[assembly: KSPAssembly("KIS", 1, 11)]
[assembly: AssemblyVersion("1.12.*")]
[assembly: AssemblyInformationalVersion("1.12 for KSP 1.4")]
[assembly: KSPAssembly("KIS", 1, 12)]
6 changes: 3 additions & 3 deletions Source/UISounds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ namespace KIS {

static class UISounds {
/// <summary>Sound to play when user chosen action cannot be acomplished.</summary>
static readonly string bipWrongSndPath = "KIS/Sounds/bipwrong";
static string bipWrongSndPath = "KIS/Sounds/bipwrong";
/// <summary>Sound to play when click action is successfully handled.</summary>
static readonly string clickSndPath = "KIS/Sounds/click";
static string clickSndPath = "KIS/Sounds/click";
/// <summary>Sound to play when mechanican screedriver has done the job.</summary>
static readonly string attachPartSndPath = "KIS/Sounds/attachScrewdriver";
static string attachPartSndPath = "KIS/Sounds/attachScrewdriver";

/// <summary>Plays a sound to indicate the last user action hasn't succeeded.</summary>
public static void PlayBipWrong() {
Expand Down

0 comments on commit 40d8b1b

Please sign in to comment.