joueur prefab (bugue)
little fix
save
enfin un fix : isKinematic
prefabs
bug de gravite
bug de gravite
debut descale
probleme passe
...3
'
Merge branch 'master' into aMergerApresDebug

Conflicts:
	Unity/Assets/Prefab/Joueur_jap_captain.prefab
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Game.cs
	Unity/Assets/Scripts/Game/Gamer.cs
	Unity/Unity-csharp.v11.suo

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

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Merge branch 'master' into aMergerApresDebug

Conflicts:
	Unity/Assets/Scene/terrain.unity

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Merge branch 'master' into aMergerApresDebug

Conflicts:
	Unity/Assets/Scene/terrain.unity

Signed-off-by: sylafrs <sylaf@hotmail.fr>
bug ia'
terrain/couleur reds

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