Tiny tweaks

JollyCompany · Oct 30, 2014 · e7d86a1 · e7d86a1
1 parent 70f4b4f
commit e7d86a1
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 27 deletions.
diff --git a/jollyplatformer/Assets/Editor/JollyDebugInspector.cs b/jollyplatformer/Assets/Editor/JollyDebugInspector.cs
@@ -3,9 +3,10 @@
 using UnityEngine;
 using Jolly;
 
-[CustomEditor(typeof(JollyDebug))] 
-public class JollyDebugInspector : Editor {
-
+[CustomEditor(typeof(JollyDebug))]
+public class JollyDebugInspector : Editor
+{
+
 	public override void OnInspectorGUI()
 	{
 		JollyDebug jollyDebug = (JollyDebug)this.target;
@@ -31,7 +32,7 @@ private void DisplayExpressions (JollyDebug jollyDebug)
 			}
 		}
 	}
-	
+
 	public override bool RequiresConstantRepaint ()
 	{
 		return true;

diff --git a/...s/PhysicsMaterialGround.physicsMaterial2D → ...s/PhysicsMaterialGround.physicsMaterial2D b/...s/PhysicsMaterialGround.physicsMaterial2D → ...s/PhysicsMaterialGround.physicsMaterial2D
diff --git a/...sicsMaterialGround.physicsMaterial2D.meta → ...sicsMaterialGround.physicsMaterial2D.meta b/...sicsMaterialGround.physicsMaterial2D.meta → ...sicsMaterialGround.physicsMaterial2D.meta
diff --git a/jollyplatformer/Assets/Scripts/Hero.cs b/jollyplatformer/Assets/Scripts/Hero.cs
@@ -28,11 +28,12 @@ void Start ()
 	{
 		this.HeroController = this.GetComponent<HeroController>();
 
-		JollyDebug.Watch (this, "FacingRight", delegate () {
+		JollyDebug.Watch (this, "FacingRight", delegate ()
+		{
 			return this.FacingRight;
 		});
 	}
-	
+
 	void Update ()
 	{
 		bool grounded = Physics2D.Linecast(this.transform.position, this.GroundDetector.transform.position, 1 << LayerMask.NameToLayer ("Ground"));

diff --git a/jollyplatformer/Assets/Scripts/ParallaxEffect.cs b/jollyplatformer/Assets/Scripts/ParallaxEffect.cs
@@ -14,7 +14,8 @@ void Start ()
 		this.OriginalPosition = this.transform.position;
 	}
 
-	private Vector3 LerpToParallaxFactorUnclamped (Vector3 from, Vector3 to) {
+	private Vector3 LerpToParallaxFactorUnclamped (Vector3 from, Vector3 to)
+	{
 		float value = this.ParallaxFactor;
 		return (1.0f - value)*from + value*to;
 	}

diff --git a/jollytopdown/Assets/Editor/JollyDebugInspector.cs b/jollytopdown/Assets/Editor/JollyDebugInspector.cs
@@ -3,9 +3,10 @@
 using UnityEngine;
 using Jolly;
 
-[CustomEditor(typeof(JollyDebug))] 
-public class JollyDebugInspector : Editor {
-
+[CustomEditor(typeof(JollyDebug))]
+public class JollyDebugInspector : Editor
+{
+
 	public override void OnInspectorGUI()
 	{
 		JollyDebug jollyDebug = (JollyDebug)this.target;
@@ -31,7 +32,7 @@ private void DisplayExpressions (JollyDebug jollyDebug)
 			}
 		}
 	}
-	
+
 	public override bool RequiresConstantRepaint ()
 	{
 		return true;

diff --git a/jollytopdown/Assets/HeadsUpDisplay.cs → ...ytopdown/Assets/Scripts/HeadsUpDisplay.cs b/jollytopdown/Assets/HeadsUpDisplay.cs → ...ytopdown/Assets/Scripts/HeadsUpDisplay.cs
diff --git a/jollytopdown/Assets/HeadsUpDisplay.cs.meta → ...own/Assets/Scripts/HeadsUpDisplay.cs.meta b/jollytopdown/Assets/HeadsUpDisplay.cs.meta → ...own/Assets/Scripts/HeadsUpDisplay.cs.meta
diff --git a/jollytopdown/Assets/Scripts/Player.cs b/jollytopdown/Assets/Scripts/Player.cs
@@ -27,11 +27,12 @@ void Start ()
 	{
 		this.PlayerController = this.GetComponent<PlayerController>();
 
-		JollyDebug.Watch (this, "IsOnGround", delegate () {
+		JollyDebug.Watch (this, "IsOnGround", delegate ()
+		{
 			return this.IsOnGround;
 		});
 	}
-	
+
 	void Update ()
 	{
 		Ray ray = new Ray(this.transform.position, Vector3.down);
@@ -50,7 +51,7 @@ void FixedUpdate ()
 		if (Mathf.Abs(this.rigidbody.velocity.x) > maxSpeedX)
 		{
 			this.rigidbody.velocity = new Vector3(Mathf.Sign (this.rigidbody.velocity.x) * maxSpeedX, this.rigidbody.velocity.y, this.rigidbody.velocity.z);
-		}	
+		}
 
 		float maxSpeedZ = Mathf.Abs (this.MaxSpeed * v);
 		if (Mathf.Abs(this.rigidbody.velocity.z) > maxSpeedZ)

diff --git a/jollytouch/Assets/Editor/JollyDebugInspector.cs b/jollytouch/Assets/Editor/JollyDebugInspector.cs
@@ -3,9 +3,10 @@
 using UnityEngine;
 using Jolly;
 
-[CustomEditor(typeof(JollyDebug))] 
-public class JollyDebugInspector : Editor {
-
+[CustomEditor(typeof(JollyDebug))]
+public class JollyDebugInspector : Editor
+{
+
 	public override void OnInspectorGUI()
 	{
 		JollyDebug jollyDebug = (JollyDebug)this.target;
@@ -31,7 +32,7 @@ private void DisplayExpressions (JollyDebug jollyDebug)
 			}
 		}
 	}
-	
+
 	public override bool RequiresConstantRepaint ()
 	{
 		return true;

diff --git a/jollytouch/Assets/Scripts/TouchInputDispatcher.cs b/jollytouch/Assets/Scripts/TouchInputDispatcher.cs
@@ -4,12 +4,11 @@
 
 public class TouchInputDispatcher : MonoBehaviour
 {
+	void Start ()
+	{
 
-	// Use this for initialization
-	void Start () {
-
 	}
-	
+
 	void Update ()
 	{
 		foreach (Touch touch in Input.touches)

diff --git a/template/Assets/Editor/JollyDebugInspector.cs b/template/Assets/Editor/JollyDebugInspector.cs
@@ -3,9 +3,10 @@
 using UnityEngine;
 using Jolly;
 
-[CustomEditor(typeof(JollyDebug))] 
-public class JollyDebugInspector : Editor {
-
+[CustomEditor(typeof(JollyDebug))]
+public class JollyDebugInspector : Editor
+{
+
 	public override void OnInspectorGUI()
 	{
 		JollyDebug jollyDebug = (JollyDebug)this.target;
@@ -31,7 +32,7 @@ private void DisplayExpressions (JollyDebug jollyDebug)
 			}
 		}
 	}
-	
+
 	public override bool RequiresConstantRepaint ()
 	{
 		return true;

diff --git a/template/README.md b/template/README.md
@@ -27,7 +27,8 @@ Example of a 'pull'-type watch:
 ```
 void Start ()
 {
-	JollyDebug.Watch (this, "Location", delegate () {
+	JollyDebug.Watch (this, "Location", delegate ()
+	{
 		return this.gameObject.transform.position.ToString();
 	});
 }