Skip to content

Commit

Permalink
Merge branch 'release/0.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dbent committed May 18, 2016
2 parents 449146f + d24b052 commit 2db2df7
Show file tree
Hide file tree
Showing 61 changed files with 2,466 additions and 1,783 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/Library/KSP/
/Library/NuGet/
/Output/

AssemblyInfo.cs
/.build/

*.suo
*.user
Expand Down
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
language: csharp

env:
- BUILD_CONFIGURATION=Debug
- BUILD_CONFIGURATION=Release

script:
- ./build --configuration=$BUILD_CONFIGURATION
53 changes: 38 additions & 15 deletions CHANGES.md → CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,68 @@
## v0.6.0
##### Added
- Added core temperature as a new metric for applicable parts.
- Added skin to internal and internal to skin thermal rate as new metrics.
- Disable stock core temperature display in the part context menu by default.
- Added ideal metric values for applicable metrics (only core temperature as of now).
- Added "Part Ideal" overlay scheme for the core temperature metric which is green when around ideal temperature,
purple and blue when below ideal temperature, and yellow and red when above ideal temperature.
- Added SI prefix selection for thermal rate metrics. By default, prefix is selected automatically.

##### Changed
- Changed temperature formatting:
- Unit symbol is only printed at the very end.
- Only one decimal place is shown instead of two.
- If there is an ideal temperature it is displayed between the current and maximum temperatures.

##### Deprecated
- Unit has changed from `Kilowatt` to `Watt` to more clearly identify what it represents now that prefixes can be
changed. `Kilowatt` will automatically be translated to `Watt` for now.

##### Fixed
- "Scheme:" label no longer occupies multiple lines in the GUI.

## v0.5.1
##### Changes
- Compatability with KSP 1.1
##### Changed
- Compatability with KSP 1.1.

