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

Conflicts:
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Global/Gamer.cs
	Unity/Assets/Scripts/Game/Playground/UI/UIManager.cs.meta

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