Merge branch 'master' of https://github.com/crazysam/cloudwrangler

gamedevsam · gamedevsam · commit 01072a98414d · 2013-08-04T12:33:23.000-04:00
Conflicts:
	Assets/Prefabs/Cloud.prefab
	Assets/Scenes/CloudSandbox.unity
diff --git a/Assets/Scripts/CloudController.cs b/Assets/Scripts/CloudController.cs
@@ -109,7 +109,7 @@ public void SetDeadState()
 
     void OnCollisionEnter(Collision collision)
     {
-        if (collision.gameObject.name.Equals("Walls"))
+        if (collision.gameObject.name.Equals("WallPlane"))
         {
             print(collision.gameObject.name);
             flip *= -1;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void SetDeadState()`
`109`	`109`
`110`	`110`	`void OnCollisionEnter(Collision collision)`
`111`	`111`	`{`
`112`		`- if (collision.gameObject.name.Equals("Walls"))`
	`112`	`+ if (collision.gameObject.name.Equals("WallPlane"))`
`113`	`113`	`{`
`114`	`114`	`print(collision.gameObject.name);`
`115`	`115`	`flip *= -1;`