Merge branch 'develop'

Author: Dunbaratu

CHANGELOG.md

@@ -1,4 +1,4 @@
-####INDEX
+#### INDEX
 * [Pull Requests](#pull-requests)
   * [Nobody merges their own PR](#nobody-merges-their-own-pr)
 * [Setting Up Your Environment](#setting-up-your-environment)
@@ -78,6 +78,7 @@ Setting Up Your Environment
 ===========================
 
 ## Assumptions
+
 * `$KSP` is the full path to your Kerbal Space Program installation directory.
   (i.e. `"C:\Program Files (x86)\Steam\SteamApps\common\Kerbal Space Program"`)
 * `$KOS` is the full path to your KOS git repository.
@@ -88,6 +89,7 @@ Setting Up Your Environment
   .sln solution.
 
 ## Setting Up Your repository
+
 1. Use the github web interface to create a fork of KSP-KOS/KOS
 
 2. Your fork should have a web address like `https://github.com/[username]/KOS`
@@ -161,7 +163,7 @@ Setting Up Your Environment
 
 2. Get the Unity assemblies into your project. There are two options:
 
-	1. Copy these DLLs from `$KSP/KSP_x64_Data/Managed `into `$KOS/Resources`:
+	1. Copy these DLLs from `$KSP/KSP_x64_Data/Managed `into `$KOS/Resources` (NB: see note below about assemblies/DLLs):
 
 		* `Assembly-CSharp`
 		* `Assembly-CSharp-firstpass`
@@ -230,3 +232,11 @@ place on the menus.)
 5. If you want building the solution to update the dlls in your KSP
    directory, create a symbolic link called `KSPdirlink` from the root
    of this repository to your KSP installation directory.
+
+**Note**: the list of assemblies above is not necessarily exactly what you will need. The `UnityEngine.ImageConversionModule` assembly for example only exists on the macOS port of KSP.
+
+You can build the list of assemblies yourself by building the kOS solution and looking for the "forwarded to assembly" errors. These errors should look something like this:
+
+> …/KOS/src/kOS/Binding/FlightStats.cs(143,143): Error CS1069: The type name 'Rigidbody' could not be found in the namespace 'UnityEngine'. This type has been forwarded to assembly 'UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null' Consider adding a reference to that assembly. (CS1069) (kOS),
+
+In this case the assembly you are looking for is `UnityEngine.PhysicsModule` which should be provided in the `UnityEngine.PhysicsModule.dll` DLL file.

CONTRIBUTING.md

@@ -25,7 +25,7 @@ PART
     minimum_drag = .002
     angularDrag = 2
     crashTolerance = 9
-    maxTemp = 2400
+    maxTemp = 2000
     MODULE
     {
         name = ModuleLight

Resources/GameData/kOS/Parts/KOSCherryLight/part.cfg

@@ -39,7 +39,7 @@ maximum_drag = 0.2
 minimum_drag = 0.2
 angularDrag = 2
 crashTolerance = 9
-maxTemp = 3400
+maxTemp = 1500
 
 MODULE
 {

Resources/GameData/kOS/Parts/kOSMachine0m/part.cfg

@@ -45,7 +45,7 @@ PART
 	minimum_drag = 0.2
 	angularDrag = 2
 	crashTolerance = 9
-	maxTemp = 3400
+	maxTemp = 2000
 
 	MODULE
 	{

Resources/GameData/kOS/Parts/kOSMachine0mLegacy/part.cfg

@@ -39,7 +39,7 @@ maximum_drag = 0.2
 minimum_drag = 0.2
 angularDrag = 2
 crashTolerance = 9
-maxTemp = 3400
+maxTemp = 2000
 
 MODULE
 {

Resources/GameData/kOS/Parts/kOSMachine1m/part.cfg

@@ -37,7 +37,7 @@ maximum_drag = 0.0
 minimum_drag = 0.0
 angularDrag = 0
 crashTolerance = 6
-maxTemp = 3400
+maxTemp = 1500
 
 
 MODULE

Resources/GameData/kOS/Parts/kOSMachineRad/part.cfg

@@ -36,7 +36,7 @@ maximum_drag = 0
 minimum_drag = 0
 angularDrag = 0
 crashTolerance = 9
-maxTemp = 3400
+maxTemp = 1500
 
 MODULE
 {

Resources/GameData/kOS/Parts/kOSkal9000/part.cfg

@@ -1,7 +1,47 @@
-@PART[*]:FOR[kOS]
+//
+// ADD the KOSNameTag to all parts in the game.
+//
+//    THE FOLLOWING EXPLANATION IS FOR ISSUE #2764
+//
+// The "[!KOSNameTag]" rule below attempted to prevent duplicates
+// in a part, but it doesn't entirely succeed at that in the
+// case of KerbalEVA parts if the installation has all the DLCs,
+// due to a wacky messy way SQUAD implemented the alternate
+// kerbal types (with or without vintage suits, with or without
+// the ability to plant ground science, etc).  SQUAD implements
+// them as entirely different kerbal parts, then smashes their
+// definitions together later after Modulemanager is done.
+// ModuleManager is helpless to notice the duplication that will
+// cause because they were two *different* parts when it was looking
+// at them.
+//
+// Therefore there is extra code inside kOS's C# code to additionally
+// enforce the "no more than one KOSNameTag" rule, in its OnAwake().
+// You *cannot* force more than one KOSNameTag to exist in a part
+// no matter what you do in ModuleManager now, because KOSNameTag
+// itself refuses to allow it.
+//
+@PART[*]:FOR[kOS]:HAS[!KOSNameTag]
 {
 	MODULE
 	{
 		name = KOSNameTag
 	}
-}
+}
+
+//
+// The following is commented out because it was an alternate possible
+// fix to #2764 that @Poodmund worked on for me, and even though I'm not
+// going with it, it's saved here for reference to look at later should
+// we change our mind and want to go to this instead:
+//
+// (In a nutshell, this removes the extra KOSNameTag PartModules from
+// those specfic part definitions in the known specific DLC folders
+// that trigger this exact problem, rather than creating a generic
+// solution that says "there can be only one, ever"):
+//
+// @PART[kerbalEV*]:HAS[~name[*Future],@MODULE[ModuleScienceExperiment]:HAS[#experimentID[ROCScience]]]:AFTER[kOS]
+// {
+//    !MODULE[KOSNameTag]{}
+// }
+//

Resources/GameData/kOS/kOS-module-manager.cfg

@@ -10,23 +10,23 @@
   },
   "VERSION": {
     "MAJOR": 1,
-    "MINOR": 2,
-    "PATCH": 1,
+    "MINOR": 3,
+    "PATCH": 0,
     "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 10,
     "PATCH": 1
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 10,
     "PATCH": 0
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
-    "MINOR": 9,
-    "PATCH": 1 
+    "MINOR": 11,
+    "PATCH": 99
   }
 }