Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

EPSIProjetWatchIT · Jan 19, 2014 · 681a093 · 681a093
2 parents d017672 + b6ae58e
commit 681a093
Show file tree

Hide file tree

Showing 96 changed files with 3,965 additions and 75,328 deletions.
diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj
@@ -5,7 +5,7 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
-	<ProjectGuid>{1C09369F-29C4-14D4-C980-635AB981BEDF}</ProjectGuid>
+	<ProjectGuid>{9CC13FBD-7A38-9BF9-EA21-A0F2D154C6B0}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
 	<RootNamespace></RootNamespace>
@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -5,7 +5,7 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
-	<ProjectGuid>{1C09369F-29C4-14D4-C980-635AB981BEDF}</ProjectGuid>
+	<ProjectGuid>{9CC13FBD-7A38-9BF9-EA21-A0F2D154C6B0}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
 	<RootNamespace></RootNamespace>
@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
@@ -103,7 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
-      <Project>{BD7761DF-6156-D0BA-831A-5F2020021573}</Project>      <Name>Assembly-UnityScript-firstpass</Name>    </ProjectReference>
+      <Project>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</Project>      <Name>Assembly-UnityScript-firstpass</Name>    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Assembly-UnityScript-firstpass-vs.unityproj b/Assembly-UnityScript-firstpass-vs.unityproj
@@ -5,7 +5,7 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
-	<ProjectGuid>{BD7761DF-6156-D0BA-831A-5F2020021573}</ProjectGuid>
+	<ProjectGuid>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
 	<RootNamespace></RootNamespace>
@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Assembly-UnityScript-firstpass.unityproj b/Assembly-UnityScript-firstpass.unityproj
@@ -5,7 +5,7 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
-	<ProjectGuid>{BD7761DF-6156-D0BA-831A-5F2020021573}</ProjectGuid>
+	<ProjectGuid>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
 	<RootNamespace></RootNamespace>
@@ -39,10 +39,10 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Assembly-UnityScript-vs.unityproj b/Assembly-UnityScript-vs.unityproj
@@ -5,7 +5,7 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
-	<ProjectGuid>{CC84D0D6-02CF-1999-AE59-102BDD1EA0AF}</ProjectGuid>
+	<ProjectGuid>{0DDBE485-1F95-AE68-B4E3-1C9E79A57D68}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
 	<RootNamespace></RootNamespace>
@@ -39,15 +39,16 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
      <Compile Include="Assets\Scenes\Scene_Cinematiques\Scripts\AudioScript.js" />
      <Compile Include="Assets\Scripts\Menu\CollisionDetection.js" />
+     <Compile Include="Assets\Scripts\Menu\MenuAudio.js" />
      <Compile Include="Assets\Scripts\Menu\Menu_ActionCo.js" />
      <Compile Include="Assets\Scripts\Menu\Menu_Curseur.js" />
      <Compile Include="Assets\Scripts\Menu\Menu_Son.js" />

diff --git a/Assembly-UnityScript.unityproj b/Assembly-UnityScript.unityproj
@@ -5,7 +5,7 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
-	<ProjectGuid>{CC84D0D6-02CF-1999-AE59-102BDD1EA0AF}</ProjectGuid>
+	<ProjectGuid>{0DDBE485-1F95-AE68-B4E3-1C9E79A57D68}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
 	<RootNamespace></RootNamespace>
@@ -39,15 +39,16 @@
 	<Reference Include="System.Core" />
 	<Reference Include="System.Xml.Linq" />
 	<Reference Include="UnityEngine">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEngine.dll</HintPath>
 	</Reference>
 	<Reference Include="UnityEditor">
-	  <HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+	  <HintPath>C:/Program Files (x86)/Unity2/Editor/Data/Managed/UnityEditor.dll</HintPath>
 	</Reference>
   </ItemGroup>
   <ItemGroup>
      <Compile Include="Assets\Scenes\Scene_Cinematiques\Scripts\AudioScript.js" />
      <Compile Include="Assets\Scripts\Menu\CollisionDetection.js" />
+     <Compile Include="Assets\Scripts\Menu\MenuAudio.js" />
      <Compile Include="Assets\Scripts\Menu\Menu_ActionCo.js" />
      <Compile Include="Assets\Scripts\Menu\Menu_Curseur.js" />
      <Compile Include="Assets\Scripts\Menu\Menu_Son.js" />
