Merge branch 'master' into 'master'

amélioration du script de dialogue

See merge request chirz/cityescape!33

Assets/Scripts/GUI/Dialog.cs

@@ -29,7 +29,6 @@ public class Dialog : MonoBehaviour
 
     public GameObject dialogBox;
     public Text dialogText;
-    public CanvasRenderer cr;
     public int dialog;
     public bool dialogActive;
     public string situation;