Commit 864bebb6 authored by Nathan De Castro's avatar Nathan De Castro

backup

parent d6a30555

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" /> <None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" /> <None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="Assembly-UnityScript"> <Reference Include="Assembly-UnityScript">
<HintPath>C:/Users/yuki/Documents/Work/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath> <HintPath>H:/Work/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.Advertisements"> <Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<Compile Include="Assets\Scripts\UI\SessionRecorder.cs" /> <Compile Include="Assets\Scripts\UI\SessionRecorder.cs" />
<Compile Include="Assets\Scripts\UI\Visibility.cs" /> <Compile Include="Assets\Scripts\UI\Visibility.cs" />
<Compile Include="Assets\Scripts\VR\InteractableItem.cs" /> <Compile Include="Assets\Scripts\VR\InteractableItem.cs" />
<Compile Include="Assets\Scripts\VR\PickedUpObject.cs" />
<Compile Include="Assets\Scripts\VR\Tutorial.cs" /> <Compile Include="Assets\Scripts\VR\Tutorial.cs" />
<Compile Include="Assets\Scripts\VR\VRMove.cs" /> <Compile Include="Assets\Scripts\VR\VRMove.cs" />
<Compile Include="Assets\Scripts\VR\WandButtons.cs" /> <Compile Include="Assets\Scripts\VR\WandButtons.cs" />
......
...@@ -11,3 +11,87 @@ ...@@ -11,3 +11,87 @@
4/20/2017 11:59:31 PM | Player stopped after: 26 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:02:02 AM | Player stopped after: 88 seconds
4/21/2017 12:05:40 AM | Player stopped after: 16 seconds 4/21/2017 12:05:40 AM | Player stopped after: 16 seconds
4/21/2017 11:36:27 AM | Player stopped after: 14 seconds
4/21/2017 11:36:30 AM | Player stopped after: 0 seconds
4/21/2017 11:36:54 AM | Player stopped after: 14 seconds
4/21/2017 11:38:44 AM | Player stopped after: 99 seconds
4/21/2017 11:40:08 AM | Player stopped after: 27 seconds
4/21/2017 11:42:43 AM | Player stopped after: 25 seconds
4/21/2017 11:45:35 AM | Player stopped after: 18 seconds
4/21/2017 11:46:07 AM | Player stopped after: 3 seconds
4/21/2017 11:47:13 AM | Player stopped after: 1 seconds
4/21/2017 11:52:31 AM | Player stopped after: 4 seconds
4/21/2017 11:53:01 AM | Player stopped after: 8 seconds
4/21/2017 12:01:23 PM | Player stopped after: 36 seconds
4/21/2017 12:02:28 PM | Player stopped after: 7 seconds
4/21/2017 12:04:22 PM | Player stopped after: 11 seconds
4/21/2017 12:07:43 PM | Player stopped after: 6 seconds
4/21/2017 12:08:12 PM | Player stopped after: 12 seconds
4/21/2017 12:26:04 PM | Player stopped after: 3 seconds
4/21/2017 12:29:26 PM | Player stopped after: 13 seconds
4/21/2017 12:32:54 PM | Player stopped after: 8 seconds
4/21/2017 12:36:48 PM | Player stopped after: 20 seconds
4/21/2017 12:37:22 PM | Player stopped after: 14 seconds
4/21/2017 12:37:49 PM | Player stopped after: 20 seconds
4/21/2017 12:40:45 PM | Player stopped after: 31 seconds
4/21/2017 1:29:03 PM | Player stopped after: 4 seconds
4/21/2017 1:39:05 PM | Player stopped after: 85 seconds
4/21/2017 1:40:17 PM | Player stopped after: 63 seconds
4/21/2017 1:44:37 PM | Player stopped after: 8 seconds
4/21/2017 1:45:12 PM | Player stopped after: 10 seconds
4/21/2017 1:47:24 PM | Player stopped after: 16 seconds
4/21/2017 2:18:20 PM | Player stopped after: 230 seconds
4/21/2017 2:22:45 PM | Player stopped after: 8 seconds
4/21/2017 2:28:00 PM | Player stopped after: 15 seconds
4/21/2017 2:29:38 PM | Player stopped after: 12 seconds
4/21/2017 2:31:13 PM | Player stopped after: 6 seconds
4/21/2017 2:34:48 PM | Player stopped after: 25 seconds
4/21/2017 2:35:36 PM | Player stopped after: 44 seconds
4/21/2017 2:36:30 PM | Player stopped after: 11 seconds
4/21/2017 2:36:54 PM | Player stopped after: 8 seconds
4/21/2017 2:37:06 PM | Player stopped after: 8 seconds
4/21/2017 2:40:33 PM | Player stopped after: 56 seconds
4/21/2017 2:41:45 PM | Player stopped after: 19 seconds
4/21/2017 2:44:21 PM | Player stopped after: 91 seconds
4/21/2017 2:48:43 PM | Player stopped after: 34 seconds
4/22/2017 4:43:18 PM | Player stopped after: 1 seconds
4/22/2017 6:32:29 PM | Player stopped after: 2 seconds
4/22/2017 9:16:35 PM | Player stopped after: 167 seconds
4/22/2017 9:18:17 PM | Player stopped after: 30 seconds
4/22/2017 9:19:52 PM | Player stopped after: 25 seconds
4/22/2017 9:34:08 PM | Player stopped after: 780 seconds
4/22/2017 9:54:44 PM | Player stopped after: 34 seconds
4/22/2017 9:57:30 PM | Player stopped after: 31 seconds
4/22/2017 10:08:57 PM | Player stopped after: 14 seconds
4/22/2017 11:16:31 PM | Player stopped after: 32 seconds
4/24/2017 9:08:43 AM | Player stopped after: 120 seconds
4/24/2017 9:12:54 AM | Player stopped after: 81 seconds
4/24/2017 9:14:12 AM | unknown stopped after: 70 seconds
4/24/2017 9:18:36 AM | unknown stopped after: 84 seconds
4/24/2017 9:18:54 AM | unknown stopped after: 13 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:20:16 AM | unknown stopped after: 71 seconds
4/24/2017 9:31:10 AM | unknown stopped after: 14 seconds
4/24/2017 9:33:35 AM | unknown stopped after: 124 seconds
4/24/2017 9:33:53 AM | unknown stopped after: 9 seconds
4/24/2017 9:34:30 AM | unknown lost after: 17 seconds
4/24/2017 9:34:32 AM | unknown stopped after: 19 seconds
4/24/2017 9:35:01 AM | unknown lost after: 18 seconds
4/24/2017 9:35:06 AM | unknown stopped after: 22 seconds
4/24/2017 9:37:01 AM | unknown stopped after: 53 seconds
4/24/2017 9:37:35 AM | unknown lost after: 7 seconds
4/24/2017 9:38:28 AM | unknown stopped after: 60 seconds
4/24/2017 9:45:27 AM | unknown lost after: 15 seconds
4/24/2017 9:45:43 AM | unknown lost after: 31 seconds
4/24/2017 9:45:49 AM | unknown stopped after: 36 seconds
4/24/2017 9:53:19 AM | unknown stopped after: 403 seconds
4/24/2017 10:57:15 AM | unknown stopped after: 21 seconds
4/25/2017 9:48:06 AM | unknown lost after: 62 seconds
4/25/2017 9:48:26 AM | unknown stopped after: 82 seconds
4/25/2017 9:49:05 AM | unknown stopped after: 28 seconds
4/25/2017 9:50:10 AM | unknown stopped after: 60 seconds
4/25/2017 9:56:08 AM | unknown stopped after: 190 seconds
...@@ -10,128 +10,72 @@ Material: ...@@ -10,128 +10,72 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- first: - _BumpMap:
name: _BumpMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailAlbedoMap:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailMask:
name: _DetailMask
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}