Merge pull request #227 from ihsoft/next-1.0

Release 1.0RC1

CHANGELOG.md

@@ -0,0 +1,2 @@
+# 1.0 (July 24th, 2018):
+* [Change] A completely new KAS implementation comes LIVE!

KAS.netkan

@@ -2,22 +2,21 @@
     "spec_version"    : 1,
     "name"            : "Kerbal Attachment System",
     "identifier"      : "KAS",
-    "download"        : "https://kerbal.curseforge.com/projects/kerbal-attachment-system-kas/files/2336078/download",
-    "abstract"        : "KAS introduces new gameplay mechanics by adding winches, containers, dynamic struts/pipes and grabbable & attachable parts.",
+    "abstract"        : "KAS introduces new gameplay mechanics by adding winches, struts, and pipes. Now you can easily connect vessels in EVA without docking them!",
     "resources"       : {
         "homepage": "http://forum.kerbalspaceprogram.com/index.php?/topic/142594-kerbal-attachment-system-kas/",
         "repository": "https://github.com/ihsoft/KAS",
         "bugtracker": "https://github.com/ihsoft/KAS/issues"
     },
     "recommends"      : [
-        { "name": "ModuleManager" }
         { "name": "KIS" }
-        { "name": "CommunityCategoryKit" },
     ],
     "suggests"        : [
         { "name": "EasyVesselSwitch" }
     ],
-    "license"         : "restricted",
-    "author"          : [ "IgorZ", "KospY", "Winn75", "zzz", "Majiir", "a.g." ],
-    "$vref"           : "#/ckan/ksp-avc"
+    "license"         : "public-domain",
+    "author"          : [ "IgorZ" ],
+    "$vref"           : "#/ckan/ksp-avc",
+    "$kref"           : "#/ckan/curse/223900",
+    "x_netkan_version_edit" : "^v(?<version>.+)$"
 }

KAS-1.0.version → KAS.version

@@ -14,12 +14,12 @@
         "MINOR": 4, 
         "PATCH": 0
     }, 
-    "NAME": "KAS-1.0", 
+    "NAME": "KAS", 
     "URL": "https://raw.githubusercontent.com/ihsoft/KAS/KAS-v1.0/KAS-1.0.version", 
     "VERSION": {
-        "BUILD": 35927, 
+        "BUILD": 40801, 
         "MAJOR": 1, 
         "MINOR": 0, 
-        "PATCH": 6764
+        "PATCH": 6779
     }
 }

LEGACY/LICENSE.md

@@ -0,0 +1,19 @@
+**Copyright Overview**
+
+- Models and textures of connector, ports, winches and magnet parts was created by Winn75, who retains the copyright.
+- Models and textures of containers, bays, strut, pipe and pylon was created by zzz, who retains the copyright.
+- Models for all remaining parts were created by KospY, who retains the copyrights.
+- Config files, shaders, source code and compiled binaries are under copyright retained by KospY.
+
+
+**YOU MAY :**
+
+- Distribute your own parts using any part modules included in KAS.
+- Distribute fixes in case of a compatibility problem with a new version of KSP (.dll only).
+- Distribute video, screenshots or other media portraying unmodified versions of KAS in action.
+- Distribute modified or unmodified versions of the KAS plugin source code on condition that a link to this license is - included.
+- Modify KAS in any way for personal use.
+- Request a waiver of any of these terms.
+
+
+**All other rights are reserved.**

Parts.legacy/cPort1/part.cfg → LEGACY/Parts/cPort1/part.cfg

@@ -54,6 +54,6 @@ PART
 		tubeTgtType = Joined
 		evaStrutPos = (0.05, 0.059, -0.21)
 		evaStrutRot = (190.0, 0.0, 0.0)
-		tubeTexPath = KAS/Textures/pipe
+		tubeTexPath = KAS/LEGACY/Textures/pipe
 	}
 }

Parts.legacy/strut1/part.cfg → LEGACY/Parts/strut1/part.cfg

