Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/Scipts/Map.cs

@@ -45,13 +45,14 @@ public class Map : MonoBehaviour
             Player PS = Player.GetComponent<Player>();
             Transform PT = Player.transform;
             Transform model = PT.Find("Model");
-            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x -TileSize * MapDimensions.x, PT.position.y, PT.position.z), transform.rotation, model).gameObject);
-            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x + TileSize * MapDimensions.x, PT.position.y, PT.position.z), transform.rotation, model).gameObject);
-            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x, PT.position.y, PT.position.z - TileSize * MapDimensions.y), transform.rotation, model).gameObject);
-            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x, PT.position.y, PT.position.z + TileSize * MapDimensions.y), transform.rotation, model).gameObject);
+            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x -TileSize * MapDimensions.x, PT.position.y, PT.position.z), transform.rotation, PT).gameObject);
+            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x + TileSize * MapDimensions.x, PT.position.y, PT.position.z), transform.rotation, PT).gameObject);
+            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x, PT.position.y, PT.position.z - TileSize * MapDimensions.y), transform.rotation, PT).gameObject);
+            PS.dummies.Add(Instantiate(model, new Vector3(PT.position.x, PT.position.y, PT.position.z + TileSize * MapDimensions.y), transform.rotation, PT).gameObject);
 
             foreach (GameObject dummie in PS.dummies)
             {
+                dummie.transform.parent = model;
                 foreach (Collider col in dummie.GetComponentsInChildren<Collider>())
                 {
                     col.enabled = false;