From 119ae969c3dce586325bc06d69223a11aad1d202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= <jsgervais@hotmail.com>
Date: Fri, 8 Apr 2016 17:23:40 -0400
Subject: [PATCH] Dashin implemented

---
 Assets/Scripts/AsteroidSpawner.cs     |  2 +-
 Assets/Scripts/Astronaut.cs           |  2 +
 Assets/Scripts/AstronautController.cs |  6 +--
 Assets/_Scenes/Main.unity             | 77 +++++++++++++++++++++++++--
 4 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/Assets/Scripts/AsteroidSpawner.cs b/Assets/Scripts/AsteroidSpawner.cs
index 821fb83..f837b34 100644
--- a/Assets/Scripts/AsteroidSpawner.cs
+++ b/Assets/Scripts/AsteroidSpawner.cs
@@ -7,7 +7,7 @@ public class AsteroidSpawner : TimerFunctionsClass
 
     public float NextSpawnTime = 1.0f;
     public GameObject AsteroidPrefab;
-    public bool GenerationVersLesjoueurs = true;  //random lorsque false;
+    public bool GenerationVersLesjoueurs = false;  //random lorsque false;
 
 	// Use this for initialization
 	void Start ()
diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs
index 17d9ce6..0beaf1b 100644
--- a/Assets/Scripts/Astronaut.cs
+++ b/Assets/Scripts/Astronaut.cs
@@ -212,6 +212,8 @@ public class Astronaut : MonoBehaviour {
 	{
 		if (_state >= AstronautState.Ejecting)
 			return;
+
+        planet.PushWedge(this.theta);
 	}
 
 	public void OnGUI()
diff --git a/Assets/Scripts/AstronautController.cs b/Assets/Scripts/AstronautController.cs
index bd94670..0492100 100644
--- a/Assets/Scripts/AstronautController.cs
+++ b/Assets/Scripts/AstronautController.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using InputHandler;
 
-[RequireComponent(typeof(Astronaut))]
+[RequireComponent(typeof(Astronaut))]
 public class AstronautController : MonoBehaviour {
 
 	private Astronaut _astronaut;
@@ -65,5 +65,5 @@ public class AstronautController : MonoBehaviour {
 			_astronaut.Jump();
 		}
 	}
-}
-
+}
+
diff --git a/Assets/_Scenes/Main.unity b/Assets/_Scenes/Main.unity
index 3ded358..3e1ac6b 100644
--- a/Assets/_Scenes/Main.unity
+++ b/Assets/_Scenes/Main.unity
@@ -177,9 +177,10 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 7.9, y: 7.9, z: 0.1}
-  m_Children: []
+  m_Children:
+  - {fileID: 1963189941}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 2
 --- !u!1 &1055650857
 GameObject:
   m_ObjectHideFlags: 0
@@ -316,7 +317,7 @@ Prefab:
     - target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
       propertyPath: planet
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 1027139440}
     - target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
       propertyPath: StepTime
       value: 5
@@ -369,6 +370,18 @@ Prefab:
       propertyPath: m_Name
       value: Astronaut_1
       objectReference: {fileID: 0}
+    - target: {fileID: 170392, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
+      propertyPath: m_TagString
+      value: Untagged
+      objectReference: {fileID: 0}
+    - target: {fileID: 154602, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}
   m_IsPrefabParent: 0
@@ -458,3 +471,61 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+--- !u!1 &1963189940
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 1963189941}
+  - 212: {fileID: 1963189942}
+  m_Layer: 0
+  m_Name: T_Planet_Center
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1963189941
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1963189940}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.12658228, y: 0.12658228, z: 10}
+  m_Children: []
+  m_Father: {fileID: 1027139444}
+  m_RootOrder: 0
+--- !u!212 &1963189942
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1963189940}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_ReflectionProbeUsage: 0
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 545c8c8845e75b44087e8546737ac074, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0