@@ -43,6 +43,6 @@ PART
 		textureTiling = 4
 		evaStrutPos = (0.05, 0.059, -0.21)
 		evaStrutRot = (190.0, 0.0, 0.0)
-		tubeTexPath = KAS/Textures/strut
+		tubeTexPath = KAS/LEGACY/Textures/strut
 	}
 }

README.md → LEGACY/README.md

@@ -1,3 +1,9 @@
+!!!! DEPRECATED !!!!
+This is a legacy mod version. The 1.0+ versions has substituted the original design.
+However, the new version is not compatible with the pre 1.0 versions.
+
+No support is offered for this version.
+
 # KAS - Kerbal Attachment System
 #### Mod for [Kerbal Space Program](http://www.kerbalspaceprogram.com/)
 

Plugins/Source/KAS.csproj → LEGACY/Source/KAS-LEGACY.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C3F73CD0-32DC-4FD4-9615-37C2751A25B8}</ProjectGuid>
+    <ProjectGuid>{74B6EEAB-5B63-49EB-B13B-72120A8FCB4F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KAS</RootNamespace>
@@ -34,24 +34,17 @@
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
       <HintPath>Q:\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>Q:\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="KSPDev_Utils">
-      <HintPath>..\KSPDev_Utils.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="UnityEngine">
       <HintPath>Q:\KSP_Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UI">
       <HintPath>Q:\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
-      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>Q:\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -72,7 +65,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF EXIST "Q:\GameData\KIS" xcopy "$(TargetPath)" "Q:\GameData\KAS\Plugins\" /Y</PostBuildEvent>
+    <PostBuildEvent>IF EXIST "Q:\GameData\KIS" xcopy "$(TargetPath)" "Q:\GameData\KAS\LEGACY\Plugins\" /Y</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Plugins/Source/KASAddonControlKey.cs → LEGACY/Source/KASAddonControlKey.cs

@@ -45,7 +45,7 @@ public void Update() {
   }
 
   public static void LoadKeyConfig() {
-    var node = ConfigNode.Load(KSPUtil.ApplicationRootPath + "GameData/KAS/settings-legacy.cfg")
+    var node = ConfigNode.Load(KSPUtil.ApplicationRootPath + "GameData/KAS/LEGACY/settings.cfg")
         ?? new ConfigNode();
     foreach (ConfigNode winchNode in node.GetNodes("WinchModule")) {
       if (winchNode.HasValue("grabConnectorKey")) {

Plugins/Source/KASModuleHarpoon.cs → LEGACY/Source/KASModuleHarpoon.cs

@@ -15,10 +15,10 @@ public class KASModuleHarpoon : KASModuleAttachCore {
   [KSPField] public float aboveDist = 0f;
 
   //Sounds
-  [KSPField] public string attachStaticSndPath = "KAS/Sounds/grappleAttachStatic";
-  [KSPField] public string attachPartSndPath = "KAS/Sounds/grappleAttachPart";
-  [KSPField] public string attachEvaSndPath = "KAS/Sounds/grappleAttachEva";
-  [KSPField] public string detachSndPath = "KAS/Sounds/grappleDetach";
+  [KSPField] public string attachStaticSndPath = "KAS/LEGACY/Sounds/grappleAttachStatic";
+  [KSPField] public string attachPartSndPath = "KAS/LEGACY/Sounds/grappleAttachPart";
+  [KSPField] public string attachEvaSndPath = "KAS/LEGACY/Sounds/grappleAttachEva";
+  [KSPField] public string detachSndPath = "KAS/LEGACY/Sounds/grappleDetach";
 
   //Info
   [KSPField(guiActive = true, guiName = "State", guiFormat = "S")]

Plugins/Source/KASModuleMagnet.cs → LEGACY/Source/KASModuleMagnet.cs

@@ -19,15 +19,15 @@ public class KASModuleMagnet : KASModuleAttachCore {
 
   //Sounds
   [KSPField]
-  public string attachSndPath = "KAS/Sounds/magnetAttach";
+  public string attachSndPath = "KAS/LEGACY/Sounds/magnetAttach";
   [KSPField]
-  public string detachSndPath = "KAS/Sounds/magnetDetach";
+  public string detachSndPath = "KAS/LEGACY/Sounds/magnetDetach";
   [KSPField]
-  public string magnetSndPath = "KAS/Sounds/magnet";
+  public string magnetSndPath = "KAS/LEGACY/Sounds/magnet";
   [KSPField]
-  public string magnetStartSndPath = "KAS/Sounds/magnetstart";
+  public string magnetStartSndPath = "KAS/LEGACY/Sounds/magnetstart";
   [KSPField]
-  public string magnetStopSndPath = "KAS/Sounds/magnetstop";
+  public string magnetStopSndPath = "KAS/LEGACY/Sounds/magnetstop";
 
   public FXGroup fxSndAttach, fxSndDetach, fxSndMagnet, fxSndMagnetStart, fxSndMagnetStop;
 

Plugins/Source/KASModulePhysicChild.cs → LEGACY/Source/KASModulePhysicChild.cs

@@ -89,15 +89,15 @@ void OnPartUnpack() {
     }
   }
 
-  /// <summary>Overriden from MonoBehaviour.</summary>
+  /// <summary>Overriden from MonoBehavior.</summary>
   void OnDestroy() {
     KAS_Shared.DebugLog("OnDestroy(PhysicChild)");
     if (physicObjRb != null) {
       StopPhysics();
     }
   }
 
-  /// <summary>Overriden from MonoBehaviour.</summary>
+  /// <summary>Overriden from MonoBehavior.</summary>
   void FixedUpdate() {
     if (physicObjRb != null && !physicObjRb.isKinematic) {
       physicObjRb.AddForce(vessel.precalc.integrationAccel, ForceMode.Acceleration);

Plugins/Source/KASModulePort.cs → LEGACY/Source/KASModulePort.cs

@@ -21,13 +21,13 @@ public class KASModulePort : KASModuleAttachCore {
 
   //Sounds
   [KSPField]
-  public string plugSndPath = "KAS/Sounds/plug";
+  public string plugSndPath = "KAS/LEGACY/Sounds/plug";
   [KSPField]
-  public string unplugSndPath = "KAS/Sounds/unplug";
+  public string unplugSndPath = "KAS/LEGACY/Sounds/unplug";
   [KSPField]
-  public string plugDockedSndPath = "KAS/Sounds/plugdocked";
+  public string plugDockedSndPath = "KAS/LEGACY/Sounds/plugdocked";
   [KSPField]
-  public string unplugDockedSndPath = "KAS/Sounds/unplugdocked";
+  public string unplugDockedSndPath = "KAS/LEGACY/Sounds/unplugdocked";
 
   [KSPField(isPersistant = true)]
   public bool plugged = false;

Plugins/Source/KASModuleStrut.cs → LEGACY/Source/KASModuleStrut.cs

@@ -33,13 +33,13 @@ public class KASModuleStrut : KASModuleAttachCore {
   [KSPField]
   public bool hasCollider = false;
   [KSPField]
-  public string tubeTexPath = "KAS/Textures/strut";
+  public string tubeTexPath = "KAS/LEGACY/Textures/strut";
   [KSPField]
-  public string sndLinkPath = "KAS/Sounds/strutBuild";
+  public string sndLinkPath = "KAS/LEGACY/Sounds/strutBuild";
   [KSPField]
-  public string sndUnlinkPath = "KAS/Sounds/strutRemove";
+  public string sndUnlinkPath = "KAS/LEGACY/Sounds/strutRemove";
   [KSPField]
-  public string sndBrokePath = "KAS/Sounds/broke";
+  public string sndBrokePath = "KAS/LEGACY/Sounds/broke";
   [KSPField]
   public Vector3 evaStrutPos = new Vector3(0f, 0.03f, -0.24f);
   [KSPField]

Plugins/Source/KASModuleWinch.cs → LEGACY/Source/KASModuleWinch.cs

@@ -54,19 +54,19 @@ public class KASModuleWinch : KASModuleAttachCore, IJointLockState {
 
   //Sounds & texture
   [KSPField]
-  private string cableTexPath = "KAS/Textures/cable";
+  private string cableTexPath = "KAS/LEGACY/Textures/cable";
   [KSPField]
-  private string motorSndPath = "KAS/Sounds/winchSmallMotor";
+  private string motorSndPath = "KAS/LEGACY/Sounds/winchSmallMotor";
   [KSPField]
-  private string motorStartSndPath = "KAS/Sounds/winchSmallMotorStart";
+  private string motorStartSndPath = "KAS/LEGACY/Sounds/winchSmallMotorStart";
   [KSPField]
-  private string motorStopSndPath = "KAS/Sounds/winchSmallMotorStop";
+  private string motorStopSndPath = "KAS/LEGACY/Sounds/winchSmallMotorStop";
   [KSPField]
-  private string headLockSndPath = "KAS/Sounds/winchSmallLock";
+  private string headLockSndPath = "KAS/LEGACY/Sounds/winchSmallLock";
   [KSPField]
-  private string ejectSndPath = "KAS/Sounds/winchSmallEject";
+  private string ejectSndPath = "KAS/LEGACY/Sounds/winchSmallEject";
   [KSPField]
-  public string headGrabSndPath = "KAS/Sounds/grab";
+  public string headGrabSndPath = "KAS/LEGACY/Sounds/grab";
 
   [KSPField(guiActive = true, guiName = "Key control", guiFormat = "S")]
   public string controlField = "";

Plugins/Source/Properties/AssemblyInfo.cs → LEGACY/Source/Properties/AssemblyInfo.cs

@@ -32,6 +32,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("0.6.3")]
-[assembly: AssemblyInformationalVersion("0.6.3 for KSP 1.3")]
+[assembly: AssemblyVersion("0.6.4.*")]
+[assembly: AssemblyInformationalVersion("0.6.4 for KSP 1.4+")]
 [assembly: KSPAssembly("KAS", 0, 6)]

changelog.md → LEGACY/changelog.md

@@ -1,18 +1,17 @@
-# 1.0 (June 23rd, 2017):
-* [Fix #204] Link status is not restored on load.
-* [Fix #205] Bad link state doesn't restore on load.
-* [Fix #206] TJ-2 applies momentum on the vessel when linked.
-
-# 0.7.4 (May 26th, 2017):
-* [Enhancement] A brand new model for CH-1.
-* [Enhancement] PCB-1 cable now has a head that plugs into CH-1 model.
-* KSP 1.3 support.
-
-# 0.7.3 (Februare 4th, 2017):
-* [Enhancement] Add cable joint parts PCB-1 and CH-1.
-* [Change] Rename module: `KASModuleInteractiveJointSource` to `KASModuleInteractiveLinkSource`.
-* [Change] Rename module: `KASModuleTelescopicPipeStrut` to `KASModuleTelescopicPipeModel`.
-* [Fix #190] KAS 1.0: Bring back collider for the clutches.
+### 0.6.4 (March 8h, 2018)
+- KSP 1.4 support.
+
+### 0.6.3 (May 26th, 2017)
+- [Fix] Show detach button when harpooned to a part (asmigala).
+- [Change] Support a new format of the `OnKISAction` parameter.
+- KSP 1.3 support.
+
+### 0.6.2 (December 26th, 2016)
+- [Fix #191] Unable to use winch with attached in VAB parts with wheels.
+
+### 0.6.1 (December 5th, 2016)
+- [Fix #194] Ground pylon part is not visible in editor.
+- [Fix #195] Put more parts into EVA items filter.
 
 ### 0.6.0 (October 12th, 2016)
 - [Enhancement] KSP 1.2 support