From 9c8d48d42c9d1935bc2959d8a4d472eeb677f85e Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 18 Jun 2020 14:15:59 -0700 Subject: [PATCH 1/2] Fix zbuffer writing in bounds shader --- Assets/Shaders/SelectionGlow.shader | 3 ++- GameData/ConformalDecals/Resources/conformaldecals.shab | 4 ++-- .../ConformalDecals/Versioning/ConformalDecals.version | 2 +- README.md | 2 +- changelog.txt | 7 +++++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/Shaders/SelectionGlow.shader b/Assets/Shaders/SelectionGlow.shader index 9278e93..217850f 100644 --- a/Assets/Shaders/SelectionGlow.shader +++ b/Assets/Shaders/SelectionGlow.shader @@ -14,10 +14,11 @@ Shader "ConformalDecals/SelectionGlow" { Tags { "Queue" = "Transparent" } Cull Back + ZWrite Off Pass { - Blend One One + Blend One One CGPROGRAM #pragma vertex vert diff --git a/GameData/ConformalDecals/Resources/conformaldecals.shab b/GameData/ConformalDecals/Resources/conformaldecals.shab index 4f6750c..d2a05c7 100644 --- a/GameData/ConformalDecals/Resources/conformaldecals.shab +++ b/GameData/ConformalDecals/Resources/conformaldecals.shab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e439269d41a7212915a68e75beb891f9b85f107ba15de28e935f9170570a61ca -size 170387 +oid sha256:6021352c2c8a9fe77df77838ae961d4ccaeeef51295bcdecbb798cfbbad00a52 +size 170261 diff --git a/GameData/ConformalDecals/Versioning/ConformalDecals.version b/GameData/ConformalDecals/Versioning/ConformalDecals.version index 0914349..7b3078a 100644 --- a/GameData/ConformalDecals/Versioning/ConformalDecals.version +++ b/GameData/ConformalDecals/Versioning/ConformalDecals.version @@ -6,7 +6,7 @@ { "MAJOR":0, "MINOR":1, - "PATCH":1, + "PATCH":2, "BUILD":0 }, "KSP_VERSION": diff --git a/README.md b/README.md index d619ba0..02cde9f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Conformal Decals v0.1.1 +# Conformal Decals v0.1.2 [![Build Status](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png) diff --git a/changelog.txt b/changelog.txt index 23b08f3..7cbaa7c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,12 @@ +v0.1.2 +------ + +Fixes: +- Disabled writing to the zbuffer in the decal bounds shader. Should fix any issues with Scatterer or EVE. + v0.1.1 ------ + Fixes: - Fixed flag decal not adjusting to new texture sizes immediately. - Fixed decal bounds being visible on launch. From e993b8a4076b066788c4ad9d07585278e9853f41 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sat, 20 Jun 2020 00:10:03 -0700 Subject: [PATCH 2/2] Update version and changelog --- .../Versioning/ConformalDecals.version | 2 +- README.md | 2 +- changelog.txt | 17 ++++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/GameData/ConformalDecals/Versioning/ConformalDecals.version b/GameData/ConformalDecals/Versioning/ConformalDecals.version index 7b3078a..7289185 100644 --- a/GameData/ConformalDecals/Versioning/ConformalDecals.version +++ b/GameData/ConformalDecals/Versioning/ConformalDecals.version @@ -6,7 +6,7 @@ { "MAJOR":0, "MINOR":1, - "PATCH":2, + "PATCH":3, "BUILD":0 }, "KSP_VERSION": diff --git a/README.md b/README.md index 02cde9f..18e5179 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Conformal Decals v0.1.2 +# Conformal Decals v0.1.3 [![Build Status](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png) diff --git a/changelog.txt b/changelog.txt index 7cbaa7c..3d730e5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,12 +1,24 @@ +v0.1.3 +------ +Fixes: +- Fixed decals being able to be scaled down to 0 + +Changes: +- Made decal bounds no longer collide in flight, this is done by repurposing layer 31 (which is configurable in the ConformalDecals.cfg file) +- Decals will now be unselectable in flight by default. This can be disabled with the `selectableInFlight` value in ConformalDecals.cfg, or in the module config itself. +- Decal parts will now destroy themselves automatically when the parent part is destroyed +- Small refactor of node parsing code + - Colors can now be specified in hex (#RGB, #RGBA, #RRGGBB, or #RRGGBBAA) or using the colors specified in the XKCDColors class + + + v0.1.2 ------ - Fixes: - Disabled writing to the zbuffer in the decal bounds shader. Should fix any issues with Scatterer or EVE. v0.1.1 ------ - Fixes: - Fixed flag decal not adjusting to new texture sizes immediately. - Fixed decal bounds being visible on launch. @@ -14,7 +26,6 @@ Fixes: v0.1.0 ------ - Initial release! New parts: