Skip to content

reverting Jeff's temporary update to S_SimpleDissolve. #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 16, 2021
Merged

reverting Jeff's temporary update to S_SimpleDissolve. #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8495eb9
reverting Jeff's temporary update to S_SimpleDissolve. This re-adds t…
dwoodruffsf Apr 12, 2021
356d396
Update to SimpleDissolve.shader as well as effects that needed to be …
jdepuy Apr 13, 2021
471635d
Update to SimpleDissolve.shader as well as effects that needed to be …
jdepuy Apr 13, 2021
c071dd5
Updated shader so that divide by zero error is gone
jdepuy Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Assets/BossRoom/VFX/Materials/FX_M_GroundCrack.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ Material:
m_Texture: {fileID: 2800000, guid: 79ffdab583577334cb184c42218dce5f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 79ffdab583577334cb184c42218dce5f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -99,7 +95,6 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 0
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
5 changes: 0 additions & 5 deletions Assets/BossRoom/VFX/Materials/FX_M_GroundCrack_2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ Material:
m_Texture: {fileID: 2800000, guid: 34a4d61e192b21a4bb3ab13482c439d7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 34a4d61e192b21a4bb3ab13482c439d7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -99,7 +95,6 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 0
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
14 changes: 6 additions & 8 deletions Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: FX_M_StylizeSmoke
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASDYNAMICDISSOLVE_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -48,10 +47,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 1ee97322756ea2c489f9311bd5c9f72d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: fa9d4375ce230e1488b5a2680fd71074, type: 3}
m_Scale: {x: 1, y: 2}
m_Offset: {x: -0.25, y: -0.25}
- _MaskTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -85,7 +84,7 @@ Material:
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HasDoubleMask: 0
- _HasDynamicDissolve: 1
- _HasDynamicDissolve: 0
- _HasFlowEffect: 0
- _HasMask: 0
- _HasTextureDissolve: 0
Expand All @@ -101,7 +100,6 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
7 changes: 1 addition & 6 deletions Assets/BossRoom/VFX/Materials/FX_M_Stylize_Smoke_falldown.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: FX_M_Stylize_Smoke_falldown
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -47,10 +47,6 @@ Material:
m_Texture: {fileID: 2800000, guid: 1ee97322756ea2c489f9311bd5c9f72d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: cc5ee705b0abdca40b904a2b89a38d8b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -91,7 +87,6 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
11 changes: 5 additions & 6 deletions Assets/BossRoom/VFX/Materials/FX_MaskedPanner.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: FX_MaskedPanner
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASFLOWEFFECT_ON _HASMASK_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
_VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -48,8 +48,8 @@ Material:
m_Texture: {fileID: 2800000, guid: 037eea83bb383c34ebc2ee292c903057, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
- _MaskTexture:
m_Texture: {fileID: 2800000, guid: 60781adef564aeb439a036d89cc5545e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand Down Expand Up @@ -97,8 +97,8 @@ Material:
- _HasMask: 1
- _HasTextureDissolve: 1
- _InvertMask: 0
- _MaskIntenicty: 4
- _MaskPower: 2
- _MaskIntenicty: 1
- _MaskPower: 3
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
Expand All @@ -108,7 +108,6 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _Use_alpha: 0
Expand Down
21 changes: 14 additions & 7 deletions Assets/BossRoom/VFX/Materials/M_MotionFlash.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: M_MotionFlash
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASFLOWEFFECT_ON _HASMASK_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
_VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -48,8 +48,12 @@ Material:
m_Texture: {fileID: 2800000, guid: 037eea83bb383c34ebc2ee292c903057, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: fa9d4375ce230e1488b5a2680fd71074, type: 3}
- _MaskTexture:
m_Texture: {fileID: 2800000, guid: 886abf5df7054d749aae3c9907e011f7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTexture2:
m_Texture: {fileID: 2800000, guid: 9a69c5a954f525a44a117b8d5d15e056, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand Down Expand Up @@ -83,10 +87,12 @@ Material:
m_Floats:
- _BumpScale: 1
- _ChangeMasktoX: 0
- _CullMode: 2
- _CullMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Float2: 1
- _Float3: 2
- _Flowintencity: 0.172
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -97,8 +103,10 @@ Material:
- _HasMask: 1
- _HasTextureDissolve: 1
- _InvertMask: 0
- _MaskIntenicty: 4
- _MaskPower: 2
- _MaskIntenicty: 1
- _MaskIntenicty2: 1
- _MaskPower: 2.5
- _MaskPower2: 2.3
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
Expand All @@ -108,7 +116,6 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _Use_alpha: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/VFX/Meshes/Ms_HalfSphere.FBX
View file
Open in desktop
Git LFS file not shown
Loading