gitdev481 · gitdev481 · Feb 21, 2016 · Feb 21, 2016 · Feb 21, 2016 · Feb 21, 2016
diff --git a/Assets/Editor/PolygonalColliderMan.cs b/Assets/Editor/PolygonalColliderMan.cs
@@ -2,106 +2,109 @@
 using System.Collections;
 using UnityEditor;
 
-//is a custom editor for whatever object has a polygoncollider2d attached
-[CustomEditor(typeof(PolygonCollider2D))]
-public class PolygonColliderMan :  Editor
-{
+namespace ShellShock
+{ 
+    //is a custom editor for whatever object has a polygoncollider2d attached
+    [CustomEditor(typeof(PolygonCollider2D))]
+    public class PolygonColliderMan :  Editor
+    {
 
-	private bool PolygonColliderManual;
-	private bool[] NewColliders = new bool[0];
-	private Vector2[][] Polygons;
+  private bool PolygonColliderManual;
+  private bool[] NewColliders = new bool[0];
+  private Vector2[][] Polygons;
 
-	public override void OnInspectorGUI()
-	{
-		PolygonCollider2D collider = (PolygonCollider2D)target;
+  public override void OnInspectorGUI()
+  {
+  PolygonCollider2D collider = (PolygonCollider2D)target;
 
-		DrawDefaultInspector();
-		//modify the layout with a new polygoncollidermanual section	
-		PolygonColliderManual = EditorGUILayout.Foldout(PolygonColliderManual, "PolygonColliderManual");
+  DrawDefaultInspector();
+  //modify the layout with a new polygoncollidermanual section	
+  PolygonColliderManual = EditorGUILayout.Foldout(PolygonColliderManual, "PolygonColliderManual");
 
-		if (PolygonColliderManual)
-		{
-			Polygons = new Vector2[collider.pathCount][];
-			for (int i = 0; i < collider.pathCount; i++)
-			{
-				Vector2[] path = collider.GetPath(i);
-				Polygons[i] = path;
-			}
+  if (PolygonColliderManual)
+  {
+  Polygons = new Vector2[collider.pathCount][];
+  for (int i = 0; i < collider.pathCount; i++)
+  {
+  Vector2[] path = collider.GetPath(i);
+  Polygons[i] = path;
+  }
 
-			int size = EditorGUILayout.IntField("Size", Polygons.Length);
+  int size = EditorGUILayout.IntField("Size", Polygons.Length);
 
 
-			if (NewColliders.Length != Polygons.Length)
-			{
-				bool[] ArrNewColliders = new bool[Polygons.Length];
+  if (NewColliders.Length != Polygons.Length)
+  {
+  bool[] ArrNewColliders = new bool[Polygons.Length];
 
-				for (int i = 0; i < ArrNewColliders.Length; i++)
-				{
-					if (NewColliders.Length > i)
-						ArrNewColliders[i] = NewColliders[i];
-					else
-						ArrNewColliders[i] = false;
-				}
+  for (int i = 0; i < ArrNewColliders.Length; i++)
+  {
+  if (NewColliders.Length > i)
+  ArrNewColliders[i] = NewColliders[i];
+  else
+  ArrNewColliders[i] = false;
+  }
 
-				NewColliders = ArrNewColliders;
-			}
+  NewColliders = ArrNewColliders;
+  }
 
-			if (size != Polygons.Length)
-			{
-				Vector2[][] newPaths = new Vector2[size][];
-				for (int i = 0; i < size; i++)
-				{
-					if (Polygons.Length > i)
-					{
-						newPaths[i] = Polygons[i];
-					}
-					else
-					{
-						newPaths[i] = new Vector2[0];
-					}
-				}
-				Polygons = newPaths;
-			}
+  if (size != Polygons.Length)
+  {
+  Vector2[][] newPaths = new Vector2[size][];
+  for (int i = 0; i < size; i++)
+  {
+  if (Polygons.Length > i)
+  {
+  newPaths[i] = Polygons[i];
+  }
+  else
+  {
+  newPaths[i] = new Vector2[0];
+  }
+  }
+  Polygons = newPaths;
+  }
 
-			EditorGUI.indentLevel++;
-			for (int i = 0; i < size; i++)
-			{
-				NewColliders[i] = EditorGUILayout.Foldout(NewColliders[i], string.Concat("Path ", i));
+  EditorGUI.indentLevel++;
+  for (int i = 0; i < size; i++)
+  {
+  NewColliders[i] = EditorGUILayout.Foldout(NewColliders[i], string.Concat("Path ", i));
 
-				if (NewColliders[i])
-				{
-					Vector2[] path = Polygons[i];
-					int pathSize = EditorGUILayout.IntField("Size", path.Length);
-					if (pathSize != path.Length)
-					{
-						Vector2[] newPath = new Vector2[pathSize];
-						for (int j = 0; j < pathSize; j++)
-						{
-							if (path.Length > j)
-							{
-								newPath[j] = path[j];
-							}
-							else
-							{
-								newPath[j] = new Vector2();
-							}
-						}
-						Polygons[i] = newPath;
-					}
+  if (NewColliders[i])
+  {
+  Vector2[] path = Polygons[i];
+  int pathSize = EditorGUILayout.IntField("Size", path.Length);
+  if (pathSize != path.Length)
+  {
+  Vector2[] newPath = new Vector2[pathSize];
+  for (int j = 0; j < pathSize; j++)
+  {
+  if (path.Length > j)
+  {
+  newPath[j] = path[j];
+  }
+  else
+  {
+  newPath[j] = new Vector2();
+  }
+  }
+  Polygons[i] = newPath;
+  }
 
-					for (int j = 0; j < pathSize; j++)
-					{
-						Polygons[i][j] = EditorGUILayout.Vector2Field(string.Concat("Point ", j), Polygons[i][j]);
-					}
-				}
-			}
-			EditorGUI.indentLevel--;
+  for (int j = 0; j < pathSize; j++)
+  {
+  Polygons[i][j] = EditorGUILayout.Vector2Field(string.Concat("Point ", j), Polygons[i][j]);
+  }
+  }
+  }
+  EditorGUI.indentLevel--;
 
-			collider.pathCount = Polygons.Length;
-			for (int i = 0; i < Polygons.Length; i++)
-			{
-				collider.SetPath(i, Polygons[i]);
-			}
-		}
-	}
-}
+			    collider.pathCount = Polygons.Length;
+			    for (int i = 0; i < Polygons.Length; i++)
+			    {
+				    collider.SetPath(i, Polygons[i]);
+			    }
+		    }
+	    }
+    }
+}
diff --git a/Assets/MovementISO.cs b/Assets/MovementISO.cs
diff --git a/Assets/Prefabs/Acolade Manager.prefab b/Assets/Prefabs/Acolade Manager.prefab
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &104076
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 472770}
+  - 114: {fileID: 11434298}
+  m_Layer: 0
+  m_Name: Acolade Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &472770
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 104076}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -.124886155, y: .0156106949, z: -.00819587708}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!114 &11434298
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 104076}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3da60e80b5f08a84bbeefea68eef36db, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  statTrackers: []
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 104076}
+  m_IsPrefabParent: 1
diff --git a/Assets/Prefabs/Acolade Manager.prefab.meta b/Assets/Prefabs/Acolade Manager.prefab.meta
diff --git a/Assets/Prefabs/Level Blocks.meta b/Assets/Prefabs/Level Blocks.meta