Merge pull request #90 from DMagic1/dev

V9 rc2

README.md

@@ -491,7 +491,7 @@ sneaky then they can of course be sneaky.
 [SCANsat:rel-readme]: https://github.com/S-C-A-N/SCANsat/#table-of-contents
 
 [SCANsat:rel-thread]: http://forum.kerbalspaceprogram.com/threads/80369
-[SCANsat:dev-thread]: http://forum.kerbalspaceprogram.com/threads/80661
+[SCANsat:dev-thread]: http://forum.kerbalspaceprogram.com/threads/96859
 
 [SCANsat:dev-source]: https://github.com/S-C-A-N/SCANsat/tree/dev
 [SCANsat:rel-source]: https://github.com/S-C-A-N/SCANsat

SCANassets/Resources/SCANresource.cfg

@@ -0,0 +1,79 @@
+//Config nodes for SCANsat resource scanners
+
+//The name fields must match the resource name exactly
+
+//Do Not overwrite or use identical SCANtype values
+
+//SCANtype values below 64 are reserved for SCANsat
+//sensors and can't be assigned
+
+SCANSAT_SENSOR
+{
+	name = Kethane
+	SCANtype = 64 //2^6
+	ColorEmpty = 0.1858824, 0.3105883, 0.1929412
+	ColorFull = 0.08235294, 0.6901961, 0.1019608
+}
+SCANSAT_SENSOR
+{
+	name = Ore
+	SCANtype = 128 //2^7
+	ColorEmpty = 0.729411765, 0.592156863, 0.498039216
+	ColorFull = 1.0, 0.415686275, 0.0
+}
+SCANSAT_SENSOR
+{
+	name = Uranium
+	SCANtype = 1024 //2^10
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Thorium
+	SCANtype = 2048 //2^11
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Alumina
+	SCANtype = 4096 //2^12
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Water
+	SCANtype = 8192 //2^13
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Aquifer
+	SCANtype = 16384 //2^14
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Minerals
+	SCANtype = 32768 //2^15
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Substrate
+	SCANtype = 65536 //2^16
+	ColorEmpty = 0.9372549, 0.827451, 0.9058823
+	ColorFull = 0.6117647, 0.1098039, 0.4196078
+}
+SCANSAT_SENSOR
+{
+	name = Karbonite
+	SCANtype = 262144 //2^18
+	ColorEmpty = 1.0, 0.8, 0.2
+	ColorFull = 0.8117647, 0.3254902, 0.0
+}

SCANassets/SCANsat.version

@@ -11,7 +11,7 @@
          "MAJOR":1,
          "MINOR":0,
          "PATCH":9,
-         "BUILD":1
+         "BUILD":2
      },
      "KSP_VERSION":{
          "MAJOR":0,

SCANsat.sln

@@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCANdebug", "SCANdebug\SCAN
 EndProject
 Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "SCANassets", "SCANassets\SCANassets.mdproj", "{0B3343ED-6E2B-489D-9F53-4CF850ABF30D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCANsatkethane", "SCANsatkethane\SCANsatkethane.csproj", "{D8A3AB10-98E0-48AC-8A27-117C88CBD5BA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCANsat", "SCANsat\SCANsat.csproj", "{3AE13948-477D-4375-8AB4-B45664966D9E}"
 EndProject
 Global

SCANsat/CHANGELOG.txt

@@ -1,3 +1,22 @@
+Version 9.2 - 2014-10-26
+------------------------
+
+- Color selection and management window added
+	- Select from a variety of color palettes
+	- Manage map options for each individual planet
+	- Default colore palett, height range, and other options added for each planet
+
+- Settings and Color Management window buttons added to KSC Map window
+
+- Numerous checks added to prevent errors caused by Scenario Module or SCANdata loading problems
+	- Several changes made to saving and loading process - Make backups
+	- Less log spam on scenario module failure
+
+- Internal changes to SCANdata and SCANcontroller classes
+	- End user result should be similar; bugs may exist
+	- Data only loaded on first visit to a planet, rather than all at once; does not affect existing saves
+	- All explicit external interfaces should be unaffected
+
 Version 9 - 2014-10-14
 ------------------------