This commit is contained in:
Patrice Vignola 2016-01-30 16:54:00 -05:00
commit d8027c6a88
195 changed files with 13511 additions and 457 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 66dd4c2892ce4c740a86a6aa21f4f4b7
timeCreated: 1454150346
guid: bd4033904c00e7e459e6c2b5b6885440
timeCreated: 1454180206
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -30,7 +30,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0

View File

@ -8,7 +8,7 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: unnamed
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ShaderKeywords: _NORMALMAP _PARALLAXMAP
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
@ -19,14 +19,14 @@ Material:
first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: af4223f6262c64022a9e344b1a46b211, type: 3}
m_Texture: {fileID: 2800000, guid: 0806fbe2d8d974667aeacd60854a8562, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 488b56ce3c6ef47bdbb0576674e0bbee, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
@ -47,7 +47,7 @@ Material:
first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 0806fbe2d8d974667aeacd60854a8562, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
@ -98,19 +98,19 @@ Material:
data:
first:
name: _Glossiness
second: .476999998
second: .680999994
data:
first:
name: _Metallic
second: .42899999
second: .209000006
data:
first:
name: _BumpScale
second: 1
second: .25999999
data:
first:
name: _Parallax
second: .0199999996
second: .0136000002
data:
first:
name: _OcclusionStrength

View File

@ -10,6 +10,7 @@ GameObject:
- 4: {fileID: 401170}
- 212: {fileID: 21265262}
- 114: {fileID: 11401426}
- 135: {fileID: 13500080}
m_Layer: 0
m_Name: HexSprite
m_TagString: Untagged
@ -70,6 +71,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
symbol: {fileID: 21241768}
letterNum: 0
--- !u!135 &13500080
SphereCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 118646}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: .319999993
m_Center: {x: 0, y: 0, z: 0}
--- !u!212 &21241768
SpriteRenderer:
m_ObjectHideFlags: 1

129
Assets/prefabs/Ouija.prefab Normal file
View File

@ -0,0 +1,129 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &101254
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 410494}
m_Layer: 0
m_Name: Ouija
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &102580
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 461308}
- 33: {fileID: 3385378}
- 23: {fileID: 2336908}
m_Layer: 0
m_Name: default
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &142718
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 424540}
m_Layer: 0
m_Name: selector (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &410494
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101254}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.83899999, y: 0, z: -5.71582031}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 424540}
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!4 &424540
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 142718}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 461308}
m_Father: {fileID: 410494}
m_RootOrder: 0
--- !u!4 &461308
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 102580}
m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709}
m_LocalPosition: {x: 0, y: -1.02999997, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 424540}
m_RootOrder: 0
--- !u!23 &2336908
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 102580}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_Materials:
- {fileID: 2100000, guid: 80d5fbaee57b7415e8565440f7f176e9, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_ImportantGI: 0
m_AutoUVMaxDistance: .5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
--- !u!33 &3385378
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 102580}
m_Mesh: {fileID: 4300000, guid: 8ba4ba67e9868469b95b2e9d06d6c620, type: 3}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 101254}
m_IsPrefabParent: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4011241a768be4cca8af8c0edd3d8eb0
timeCreated: 1454174659
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &106228
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 499374}
- 212: {fileID: 21275894}
- 114: {fileID: 11447254}
m_Layer: 0
m_Name: RuneTile
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!1 &126900
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 463638}
- 212: {fileID: 21274894}
m_Layer: 0
m_Name: Symbol
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &463638
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 126900}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: .600000024, y: .600000024, z: .600000024}
m_Children: []
m_Father: {fileID: 499374}
m_RootOrder: 0
--- !u!4 &499374
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 106228}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 463638}
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!114 &11447254
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 106228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 667395b800eb84a9c88455c4b1dd95b2, type: 3}
m_Name:
m_EditorClassIdentifier:
symbol: {fileID: 21274894}
--- !u!212 &21274894
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 126900}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 0
m_ProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_ImportantGI: 0
m_AutoUVMaxDistance: .5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 2
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!212 &21275894
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 106228}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 0
m_ProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_ImportantGI: 0
m_AutoUVMaxDistance: .5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: f09d267dab1f3be43a8ded6b3f64d780, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 106228}
m_IsPrefabParent: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4e5f72b0c854d4c4f961e45e2f85d45f
timeCreated: 1454175863
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,76 @@
fileFormatVersion: 2
guid: 681f2283e599d45a29d2ac0cb7756733
timeCreated: 1454175408
licenseType: Free
ModelImporter:
serializedVersion: 18
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: Cube
7400000: Default Take
9500000: //RootNode
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
optimizeGameObjects: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importBlendShapes: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
importAnimation: 1
copyAvatar: 0
humanDescription:
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
feetSpacing: 0
rootMotionBoneName:
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d087e014123fb465681dbeccd1645414
timeCreated: 1454175619
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 9fee78a9ba6744b1398633df55a3697d
timeCreated: 1454176512
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a764c76ab0e67034e831bc131a6fc125
timeCreated: 1454186307
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8b6a6c576699a8f489424368f8de6276
timeCreated: 1454186300
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More