Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Wood textures!
-Added Wood texture
  • Loading branch information
lan11001 committed Oct 9, 2013
1 parent bd807b1 commit 6fd4a83
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 17 deletions.
42 changes: 25 additions & 17 deletions Guardian of Silverkeep/Assets/Scenes/Levente - Test.unity
Expand Up @@ -1923,7 +1923,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &180735686
Transform:
m_ObjectHideFlags: 0
Expand All @@ -1941,7 +1941,7 @@ Light:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 180735685}
m_Enabled: 0
m_Enabled: 1
serializedVersion: 3
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down Expand Up @@ -4319,7 +4319,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -4946,7 +4946,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -8199,7 +8199,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -8282,7 +8282,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -10314,7 +10314,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -12279,7 +12279,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -13299,7 +13299,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -13621,7 +13621,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -14425,7 +14425,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -15262,7 +15262,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -15483,7 +15483,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -15579,7 +15579,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -15973,6 +15973,14 @@ Prefab:
propertyPath: m_LocalRotation.w
value: .913545489
objectReference: {fileID: 0}
- target: {fileID: 2300002, guid: 8a5386b094a67ea4fa2fa9ab865947b4, type: 2}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
- target: {fileID: 2300000, guid: 8a5386b094a67ea4fa2fa9ab865947b4, type: 2}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 8a5386b094a67ea4fa2fa9ab865947b4, type: 2}
m_RootGameObject: {fileID: 1736878227}
Expand Down Expand Up @@ -21085,7 +21093,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -21513,7 +21521,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down Expand Up @@ -22099,7 +22107,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand Down
Binary file modified Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db
Binary file not shown.
27 changes: 27 additions & 0 deletions Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat
@@ -0,0 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: wood 1
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: []
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 4baf59b6b70632b40b59868ee7059e3d, type: 3}
m_Scale: {x: 15, y: 5}
m_Offset: {x: 0, y: 0}
m_Floats: {}
m_Colors:
data:
first:
name: _Color
second: {r: .742647052, g: .638894916, b: .638894916, a: 1}

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

27 changes: 27 additions & 0 deletions Guardian of Silverkeep/Assets/Texture/Materials/wood.mat
@@ -0,0 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: wood
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: []
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 4baf59b6b70632b40b59868ee7059e3d, type: 3}
m_Scale: {x: 15, y: 5}
m_Offset: {x: 0, y: 0}
m_Floats: {}
m_Colors:
data:
first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
4 changes: 4 additions & 0 deletions Guardian of Silverkeep/Assets/Texture/Materials/wood.mat.meta

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

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png.meta

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

0 comments on commit 6fd4a83

Please sign in to comment.