## v0.5.0
##### New
##### Added
- Support for [Toolbar](http://forum.kerbalspaceprogram.com/index.php?/topic/55420-/) contributed by
[nanathan](https://github.com/nanathan).

## v0.4.4
##### Fixes
##### Fixed
- Support for [KIS](http://forum.kerbalspaceprogram.com/threads/113111) stackables.

## v0.4.3
##### Fixes
##### Fixed
- Add aggregate thermal rate metric to overlay configuration.

## v0.4.2
##### Fixes
##### Fixed
- Fix aggregate thermal rate calculation. It was double counting radiative thermal rate.

## v0.4.1
##### Fixes
##### Fixed
- Fix for configuration settings reverting to default after two reloads of KSP.

## v0.4.0
##### New
##### Added
- Configuration settings are now persisted on scene change.

## v0.3.0
##### New
##### Added
- Skin temperature added as a new metric.

##### Changes
##### Changed
- *Incompatible:* Configuration structure for temperature metrics has changed.
- "Temperature" in context menus abbreviated to "Temp."

##### Fixes
##### Fixed
- Fix Internal Thermal Rate metric always being 0kW.

## v0.2.0
##### New
##### Added
- Added thermal rate metrics to both overlays and context menu. These measure the change in thermal energy of a part
over time in units of energy/time, i.e. power. There are four discrete thermal rates: internal, conductive,
convective, and radiative. There is also a general thermal rate metric which is the combination of the previous
Expand All @@ -51,14 +74,14 @@
the temperature unit, the overlay metric, and the gradient scheme for the metric. Currently this options are not
persisted between loads.

##### Changes
##### Changed
- *Incompatible:* Configuration structure has changed significantly.

## v0.1.1
##### Fixes
##### Fixed
- Fix settings being loaded multiple times which would eventually cause the thermal overlays to fail.

## v0.1.0
##### New
##### Added
- Replace thermal overlay gradient colors with more intuitive scheme.
- Add display of temperature and max temperature values to part context menu.
21 changes: 21 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Contributing

## Copyright

All code contributions must be made under either the [MIT](LICENSE.md) license or the public domain. All non-code
contributions must be made under the [CC-BY 4.0](http://creativecommons.org/licenses/by/4.0/) license or the public
domain. No copyright assignment is necessary. If your contribution is not public domain add your name and contribution
years to the [LICENSE](LICENSE.md) file.

## Building

In order to build the code you should have Microsoft Visual Studio installed on Windows systems or Mono installed on
Linux or Mac systems.

- Copy `build.example.yml` to `build.yml` or `../HotSpot.build.yml` relative to the project root.
- Edit the variables `ksp_dir` and `ksp_bin` as appropriate.
- From a command line shell, execute `./build` in the project root.
- On Windows, you *must* use PowerShell as your command line shell.
- On Linux and Mac systems `/bin/sh` must be a POSIX-compliant shell.
- If the build was successful you should have a ZIP file in `.build/pkg/Debug`, packaged ready for distribution.
- If you would like to deploy to and execute KSP automatically after a build use `./build run`.
15 changes: 3 additions & 12 deletions HotSpot.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{3C3EA3B3-B34C-4C92-AC7B-031810073BAB}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C3EA3B3-B34C-4C92-AC7B-031810073BAB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FE967A1B-0E46-46D0-B7A2-097B02012880}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotSpot", "Source\HotSpot\HotSpot.csproj", "{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotSpotTests", "Tests\HotSpotTests\HotSpotTests.csproj", "{277D410A-9E8C-41DA-8235-FB7A9940681B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotSpot", "src\HotSpot\HotSpot.csproj", "{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -21,16 +17,11 @@ Global
{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26BDAE1E-3F27-4A7B-81A1-C461F96A3064}.Release|Any CPU.Build.0 = Release|Any CPU
{277D410A-9E8C-41DA-8235-FB7A9940681B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{277D410A-9E8C-41DA-8235-FB7A9940681B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{277D410A-9E8C-41DA-8235-FB7A9940681B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{277D410A-9E8C-41DA-8235-FB7A9940681B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{26BDAE1E-3F27-4A7B-81A1-C461F96A3064} = {3C3EA3B3-B34C-4C92-AC7B-031810073BAB}
{277D410A-9E8C-41DA-8235-FB7A9940681B} = {FE967A1B-0E46-46D0-B7A2-097B02012880}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This software is distributed under the MIT license.

Copyright (c) 2015 Dwayne Bent
Copyright (c) 2015-2016 Dwayne Bent

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 18 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Hot Spot [![Build status][build-badge]][build]
# Hot Spot [![AppVeyor Status][build-badge-appveyor]][build-appveyor] [![Travis CI Status][build-badge-travis]][build-travis]

**Hot Spot** is a [MIT-licensed](LICENSE.md) Kerbal Space Program mod that displays better thermal data. It currently
supports the following metrics:
Expand Down Expand Up @@ -50,6 +50,19 @@ The *Maximum* value depends on the scheme used:
- *Vessel Current* - The maximum current temperature of any part in the vessel.
- *Vessel Absolute* - The maximum temperature of any part in the vessel.

#### Ideal Temperature

The color gradient used for ideal temperatures is as follows:

- Purple (0K)
- Blue (0.8×*Ideal*)
- Green (*Ideal*)
- Yellow (1.2×*Ideal*)
- Red (*Maximum*)

Where *Ideal* is the part's "ideal" temperature, e.g. for resource converters its the temperature at which conversion
is maximally efficient, and *Maximum* is the maximum temperature for the current part.

#### Thermal Rate
The color gradient used for thermal rates is as follows:

Expand Down Expand Up @@ -89,8 +102,10 @@ More features of Hot Spot can be configured by creating Module Manager patches a
`<KSP>/GameData/HotSpot/Configuration/HotSpot.cfg`. How to use Module Manager is outside the scope of this README,
please see the Module Manager documentation for more information.

[build]: https://ci.appveyor.com/project/Apokee/hotspot/branch/develop
[build-badge]: https://ci.appveyor.com/api/projects/status/ik9la5jusinnpu5n/branch/develop?svg=true
[build-appveyor]: https://ci.appveyor.com/project/Apokee/hotspot/branch/develop
[build-travis]: https://travis-ci.org/Apokee/HotSpot
[build-badge-appveyor]: https://ci.appveyor.com/api/projects/status/ik9la5jusinnpu5n/branch/develop?svg=true
[build-badge-travis]: https://api.travis-ci.org/Apokee/HotSpot.svg?branch=develop
[github-releases]: https://github.com/Apokee/HotSpot/releases
[module-manager]: http://forum.kerbalspaceprogram.com/threads/55219
[wiki-celsius]: https://en.wikipedia.org/wiki/Celsius
Expand Down
45 changes: 0 additions & 45 deletions Source/HotSpot/HotSpotModule.cs

This file was deleted.

Loading

0 comments on commit 2db2df7

Please sign in to comment.