danielcolinjames · teriaki · Jan 24, 2017
diff --git a/Monitor/Assets/0.3.1.unity b/Monitor/Assets/0.3.1.unity
diff --git a/Monitor/Assets/0.3.1.unity.meta b/Monitor/Assets/0.3.1.unity.meta
diff --git a/Monitor/Assets/Materials/Blueness.mat b/Monitor/Assets/Materials/Blueness.mat
@@ -9,7 +9,7 @@ Material:
   m_Name: Blueness
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
-  m_LightmapFlags: 1
+  m_LightmapFlags: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   m_SavedProperties:

diff --git a/Monitor/Assets/Materials/Greeness.mat b/Monitor/Assets/Materials/Greeness.mat
@@ -9,7 +9,7 @@ Material:
   m_Name: Greeness
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
-  m_LightmapFlags: 1
+  m_LightmapFlags: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   m_SavedProperties:
@@ -45,6 +45,12 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - first:
+        name: _Illum
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - first:
         name: _MainTex
       second:
@@ -82,6 +88,9 @@ Material:
     - first:
         name: _DstBlend
       second: 0
+    - first:
+        name: _Emission
+      second: 1
     - first:
         name: _GlossMapScale
       second: 1
@@ -124,4 +133,4 @@ Material:
       second: {r: 0, g: 1, b: 0, a: 1}
     - first:
         name: _EmissionColor
-      second: {r: 0, g: 1, b: 0, a: 1}
+      second: {r: 0, g: 1, b: 0, a: 0}
diff --git a/Monitor/Assets/Materials/Redness.mat b/Monitor/Assets/Materials/Redness.mat
@@ -9,7 +9,7 @@ Material:
   m_Name: Redness
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
-  m_LightmapFlags: 1
+  m_LightmapFlags: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   m_SavedProperties:

diff --git a/Monitor/Assets/Materials/Yellowness.mat b/Monitor/Assets/Materials/Yellowness.mat
@@ -9,7 +9,7 @@ Material:
   m_Name: Yellowness
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
-  m_LightmapFlags: 1
+  m_LightmapFlags: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   m_SavedProperties:

diff --git a/Monitor/Assets/Models/New models/Console.fbx.meta b/Monitor/Assets/Models/New models/Console.fbx.meta
diff --git a/Monitor/Assets/Models/New models/Desk.fbx.meta b/Monitor/Assets/Models/New models/Desk.fbx.meta
diff --git a/Monitor/Assets/Models/New models/FluorescentLight.fbx.meta b/Monitor/Assets/Models/New models/FluorescentLight.fbx.meta
diff --git a/Monitor/Assets/Models/New models/Monitor.fbx.meta b/Monitor/Assets/Models/New models/Monitor.fbx.meta
diff --git a/Monitor/Assets/Models/New models/Office.fbx.meta b/Monitor/Assets/Models/New models/Office.fbx.meta
diff --git a/Monitor/Assets/Models/New models/ShelfLarge.fbx.meta b/Monitor/Assets/Models/New models/ShelfLarge.fbx.meta
diff --git a/Monitor/Assets/Models/New models/Warehouse.fbx b/Monitor/Assets/Models/New models/Warehouse.fbx
diff --git a/Monitor/Assets/Models/New models/Warehouse.fbx.meta b/Monitor/Assets/Models/New models/Warehouse.fbx.meta
diff --git a/Monitor/Assets/Scenes/Light Maps.meta b/Monitor/Assets/Scenes/Light Maps.meta
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1.meta b/Monitor/Assets/Scenes/Light Maps/LightMap1.meta
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/LightingData.asset b/Monitor/Assets/Scenes/Light Maps/LightMap1/LightingData.asset
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/LightingData.asset.meta b/Monitor/Assets/Scenes/Light Maps/LightMap1/LightingData.asset.meta
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_dir.png b/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_dir.png
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_dir.png.meta b/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_dir.png.meta
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_light.exr b/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_light.exr
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_light.exr.meta b/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-0_comp_light.exr.meta
diff --git a/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-10_comp_dir.png b/Monitor/Assets/Scenes/Light Maps/LightMap1/Lightmap-10_comp_dir.png