Merge branch 'develop' for version 3.2.1

mitmedialab · Jun 23, 2016 · 8b808f2 · 8b808f2
2 parents beb518e + d6ca57d
commit 8b808f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/sar-opal-base/Assets/scripts/GestureManager.cs b/sar-opal-base/Assets/scripts/GestureManager.cs
@@ -381,7 +381,7 @@ private void pressedHandler (object sender, EventArgs e)
                         // button, or whether the object was a CORRECT or INCORRECT object
                         this.logEvent(this, new LogEvent(LogEvent.EventType.Action,
                             gesture.gameObject.name, "press", hit.Point,
-                            (gesture.gameObject.name.Contains("yes_button") ? "YES" 
+                            (gesture.gameObject.name.Contains("start_button") ? "START" 
                             : (gesture.gameObject.name.Contains("no_button") ? "NO"
                             // TODO what if go doesn't have SavedProperties component?
                             : (gesture.gameObject.GetComponent<SavedProperties>().isCorrect ? "CORRECT"

diff --git a/sar-opal-base/Assets/scripts/MainGameController.cs b/sar-opal-base/Assets/scripts/MainGameController.cs
@@ -41,7 +41,7 @@ public class MainGameController : MonoBehaviour
 
         // --------------- FLAGS ---------------
         // DEMO VERSION
-        private bool demo = true;
+        private bool demo = false;
 
         // STORYBOOK VERSION
         private bool story = false;

diff --git a/sar-opal-base/ProjectSettings/GraphicsSettings.asset b/sar-opal-base/ProjectSettings/GraphicsSettings.asset
@@ -22,7 +22,7 @@ GraphicsSettings:
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_ShaderSettings:
-    useScreenSpaceShadows: 0
+    useScreenSpaceShadows: 1
   m_BuildTargetShaderSettings: []
   m_LightmapStripping: 0
   m_FogStripping: 0