@@ -62,7 +63,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
-      <Project>{BD7761DF-6156-D0BA-831A-5F2020021573}</Project>      <Name>Assembly-UnityScript-firstpass</Name>    </ProjectReference>
+      <Project>{C87CF20A-E2EE-6AE2-A05C-22FB01392D0B}</Project>      <Name>Assembly-UnityScript-firstpass</Name>    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Assets/Elements/Grotte/MinionQuitter.jpg.meta b/Assets/Elements/Grotte/MinionQuitter.jpg.meta
diff --git a/Assets/Elements/Grotte/Minion_Indy_Menu_pause.jpg.meta b/Assets/Elements/Grotte/Minion_Indy_Menu_pause.jpg.meta
diff --git a/Assets/Kinect/Script/Kinect/Gesture/GameOverGesture.cs b/Assets/Kinect/Script/Kinect/Gesture/GameOverGesture.cs
@@ -25,6 +25,9 @@ public class GameOverGesture : MonoBehaviour {
 
 
 	private GameObject[] menu = new GameObject[2];
+
+	GameObject[] listeGui;
+	GameObject guiChargement;
 
 
 
@@ -33,6 +36,11 @@ void Start () {
 		bonePos = new Vector3[2,(int)Kinect.NuiSkeletonPositionIndex.Count];
 		menu [0] = GameObject.Find ("GUI Text Recommencer");
 		menu [1] = GameObject.Find ("GUI Text Quitter");
+
+
+		listeGui = GameObject.FindGameObjectsWithTag ("GuiMenu");
+		guiChargement = GameObject.Find ("Affichage chargement");
+		guiChargement.guiText.text = "";
 
 	}
 
@@ -67,8 +75,15 @@ void Update () {
 
 			if (pass && peuxValider)
 			{
-				if (tableauBoolPos[0])
+				if (tableauBoolPos[0]){
+					foreach (GameObject gui in listeGui) {
+						gui.SetActive(false);		
+					}
+					guiChargement.guiText.text = "Chargement...";
 					Application.LoadLevel(scene);
+				}
+
+
 				if (tableauBoolPos[1])
 					Application.LoadLevel("MenuAvecMinion");
 

diff --git a/Assets/Kinect/Script/Kinect/Gesture/GameOverGestureChateau.cs b/Assets/Kinect/Script/Kinect/Gesture/GameOverGestureChateau.cs
@@ -26,13 +26,19 @@ public class GameOverGestureChateau : MonoBehaviour {
 
 	private GameObject[] menu = new GameObject[2];
 
-
+	GameObject[] listeGui;
+	GameObject guiChargement;
+
 
 	// Use this for initialization
 	void Start () {
 		bonePos = new Vector3[2,(int)Kinect.NuiSkeletonPositionIndex.Count];
 		menu [0] = GameObject.Find ("GUI Text Recommencer");
 		menu [1] = GameObject.Find ("GUI Text Quitter");
+
+		listeGui = GameObject.FindGameObjectsWithTag ("GuiMenu");
+		guiChargement = GameObject.Find ("Affichage chargement");
+		guiChargement.guiText.text = "";
 
 	}
 
@@ -67,8 +73,14 @@ void Update () {
 
 			if (pass && peuxValider)
 			{
-				if (tableauBoolPos[0])
+				if (tableauBoolPos[0]){
+					foreach (GameObject gui in listeGui) {
+						gui.SetActive(false);		
+					}
+					guiChargement.guiText.text = "Chargement...";
 					Application.LoadLevel(scene);
+				}
+
 				if (tableauBoolPos[1])
 					Application.LoadLevel("MenuAvecMinion");
 

diff --git a/Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs b/Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs
@@ -92,7 +92,7 @@ void Update () {
 						gui.SetActive(false);		
 					}
 					guiChargement.guiText.text = "Chargement...";
-					Application.LoadLevel("Scene_Chateau_2");
+					Application.LoadLevel("Transition");
 
 				}
 

diff --git a/Assets/Kinect/Script/Kinect/Gesture/VictoireGesture.cs b/Assets/Kinect/Script/Kinect/Gesture/VictoireGesture.cs
@@ -26,13 +26,19 @@ public class VictoireGesture : MonoBehaviour {
 
 	private GameObject[] menu = new GameObject[2];
 
-
+	GameObject[] listeGui;
+	GameObject guiChargement;
+
 
 	// Use this for initialization
 	void Start () {
 		bonePos = new Vector3[2,(int)Kinect.NuiSkeletonPositionIndex.Count];
 		menu [0] = GameObject.Find ("GUI Text Suivant");
 		menu [1] = GameObject.Find ("GUI Text Quitter");
+
+		listeGui = GameObject.FindGameObjectsWithTag ("GuiMenu");
+		guiChargement = GameObject.Find ("Affichage chargement");
+		guiChargement.guiText.text = "";
 
 	}
 
@@ -67,8 +73,15 @@ void Update () {
 
 			if (pass && peuxValider)
 			{
-				if (tableauBoolPos[0])
+				if (tableauBoolPos[0]){
+					foreach (GameObject gui in listeGui) {
+						gui.SetActive(false);		
+					}
+					guiChargement.guiText.text = "Chargement...";
 					Application.LoadLevel(scene);
+				}
+
+
 				if (tableauBoolPos[1])
 					Application.LoadLevel("MenuAvecMinion");
 

diff --git a/Assets/Kinect/Script/Kinect/Gesture/VictoireGestureChateau.cs b/Assets/Kinect/Script/Kinect/Gesture/VictoireGestureChateau.cs
@@ -26,14 +26,20 @@ public class VictoireGestureChateau: MonoBehaviour {
 
 	private GameObject[] menu = new GameObject[2];
 
-
+	GameObject[] listeGui;
+	GameObject guiChargement;
+
 
 	// Use this for initialization
 	void Start () {
 		bonePos = new Vector3[2,(int)Kinect.NuiSkeletonPositionIndex.Count];
 		menu [0] = GameObject.Find ("GUI Text Recommencer");
 		menu [1] = GameObject.Find ("GUI Text Quitter");
 
+		listeGui = GameObject.FindGameObjectsWithTag ("GuiMenu");
+		guiChargement = GameObject.Find ("Affichage chargement");
+		guiChargement.guiText.text = "";
+
 	}
 
 	// Update is called once per frame
@@ -67,8 +73,14 @@ void Update () {
 
 			if (pass && peuxValider)
 			{
-				if (tableauBoolPos[0])
+				if (tableauBoolPos[0]){
+					foreach (GameObject gui in listeGui) {
+						gui.SetActive(false);		
+					}
+					guiChargement.guiText.text = "Chargement...";
 					Application.LoadLevel(scene);
+				}
+
 				if (tableauBoolPos[1])
 					Application.LoadLevel("MenuAvecMinion");
 

diff --git a/Assets/Kinect/Thumbs.db.meta b/Assets/Kinect/Thumbs.db.meta