Feedback pour les supers :
* Ajout d'effet de particules et de couleur à customiser

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'master' of https://github.com/sylafrs/rugby.git

Conflicts:
	Unity/Assets/Scripts/Unit/Unit.cs

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
j'ai du oublier de sauver la scène

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Modification des particules pour les super !

Signed-off-by: ThomasSZOC <thomas.szo.constantin@gmail.com>
prepare merge
Merge branch 'master' into Touches

Conflicts:
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Unit/Team.cs

Resolve Team.cs
Using theirs terrain
Next commit : merge terrain with prefab :)

Signed-off-by: sylafrs <sylaf@hotmail.fr>
merge complete