Skip to content

Commit

Permalink
Merge branch 'main' of github.com:CLAWS-UMICH/IRIS-2023-2024
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan-Yap committed May 22, 2024
2 parents f835e92 + f4d11c6 commit 8481e05
Show file tree
Hide file tree
Showing 32 changed files with 38,667 additions and 1,720 deletions.
38 changes: 38 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 1.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Backplate Variant 1
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_Parent: {fileID: 2100000, guid: b855fef6dad238a49b4ca0bcbb8ae4a3, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BORDER_LIGHT
- _DISABLE_ALBEDO_MAP
- _IRIDESCENCE
- _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
- _ROUND_CORNERS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _BorderLight: 1
- _BorderWidth: 0.508
m_Colors:
- _Color: {r: 0.067046374, g: 0.08851101, b: 0.18867922, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 1.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 2.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Backplate Variant 2
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_Parent: {fileID: 2100000, guid: b855fef6dad238a49b4ca0bcbb8ae4a3, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BORDER_LIGHT
- _DISABLE_ALBEDO_MAP
- _IRIDESCENCE
- _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
- _ROUND_CORNERS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _BorderLight: 1
- _BorderWidth: 0.508
m_Colors:
- _Color: {r: 0.067046374, g: 0.08851101, b: 0.18867922, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 2.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 3.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Backplate Variant 3
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_Parent: {fileID: 2100000, guid: b855fef6dad238a49b4ca0bcbb8ae4a3, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BORDER_LIGHT
- _DISABLE_ALBEDO_MAP
- _IRIDESCENCE
- _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
- _ROUND_CORNERS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _BorderLight: 1
- _BorderWidth: 0.508
m_Colors:
- _Color: {r: 0.067046374, g: 0.08851101, b: 0.18867922, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 3.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 4.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Backplate Variant 4
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_Parent: {fileID: 2100000, guid: b855fef6dad238a49b4ca0bcbb8ae4a3, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BORDER_LIGHT
- _DISABLE_ALBEDO_MAP
- _IRIDESCENCE
- _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
- _ROUND_CORNERS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _BorderLight: 1
- _BorderWidth: 0.508
m_Colors:
- _Color: {r: 0.067046374, g: 0.08851101, b: 0.18867922, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 4.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 5.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Backplate Variant 5
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_Parent: {fileID: 2100000, guid: b855fef6dad238a49b4ca0bcbb8ae4a3, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BORDER_LIGHT
- _DISABLE_ALBEDO_MAP
- _IRIDESCENCE
- _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
- _ROUND_CORNERS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _BorderLight: 1
- _BorderWidth: 0.508
m_Colors:
- _Color: {r: 0.067046374, g: 0.08851101, b: 0.18867922, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant 5.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Backplate Variant
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_Parent: {fileID: 2100000, guid: b855fef6dad238a49b4ca0bcbb8ae4a3, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BORDER_LIGHT
- _DISABLE_ALBEDO_MAP
- _IRIDESCENCE
- _METALLIC_TEXTURE_ALBEDO_CHANNEL_A
- _ROUND_CORNERS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _BorderLight: 1
- _BorderWidth: 0.508
m_Colors:
- _Color: {r: 0.067046374, g: 0.08851101, b: 0.18867922, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/0-Materials/Backplate Variant.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/CLAWS/1-Menu/Materials/Materials/close.mat
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: close
m_Shader: {fileID: 10751, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
Expand All @@ -17,6 +19,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties: _Cutoff _MainTex
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down
83 changes: 83 additions & 0 deletions Assets/CLAWS/1-Vitals/Materials/astronautCircle.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: astronautCircle
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
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}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/CLAWS/1-Vitals/Materials/astronautCircle.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8481e05

Please sign in to comment.