Merge branch 'master' into 'master'

j'ai enlevé le bouton

See merge request chirz/cityescape!73

Assets/LoseNature.cs

@@ -16,7 +16,7 @@ public class LoseNature : MonoBehaviour
             {
                 nbFactory = GameObject.FindGameObjectsWithTag("factory").Length;
                 Debug.Log("il pert de la vie: " + nbFactory * damageByFactory);
-                //collision.GetComponent<PlayerNature>().LooseNature(damageByFactory * nbFactory);
+                collision.GetComponent<PlayerNature>().LooseNature(damageByFactory * nbFactory);
                 this.lostLife = true;
             }
         }

Assets/Scripts/Player/PlayerMovement.cs

@@ -96,7 +96,7 @@ public class PlayerMovement : MonoBehaviour
             stage++;
         }
     }
-
+    
     void MoveCharacter()
     {
         change.Normalize();

Assets/Scripts/Player/PlayerNature.cs

@@ -69,6 +69,9 @@ public class PlayerNature : MonoBehaviour
     {
         this.currentNature += bonus;
 
+        if (this.currentNature >= 100)
+            this.currentNature = 100;
+
         this.natureBar.SetValue(this.currentNature);
     }