Skip to content

Commit

Permalink
Merge pull request #221 from DMagic1/release
Browse files Browse the repository at this point in the history
Version 16.2
  • Loading branch information
DMagic1 authored Jun 21, 2016
2 parents 85561ef + 7c51418 commit 378b56c
Show file tree
Hide file tree
Showing 43 changed files with 563 additions and 318 deletions.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Advanced.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Basic.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Colors.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Colors_Biome.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Colors_Resources.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Colors_Slope.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Colors_Terrain.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Features.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Header.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Intro.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Parts.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_RPM.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Resource_Overlay.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Resource_Parts.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Resource_Settings.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Resource_Tools.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/SCANsat_Resources.prefab
Binary file not shown.
Binary file modified SCANassets/Resources/KSPedia/scansat.ksp
Binary file not shown.
77 changes: 64 additions & 13 deletions SCANassets/Resources/SCANcolors.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ SCAN_Color_Config
stockBiomeMap = False
biomeBorder = True
slopeCutoff = 1
windowScale = 1
bottomLowSlopeColor = 0.004705883,0.6,0.3788235,1
bottemHighSlopeColor = 0.9764706,1,0.4627451,1
topLowSlopeColor = 0.9764706,1,0.4627451,1
topHighSlopeColor = 0.94,0.2727843,0.007372549,1
windowScale = 1
SCANsat_Altimetry
{
Item
Expand All @@ -25,6 +25,9 @@ SCAN_Color_Config
minHeightRange = -1500
maxHeightRange = 6500
clampHeight = 0
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Default
paletteSize = 7
paletteReverse = False
Expand All @@ -37,6 +40,9 @@ SCAN_Color_Config
minHeightRange = 0
maxHeightRange = 1000
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Default
paletteSize = 7
paletteReverse = False
Expand All @@ -49,6 +55,9 @@ SCAN_Color_Config
minHeightRange = -500
maxHeightRange = 7000
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = RdGy
paletteSize = 11
paletteReverse = True
Expand All @@ -61,6 +70,9 @@ SCAN_Color_Config
minHeightRange = -500
maxHeightRange = 5500
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Paired
paletteSize = 9
paletteReverse = False
Expand All @@ -70,10 +82,13 @@ SCAN_Color_Config
{
name = Moho
index = 4
minHeightRange = 0
minHeightRange = -300
maxHeightRange = 6500
clampHeight = Null
paletteName = PuBuGn
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = mercury
paletteSize = 6
paletteReverse = False
paletteDiscrete = False
Expand All @@ -85,6 +100,9 @@ SCAN_Color_Config
minHeightRange = -2000
maxHeightRange = 7000
clampHeight = 0
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = BuPu
paletteSize = 7
paletteReverse = True
Expand All @@ -95,9 +113,12 @@ SCAN_Color_Config
name = Duna
index = 6
minHeightRange = 0
maxHeightRange = 7500
maxHeightRange = 7000
clampHeight = Null
paletteName = BuGn
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = mars
paletteSize = 9
paletteReverse = False
paletteDiscrete = False
Expand All @@ -109,6 +130,9 @@ SCAN_Color_Config
minHeightRange = 0
maxHeightRange = 12000
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = BrBG
paletteSize = 8
paletteReverse = False
Expand All @@ -121,6 +145,9 @@ SCAN_Color_Config
minHeightRange = 0
maxHeightRange = 1000
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Default
paletteSize = 7
paletteReverse = False
Expand All @@ -133,6 +160,9 @@ SCAN_Color_Config
minHeightRange = -3000
maxHeightRange = 6000
clampHeight = 0
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = YlGnBu
paletteSize = 8
paletteReverse = True
Expand All @@ -145,6 +175,9 @@ SCAN_Color_Config
minHeightRange = -500
maxHeightRange = 7500
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Set1
paletteSize = 9
paletteReverse = False
Expand All @@ -157,6 +190,9 @@ SCAN_Color_Config
minHeightRange = 2000
maxHeightRange = 21500
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = PuOr
paletteSize = 7
paletteReverse = False
Expand All @@ -166,12 +202,15 @@ SCAN_Color_Config
{
name = Tylo
index = 12
minHeightRange = -500
minHeightRange = 0
maxHeightRange = 11000
clampHeight = Null
paletteName = Set3
paletteSize = 8
paletteReverse = False
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = YlGn
paletteSize = 9
paletteReverse = True
paletteDiscrete = False
}
Item
Expand All @@ -181,6 +220,9 @@ SCAN_Color_Config
minHeightRange = 1500
maxHeightRange = 6000
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Accent
paletteSize = 7
paletteReverse = False
Expand All @@ -193,6 +235,9 @@ SCAN_Color_Config
minHeightRange = 500
maxHeightRange = 5500
clampHeight = Null
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = Spectral
paletteSize = 8
paletteReverse = True
Expand All @@ -202,10 +247,13 @@ SCAN_Color_Config
{
name = Dres
index = 15
minHeightRange = 0
minHeightRange = -200
maxHeightRange = 5500
clampHeight = Null
paletteName = Pastel1
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = northRhine
paletteSize = 9
paletteReverse = False
paletteDiscrete = False
Expand All @@ -217,7 +265,10 @@ SCAN_Color_Config
minHeightRange = -500
maxHeightRange = 3500
clampHeight = Null
paletteName = RdYlGn
maxHeightMultiplier = 1
minHeightMultiplier = 1
clampHeightMultiplier = 1
paletteName = blackForest
paletteSize = 10
paletteReverse = False
paletteDiscrete = False
Expand Down Expand Up @@ -2442,7 +2493,7 @@ SCAN_Color_Config
index = 16
lowResourceCutoff = 1
highResourceCutoff = 35
}
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion SCANassets/Resources/SCANlocalization.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ SCAN_Localization
activePack = True
language = English (USA)
settingsHelpAnomalies = Select the marker used to display\nanomalies on the map.
settingsHelpBackground = Toggle background scanning on\nsome or all celestial bodies.
settingsHelpScanningToggle = Toggle all SCANsat scanning.
settingsHelpBackground = Toggle background scanning on\nselected celestial bodies.
settingsHelpTimeWarp = Adjust the scanning frequency during TimeWarp.\nHigher settings result in fewer gaps in the maps but may have a performance impact at high TimeWarp.
settingsHelpGroundTracks = Display a visible indicator of\nscanning activity in map mode.
settingsHelpGroundTracksActive = The ground track indicator can be limited to only be displayed for the active vessel.
Expand Down
8 changes: 4 additions & 4 deletions SCANassets/SCANsat.version
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"MAJOR":1,
"MINOR":1,
"PATCH":6,
"BUILD":1
"BUILD":2
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
}
}
6 changes: 3 additions & 3 deletions SCANmechjeb/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
// 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.6.0.1")]
[assembly: AssemblyFileVersion("1.6.0.1")]
[assembly: AssemblyInformationalVersion ("v16.1")]
[assembly: AssemblyVersion("1.6.0.2")]
[assembly: AssemblyFileVersion("1.6.0.2")]
[assembly: AssemblyInformationalVersion ("v16.2")]

