Commit d6a30555 authored by Nathan De Castro's avatar Nathan De Castro

Push before testing version

parent b18cc59f
......@@ -64,7 +64,7 @@
<Compile Include="Assets\Scripts\Tools\FadeInAndOut.cs" />
<Compile Include="Assets\Scripts\Tools\GhostSound.cs" />
<Compile Include="Assets\Scripts\Tools\LightScript.cs" />
<Compile Include="Assets\Scripts\Tools\PlayerSound.cs" />
<Compile Include="Assets\Scripts\Tools\PlayerLight.cs" />
<Compile Include="Assets\Scripts\Tools\RandSwitch.cs" />
<Compile Include="Assets\Scripts\Tools\RippleEffect.cs" />
<Compile Include="Assets\Scripts\Tools\Timer.cs" />
......@@ -77,6 +77,7 @@
<Compile Include="Assets\Scripts\UI\Visibility.cs" />
<Compile Include="Assets\Scripts\VR\InteractableItem.cs" />
<Compile Include="Assets\Scripts\VR\Tutorial.cs" />
<Compile Include="Assets\Scripts\VR\VRMove.cs" />
<Compile Include="Assets\Scripts\VR\WandButtons.cs" />
<Compile Include="Assets\Scripts\VR\WandController.cs" />
<Compile Include="Assets\Scripts\VR\lightfollow.cs" />
......
4/17/2017 2:08:58 PM | Player stopped after: 5 seconds
4/17/2017 2:09:39 PM | Player stopped after: 3 seconds
4/17/2017 2:09:54 PM | Player stopped after: 1 seconds
4/17/2017 2:11:32 PM | Player lost after: 7 seconds
4/17/2017 2:11:32 PM | Player lost after: 7 seconds
4/17/2017 2:11:32 PM | Player lost after: 7 seconds
4/17/2017 2:11:32 PM | Player lost after: 7 seconds
4/17/2017 2:11:32 PM | Player lost after: 7 seconds
4/17/2017 2:11:32 PM | Player lost after: 7 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:32 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 8 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:11:33 PM | Player lost after: 9 seconds
4/17/2017 2:12:32 PM | Player stopped after: 55 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:33 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 16 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/17/2017 2:16:34 PM | Player lost after: 17 seconds
4/19/2017 10:53:41 AM | Player stopped after: 1 seconds
4/19/2017 10:54:38 AM | Player stopped after: 1 seconds
4/20/2017 3:35:15 PM | Player stopped after: 11 seconds
4/20/2017 5:51:37 PM | Player stopped after: 2 seconds
4/20/2017 5:52:22 PM | Player stopped after: 1 seconds
4/20/2017 5:58:13 PM | Player stopped after: 5 seconds
4/20/2017 6:02:21 PM | Player stopped after: 18 seconds
4/20/2017 11:53:16 PM | Player stopped after: 13 seconds
4/20/2017 11:57:39 PM | Player stopped after: 24 seconds
4/20/2017 11:58:25 PM | Player stopped after: 2 seconds
4/20/2017 11:59:31 PM | Player stopped after: 26 seconds
4/21/2017 12:02:02 AM | Player stopped after: 88 seconds
4/21/2017 12:05:40 AM | Player stopped after: 16 seconds
......@@ -8,121 +8,69 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: Floor
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
- _ParallaxMap:
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: 10
- 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: 3
- 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: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 0
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- first:
name: _Color
second: {r: 0, g: 0, b: 0, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
......@@ -10,119 +10,67 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
- _ParallaxMap:
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: 10
- 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: 3
- 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: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- first:
name: _Color
second: {r: 0.8313726, g: 0.7803922, b: 0.65882355, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.8313726, g: 0.7803922, b: 0.65882355, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
......@@ -89,7 +89,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4468356308366186}
- component: {fileID: 114301647282611870}
- component: {fileID: 114297660608350462}
m_Layer: 0
m_Name: StartSwitch
m_TagString: Untagged
......@@ -117,7 +117,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1923544353715076}
m_LocalRotation: {x: -0, y: 0.70710677, z: -0, w: 0.7071068}
m_LocalPosition: {x: -13.76, y: 1.17, z: 22.007}
m_LocalPosition: {x: -13.76, y: 3.21, z: 22.007}
m_LocalScale: {x: 0.53925997, y: 0.53925997, z: 0.2157}
m_Children:
- {fileID: 4260232111519682}
......@@ -196,6 +196,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23662784631109916
MeshRenderer:
......@@ -227,6 +228,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23846960253881764
MeshRenderer:
......@@ -258,6 +260,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33062814853541410
MeshFilter:
......@@ -323,7 +326,7 @@ Light:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1514088064857926}
m_Enabled: 1
serializedVersion: 7
serializedVersion: 8
m_Type: 2
m_Color: {r: 0, g: 1, b: 0.08965492, a: 1}
m_Intensity: 1
......@@ -348,9 +351,11 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!114 &114301647282611870
--- !u!114 &114297660608350462
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
......@@ -358,9 +363,9 @@ MonoBehaviour:
m_GameObject: {fileID: 1923544353715076}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70d3447759e9d63479797beb15dbf4fd, type: 3}
m_Script: {fileID: 11500000, guid: 5ba894a302ce56b4fb676074fdb80c02, type: 3}
m_Name:
m_EditorClassIdentifier:
main_light: {fileID: 0}
switch_on: {fileID: 1065146690175398}
switch_off: {fileID: 1835582999823924}
wand: {fileID: 0}
......@@ -127,7 +127,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1876634338105552}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -25.989, y: 1.17, z: -12.905}
m_LocalPosition: {x: -25.989, y: 3.21, z: -12.905}
m_LocalScale: {x: 0.5392623, y: 0.5392622, z: 0.21570486}
m_Children:
- {fileID: 4244690630902324}
......@@ -166,6 +166,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23194167621710554
MeshRenderer:
......@@ -197,6 +198,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23559752972859314
MeshRenderer:
......@@ -228,6 +230,7 @@ MeshRenderer: