From 594d3a66ded726cc096429eed266e178cabe1683 Mon Sep 17 00:00:00 2001
From: Levente Nagy <levente.nagy@uconn.edu>
Date: Thu, 10 Oct 2013 13:44:26 -0400
Subject: [PATCH] Final Build

-Its done!
---
 .../Assets/Scene_John/GameOver.unity              | 15 +++++++++++++++
 .../Assets/Scene_John/VictoryScreen.unity         | 15 +++++++++++++++
 Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs |  5 ++++-
 Guardian of Silverkeep/Assets/Scripts/Hero.cs     |  6 ++++++
 .../ProjectSettings/ProjectSettings.asset         |  4 ++--
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/Guardian of Silverkeep/Assets/Scene_John/GameOver.unity b/Guardian of Silverkeep/Assets/Scene_John/GameOver.unity
index ed6bed5..294003a 100755
--- a/Guardian of Silverkeep/Assets/Scene_John/GameOver.unity	
+++ b/Guardian of Silverkeep/Assets/Scene_John/GameOver.unity	
@@ -179,6 +179,7 @@ GameObject:
   - 64: {fileID: 322396167}
   - 23: {fileID: 322396166}
   - 114: {fileID: 322396170}
+  - 114: {fileID: 322396171}
   m_Layer: 0
   m_Name: Plane
   m_TagString: Untagged
@@ -249,6 +250,20 @@ MonoBehaviour:
   color0: {r: 1, g: 1, b: 1, a: 0}
   color1: {r: 1, g: 1, b: 1, a: 1}
   duration: 3
+--- !u!114 &322396171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 322396165}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa6e9e146fe25475aa96f35b898960b8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  timeleft: 0
+  totaltime: 3
+  levelname: MainMenu
 --- !u!1 &844382857
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Guardian of Silverkeep/Assets/Scene_John/VictoryScreen.unity b/Guardian of Silverkeep/Assets/Scene_John/VictoryScreen.unity
index 03ea191..1bd2c56 100755
--- a/Guardian of Silverkeep/Assets/Scene_John/VictoryScreen.unity	
+++ b/Guardian of Silverkeep/Assets/Scene_John/VictoryScreen.unity	
@@ -86,6 +86,7 @@ GameObject:
   - 64: {fileID: 322396167}
   - 23: {fileID: 322396166}
   - 114: {fileID: 322396170}
+  - 114: {fileID: 322396171}
   m_Layer: 0
   m_Name: Plane
   m_TagString: Untagged
@@ -156,6 +157,20 @@ MonoBehaviour:
   color0: {r: 1, g: 1, b: 1, a: 0}
   color1: {r: 1, g: 1, b: 1, a: 1}
   duration: 3
+--- !u!114 &322396171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 322396165}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa6e9e146fe25475aa96f35b898960b8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  timeleft: 0
+  totaltime: 3
+  levelname: MainMenu
 --- !u!1 &844382857
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs b/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs
index e8774c1..0451711 100644
--- a/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs	
+++ b/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs	
@@ -61,7 +61,10 @@ public class FPS_HERO: MonoBehaviour
 	
 	void Update () 
 	{
-
+		if(Input.GetKey(KeyCode.Escape))
+			Screen.lockCursor = false;
+		else
+			Screen.lockCursor = true;
 		
 		if (state != State.Dead)
 		{
diff --git a/Guardian of Silverkeep/Assets/Scripts/Hero.cs b/Guardian of Silverkeep/Assets/Scripts/Hero.cs
index 1a524f5..f4e6589 100644
--- a/Guardian of Silverkeep/Assets/Scripts/Hero.cs	
+++ b/Guardian of Silverkeep/Assets/Scripts/Hero.cs	
@@ -50,6 +50,8 @@ public class Hero: MonoBehaviour
 	void Start () {
 		state = State.Playing;
 		timeStamp = Time.time + coolDownPeriodInSeconds;
+		Screen.lockCursor = true;
+		Screen.showCursor = false;
 
 	}
 	
@@ -63,6 +65,10 @@ public class Hero: MonoBehaviour
 	*/
 	void Update () 
 	{
+//		if(Input.GetKey(KeyCode.Escape))
+//			Screen.lockCursor = false;
+//		else
+//			Screen.lockCursor = true;
 		if (state != State.Dead)
 		{
 			
diff --git a/Guardian of Silverkeep/ProjectSettings/ProjectSettings.asset b/Guardian of Silverkeep/ProjectSettings/ProjectSettings.asset
index cac4039..32c3932 100644
--- a/Guardian of Silverkeep/ProjectSettings/ProjectSettings.asset	
+++ b/Guardian of Silverkeep/ProjectSettings/ProjectSettings.asset	
@@ -10,7 +10,7 @@ PlayerSettings:
   targetGlesGraphics: 1
   targetResolution: 0
   accelerometerFrequency: 60
-  companyName: DefaultCompany
+  companyName: Game Huskies
   productName: Guardian of Silverkeep
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
@@ -106,7 +106,7 @@ PlayerSettings:
   m_BuildTargetIcons:
   - m_BuildTarget: 
     m_Icons:
-    - m_Icon: {fileID: 0}
+    - m_Icon: {fileID: 2800000, guid: 7e53829d09be4594eafd649733610e44, type: 3}
       m_Size: 128
   m_BuildTargetBatching: []
   webPlayerTemplate: APPLICATION:Default