Fix Graphical Errors

devmattrick · Jan 3, 2014 · 47bb68b · 47bb68b
1 parent 7750ea4
commit 47bb68b
Show file tree

Hide file tree

Showing 65 changed files with 871 additions and 7 deletions.
diff --git a/Assets/Chunk.prefab.meta b/Assets/Chunk.prefab.meta
diff --git a/Assets/ChunkMaterial.mat.meta b/Assets/ChunkMaterial.mat.meta
diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta
diff --git a/Assets/Scripts/Chunk.cs.meta b/Assets/Scripts/Chunk.cs.meta
diff --git a/Assets/Scripts/Crosshair.cs.meta b/Assets/Scripts/Crosshair.cs.meta
diff --git a/Assets/Scripts/Noise.cs.meta b/Assets/Scripts/Noise.cs.meta
diff --git a/Assets/Scripts/PlayerIO.cs b/Assets/Scripts/PlayerIO.cs
@@ -28,10 +28,9 @@ void Update () {
 
 
 				if (Input.GetMouseButtonDown(0)){
-				Vector3 p = hit.point;
-				p -= hit.normal / 4;
-
-				chunk.SetBrick(0, p);
+					Vector3 p = hit.point;
+					p -= hit.normal / 4;
+					chunk.SetBrick(0, p);
 
 				} 
 
@@ -40,6 +39,7 @@ void Update () {
 					Vector3 p = hit.point;
 				if (selectedInventory != 0){
 						p += hit.normal / 4;
+						if (p != new Vector3 (GameObject.FindWithTag("MinecraftPlayer").transform.position.x,GameObject.FindWithTag("MinecraftPlayer").transform.position.y,GameObject.FindWithTag("MinecraftPlayer").transform.position.z))
 						chunk.SetBrick(selectedInventory,p);
 				}
 
@@ -57,11 +57,13 @@ void Update () {
 		if (Input.GetKeyDown (KeyCode.F5)) {
 						if (resetCamera == false) {
 								transform.localPosition -= Vector3.forward * 2;
+								GameObject.FindWithTag("MinecraftPlayer").layer = 1;
 								resetCamera = true;
 						}
 			else{
 				transform.position = transform.parent.root.transform.localPosition + new Vector3(0f, 0.7f, 0.06f);
 				transform.rotation = transform.parent.root.transform.rotation;
+				GameObject.FindWithTag("MinecraftPlayer").layer = 8;
 				resetCamera = false;
 				}
 	}

diff --git a/Assets/Scripts/PlayerIO.cs.meta b/Assets/Scripts/PlayerIO.cs.meta
diff --git a/Assets/Scripts/PlayerWalkScript.cs.meta b/Assets/Scripts/PlayerWalkScript.cs.meta
diff --git a/Assets/Scripts/PlayerWalkScriptLeft.cs.meta b/Assets/Scripts/PlayerWalkScriptLeft.cs.meta
diff --git a/Assets/Scripts/World.cs.meta b/Assets/Scripts/World.cs.meta
diff --git a/Assets/Standard Assets.meta b/Assets/Standard Assets.meta
diff --git a/Assets/Standard Assets/Character Controllers.meta b/Assets/Standard Assets/Character Controllers.meta
diff --git a/Assets/Standard Assets/Character Controllers/3rd Person Controller.prefab.meta b/Assets/Standard Assets/Character Controllers/3rd Person Controller.prefab.meta
diff --git a/Assets/Standard Assets/Character Controllers/First Person Controller.prefab.meta b/Assets/Standard Assets/Character Controllers/First Person Controller.prefab.meta
diff --git a/Assets/Standard Assets/Character Controllers/Materials.meta b/Assets/Standard Assets/Character Controllers/Materials.meta
diff --git a/...Standard Assets/Character Controllers/Materials/MinecraftPlayer-Player__char_png.mat.meta b/...Standard Assets/Character Controllers/Materials/MinecraftPlayer-Player__char_png.mat.meta
diff --git a/...andard Assets/Character Controllers/Materials/MinecraftPlayer-Player__char_png_0.mat.meta b/...andard Assets/Character Controllers/Materials/MinecraftPlayer-Player__char_png_0.mat.meta
diff --git a/Assets/Standard Assets/Character Controllers/Materials/Player.mat.meta b/Assets/Standard Assets/Character Controllers/Materials/Player.mat.meta
diff --git a/Assets/Standard Assets/Character Controllers/Materials/Player__char_png_0.mat.meta b/Assets/Standard Assets/Character Controllers/Materials/Player__char_png_0.mat.meta
diff --git a/Assets/Standard Assets/Character Controllers/Materials/char.mat.meta b/Assets/Standard Assets/Character Controllers/Materials/char.mat.meta
diff --git a/Assets/Standard Assets/Character Controllers/Materials/defaultMat.mat.meta b/Assets/Standard Assets/Character Controllers/Materials/defaultMat.mat.meta
diff --git a/Assets/Standard Assets/Character Controllers/MinecraftPlayer.blend.meta b/Assets/Standard Assets/Character Controllers/MinecraftPlayer.blend.meta