[assembly: KSPAssembly ("SCANmechjeb", 0, 4)]
[assembly: KSPAssemblyDependency ("SCANsat", 1, 6)]
Expand Down
15 changes: 15 additions & 0 deletions SCANsat/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
Version 16.2 - 2016-6-21
------------------------

- Update for KSP 1.1.3

- Updates and minor changes to KSPedia entry
- Add terrain height multipliers for use with Module Manager when using planet rescaling mods (Sigma Dimensions)
- Rename and clarify the background scanning toggle button
- Clarify background scanning status in context menus and scanning indicators
- Implement a silent science collection method (KOS support for not opening the results window)
- Add new terrain color palettes and change some default palettes
- Allow planetary resource configs to be loaded if no global config is defined
- Some GUI performance and garbage creation optimizations


Version 16.1 - 2016-5-2
------------------------

Expand Down
6 changes: 3 additions & 3 deletions SCANsat/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion ("1.6.0.1")]
[assembly: AssemblyFileVersion ("1.6.0.1")]
[assembly: AssemblyInformationalVersion ("v16.1")]
[assembly: AssemblyVersion ("1.6.0.2")]
[assembly: AssemblyFileVersion ("1.6.0.2")]
[assembly: AssemblyInformationalVersion ("v16.2")]

[assembly: KSPAssembly ("SCANsat", 1, 6)]

Expand Down
Loading

0 comments on commit 378b56c

Please sign in to comment.