mirror of
https://github.com/drewcassidy/KSP-Conformal-Decals.git
synced 2024-09-01 18:23:54 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
1ab8d0f6bc
@ -22,7 +22,7 @@ Shader "ConformalDecals/Feature/Bumped"
|
|||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags { "Queue" = "Geometry+100" }
|
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
|
||||||
Cull [_Cull]
|
Cull [_Cull]
|
||||||
Ztest LEqual
|
Ztest LEqual
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Shader "ConformalDecals/Paint/Diffuse"
|
|||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags { "Queue" = "Geometry+100" }
|
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
|
||||||
Cull [_Cull]
|
Cull [_Cull]
|
||||||
Ztest LEqual
|
Ztest LEqual
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ Shader "ConformalDecals/Paint/DiffuseSDF"
|
|||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags { "Queue" = "Geometry+100" }
|
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
|
||||||
Cull [_Cull]
|
Cull [_Cull]
|
||||||
Ztest LEqual
|
Ztest LEqual
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ Shader "ConformalDecals/Paint/Specular"
|
|||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags { "Queue" = "Geometry+100" }
|
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
|
||||||
Cull [_Cull]
|
Cull [_Cull]
|
||||||
Ztest LEqual
|
Ztest LEqual
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ Shader "ConformalDecals/Paint/SpecularSDF"
|
|||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags { "Queue" = "Geometry+100" }
|
Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
|
||||||
Cull [_Cull]
|
Cull [_Cull]
|
||||||
Ztest LEqual
|
Ztest LEqual
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ Shader "ConformalDecals/SelectionGlow"
|
|||||||
}
|
}
|
||||||
SubShader
|
SubShader
|
||||||
{
|
{
|
||||||
Tags { "Queue" = "Transparent" }
|
Tags { "Queue" = "Transparent" "IgnoreProjector" = "true" }
|
||||||
Cull Back
|
Cull Back
|
||||||
ZWrite Off
|
ZWrite Off
|
||||||
|
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -240,6 +240,17 @@ namespace ConformalDecals {
|
|||||||
|
|
||||||
UpdateMaterials();
|
UpdateMaterials();
|
||||||
|
|
||||||
|
// handle tweakables
|
||||||
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
|
GameEvents.onEditorPartEvent.Add(OnEditorEvent);
|
||||||
|
GameEvents.onVariantApplied.Add(OnVariantApplied);
|
||||||
|
|
||||||
|
UpdateTweakables();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnStartFinished(StartState state) {
|
||||||
|
// handle game events
|
||||||
if (HighLogic.LoadedSceneIsGame) {
|
if (HighLogic.LoadedSceneIsGame) {
|
||||||
// set initial attachment state
|
// set initial attachment state
|
||||||
if (part.parent == null) {
|
if (part.parent == null) {
|
||||||
@ -250,26 +261,19 @@ namespace ConformalDecals {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// handle tweakables
|
|
||||||
if (HighLogic.LoadedSceneIsEditor) {
|
|
||||||
GameEvents.onEditorPartEvent.Add(OnEditorEvent);
|
|
||||||
GameEvents.onVariantApplied.Add(OnVariantApplied);
|
|
||||||
|
|
||||||
UpdateTweakables();
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle flight events
|
// handle flight events
|
||||||
if (HighLogic.LoadedSceneIsFlight) {
|
if (HighLogic.LoadedSceneIsFlight) {
|
||||||
GameEvents.onPartWillDie.Add(OnPartWillDie);
|
GameEvents.onPartWillDie.Add(OnPartWillDie);
|
||||||
|
|
||||||
|
if (part.parent == null) part.explode();
|
||||||
|
|
||||||
Part.layerMask |= 1 << DecalConfig.DecalLayer;
|
Part.layerMask |= 1 << DecalConfig.DecalLayer;
|
||||||
decalColliderTransform.gameObject.layer = DecalConfig.DecalLayer;
|
decalColliderTransform.gameObject.layer = DecalConfig.DecalLayer;
|
||||||
|
|
||||||
if (!selectableInFlight || !DecalConfig.SelectableInFlight) {
|
if (!selectableInFlight || !DecalConfig.SelectableInFlight) {
|
||||||
decalColliderTransform.GetComponent<Collider>().enabled = false;
|
decalColliderTransform.GetComponent<Collider>().enabled = false;
|
||||||
|
_boundsRenderer.enabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (part.parent == null) part.explode();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
v0.2.0
|
v0.2.0
|
||||||
------
|
------
|
||||||
- New Parts:
|
- New Parts:
|
||||||
@ -7,6 +6,14 @@ v0.2.0
|
|||||||
- Fixed WIDTH and HEIGHT scale modes being flipped
|
- Fixed WIDTH and HEIGHT scale modes being flipped
|
||||||
- Removed debug log statements
|
- Removed debug log statements
|
||||||
|
|
||||||
|
v0.1.4
|
||||||
|
------
|
||||||
|
- Fixes:
|
||||||
|
- Fixed decals rendering onto disabled B9PS part variants
|
||||||
|
- Decals will still not update whan their parent part's B9PS variant is changed, both in flight and in the editor. This is known and awaiting a change to B9PS to be fixed.
|
||||||
|
- Fixed decal bounds rendering as dark cubes when shadowed by EVE clouds.
|
||||||
|
- Fixed decals being shadowed by EVE clouds, causing the part underneath to appear overly dark.
|
||||||
|
|
||||||
v0.1.3
|
v0.1.3
|
||||||
------
|
------
|
||||||
Fixes:
|
Fixes:
|
||||||
@ -19,8 +26,6 @@ Changes:
|
|||||||
- Small refactor of node parsing code
|
- 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
|
- Colors can now be specified in hex (#RGB, #RGBA, #RRGGBB, or #RRGGBBAA) or using the colors specified in the XKCDColors class
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
v0.1.2
|
v0.1.2
|
||||||
------
|
------
|
||||||
Fixes:
|
Fixes:
|
||||||
|
Loading…
Reference in New Issue
Block a user