Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Kopernicus/Kopernicus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 35d792667f7b
Choose a base ref
...
head repository: Kopernicus/Kopernicus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f8926c5090b
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 4, 2017

  1. fix shader params for new ring shader not using parent local scale (f…

    …ixes new ring shader not working on some bodies)
    LGhassen committed Apr 4, 2017
    Copy the full SHA
    ea90a94 View commit details
  2. Copy the full SHA
    63c9723 View commit details

Commits on Apr 5, 2017

  1. Revert changes to the binary

    Dorian Stoll committed Apr 5, 2017
    Copy the full SHA
    7f8926c View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −1 .gitignore
  2. BIN Distribution/Release/GameData/Kopernicus/Plugins/Kopernicus.Components.dll
  3. +2 −2 Kopernicus/Kopernicus.Components/Ring.cs
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -14,4 +14,5 @@ Assembly-CSharp-firstpass.dll
UnityEngine.dll
KSPUtil.dll
UnityEngine.UI.dll
ModularFlightIntegrator.dll
ModularFlightIntegrator.dll
Shaders/KopernicusShaders/Library
Binary file not shown.
4 changes: 2 additions & 2 deletions Kopernicus/Kopernicus.Components/Ring.cs
Original file line number Diff line number Diff line change
@@ -166,8 +166,8 @@ public void BuildRing()

ringMR.material.SetTexture("_MainTex", texture);

ringMR.material.SetFloat("innerRadius", innerRadius);
ringMR.material.SetFloat("outerRadius", outerRadius);
ringMR.material.SetFloat("innerRadius", innerRadius * parent.transform.localScale.x);
ringMR.material.SetFloat("outerRadius", outerRadius * parent.transform.localScale.x);

if (useNewShader)
{