UnityProject Sound

VictorHVS · May 26, 2014 · 7500dc7 · 7500dc7
1 parent d4ee077
commit 7500dc7
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 508 deletions.
diff --git a/Assets/creeper.blend b/Assets/creeper.blend
diff --git a/Assets/creeper.blend1 b/Assets/creeper.blend1
diff --git a/Assets/creeper.fbx b/Assets/creeper.fbx
diff --git a/Assets/creeper.png b/Assets/creeper.png
diff --git a/Sound/AmbientLevel.mp3 b/Sound/AmbientLevel.mp3
diff --git a/UnityProject/Assets/Scene/Level1.unity b/UnityProject/Assets/Scene/Level1.unity
diff --git a/UnityProject/Assets/Scripts/PlayerBehaviour/CollisonBehaviour.cs b/UnityProject/Assets/Scripts/PlayerBehaviour/CollisonBehaviour.cs
@@ -20,7 +20,7 @@ void Update () {
 	void OnTriggerEnter(Collider hit){
 		if(hit.transform.tag == "checkPoint"){
 			checkPointPosition = hit.transform.position;
-			//checkPointRotate = hit.transform.localRotation;
+			checkPointRotate = hit.transform.localRotation;
 			Destroy(hit.gameObject);
 		}
 		if(hit.transform.tag == "portal"){
@@ -32,7 +32,7 @@ void OnTriggerEnter(Collider hit){
 	void respawn (){
 		if (transform.localPosition.y < -5) {
 			transform.position = checkPointPosition;
-			//transform.localRotation = checkPointRotate;
+			transform.localRotation = checkPointRotate;
 		}
 	}
 

diff --git a/UnityProject/Library/CurrentLayout.dwlt b/UnityProject/Library/CurrentLayout.dwlt
diff --git a/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll b/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/UnityProject/Library/assetDatabase3 b/UnityProject/Library/assetDatabase3
diff --git a/UnityProject/Library/expandedItems b/UnityProject/Library/expandedItems
diff --git a/UnityProject/Library/metadata/82/82389d468c90a064c85c44677350e727 b/UnityProject/Library/metadata/82/82389d468c90a064c85c44677350e727
diff --git a/UnityProject/UnityProject-csharp.sln b/UnityProject/UnityProject-csharp.sln
@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																							GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																								GlobalSection(MonoDevelopProperties) = preSolution
 =======
 																						GlobalSection(MonoDevelopProperties) = preSolution
 >>>>>>> 2a0d4d6c757840b2047b2a23e4cf155c85bec69b

diff --git a/UnityProject/UnityProject.sln b/UnityProject/UnityProject.sln
@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																						GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																							GlobalSection(MonoDevelopProperties) = preSolution
 =======
 																						GlobalSection(MonoDevelopProperties) = preSolution
 >>>>>>> 2a0d4d6c757840b2047b2a23e4cf155c85bec69b

diff --git a/UnityProject/UnityProject.userprefs b/UnityProject/UnityProject.userprefs
@@ -1,8 +1,9 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\GameController\LightIntensity.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\PlayerBehaviour\CollisonBehaviour.cs">
     <Files>
-      <File FileName="Assets\Scripts\GameController\LightIntensity.cs" Line="27" Column="28" />
+      <File FileName="Assets\Scripts\PlayerBehaviour\CollisonBehaviour.cs" Line="35" Column="4" />
+      <File FileName="Assets\Scripts\GameController\LightIntensity.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>