Signed-off-by: ThomasSZOC <thomas.szo.constantin@gmail.com>
Merge branch 'master' of git@github.com:sylafrs/rugby
Merge branch 'master' of git@github.com:sylafrs/rugby
Merge branch 'master' of git@github.com:sylafrs/rugby
Signed-off-by: ThomasSZOC <thomas.szo.constantin@gmail.com>
Merge branch 'master' of git@github.com:sylafrs/rugby

Conflicts:
	Unity/Assets/Scripts/Game/Autres/LOG.meta~HEAD.meta~HEAD.meta
	Unity/Assets/Scripts/Game/MiniGames/Playground/Unit.meta~HEAD.meta
Merge branch 'master' of git@github.com:sylafrs/rugby
Tweak caméra mélée, temps de jeu passé à 240 secondes, vitesse de super des joueurs jap

Signed-off-by: ThomasSZOC <thomas.szo.constantin@gmail.com>
- Camera de hors limite derrière buts
- Commentaires dans shake

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'master' of git@github.com:sylafrs/rugby.git
Les joueurs ne bougent plus pendant un hors limit

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'master' into addSounds

Conflicts:
	Unity/Assets/FBX/jap_captain/JapanAnimationTree.controller
	Unity/Assets/FBX/maori/MaoriAnimationTree.controller
sounds