-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added final changes (from before the upload)
- Loading branch information
Showing
11 changed files
with
613 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!21 &2100000 | ||
| Material: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 0 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: Slogan | ||
| m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF | ||
| m_LightmapFlags: 1 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| m_SavedProperties: | ||
| serializedVersion: 2 | ||
| m_TexEnvs: | ||
| - first: | ||
| name: _BumpMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailAlbedoMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailMask | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailNormalMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _EmissionMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _MainTex | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _MetallicGlossMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _OcclusionMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _ParallaxMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Floats: | ||
| - first: | ||
| name: _BumpScale | ||
| second: 1 | ||
| - first: | ||
| name: _Cutoff | ||
| second: 0.5 | ||
| - first: | ||
| name: _DetailNormalMapScale | ||
| second: 1 | ||
| - first: | ||
| name: _DstBlend | ||
| second: 0 | ||
| - first: | ||
| name: _GlossMapScale | ||
| second: 1 | ||
| - first: | ||
| name: _Glossiness | ||
| second: 0.5 | ||
| - first: | ||
| name: _GlossyReflections | ||
| second: 0 | ||
| - first: | ||
| name: _Metallic | ||
| second: 0 | ||
| - first: | ||
| name: _Mode | ||
| second: 0 | ||
| - first: | ||
| name: _OcclusionStrength | ||
| second: 1 | ||
| - first: | ||
| name: _Parallax | ||
| second: 0.02 | ||
| - first: | ||
| name: _SmoothnessTextureChannel | ||
| second: 0 | ||
| - first: | ||
| name: _SpecularHighlights | ||
| second: 0 | ||
| - first: | ||
| name: _SrcBlend | ||
| second: 1 | ||
| - first: | ||
| name: _UVSec | ||
| second: 0 | ||
| - first: | ||
| name: _ZWrite | ||
| second: 1 | ||
| m_Colors: | ||
| - first: | ||
| name: _Color | ||
| second: {r: 0.28676468, g: 0.24248484, b: 0.252732, a: 0.141} | ||
| - first: | ||
| name: _EmissionColor | ||
| second: {r: 0, g: 0, b: 0, a: 1} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions
68
GlobalGameJam2017/Assets/Materials/Textures/texture_ocean.png.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!21 &2100000 | ||
| Material: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 0 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: lambert1 | ||
| m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_ShaderKeywords: _EMISSION | ||
| m_LightmapFlags: 1 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| m_SavedProperties: | ||
| serializedVersion: 2 | ||
| m_TexEnvs: | ||
| - first: | ||
| name: _BumpMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailAlbedoMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailMask | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailNormalMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _EmissionMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _MainTex | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _MetallicGlossMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _OcclusionMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _ParallaxMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Floats: | ||
| - first: | ||
| name: _BumpScale | ||
| second: 1 | ||
| - first: | ||
| name: _Cutoff | ||
| second: 0.5 | ||
| - first: | ||
| name: _DetailNormalMapScale | ||
| second: 1 | ||
| - first: | ||
| name: _DstBlend | ||
| second: 0 | ||
| - first: | ||
| name: _GlossMapScale | ||
| second: 1 | ||
| - first: | ||
| name: _Glossiness | ||
| second: 0.5 | ||
| - first: | ||
| name: _GlossyReflections | ||
| second: 1 | ||
| - first: | ||
| name: _Metallic | ||
| second: 0 | ||
| - first: | ||
| name: _Mode | ||
| second: 0 | ||
| - first: | ||
| name: _OcclusionStrength | ||
| second: 1 | ||
| - first: | ||
| name: _Parallax | ||
| second: 0.02 | ||
| - first: | ||
| name: _SmoothnessTextureChannel | ||
| second: 0 | ||
| - first: | ||
| name: _SpecularHighlights | ||
| second: 1 | ||
| - first: | ||
| name: _SrcBlend | ||
| second: 1 | ||
| - first: | ||
| name: _UVSec | ||
| second: 0 | ||
| - first: | ||
| name: _ZWrite | ||
| second: 1 | ||
| m_Colors: | ||
| - first: | ||
| name: _Color | ||
| second: {r: 1, g: 0, b: 0, a: 1} | ||
| - first: | ||
| name: _EmissionColor | ||
| second: {r: 0, g: 0, b: 0, a: 1} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file not shown.
Oops, something went wrong.