anims
anims
transition
Merge branch 'master' into test_yannis

Conflicts:
	Unity/Assets/Scene/terrain.unity

thiers
test
test
Merge branch 'master' into test_yannis

Conflicts:
	Unity/Assets/FBX/jap_captain/JapAnimator.controller
	Unity/Assets/FBX/maori/MaoriAnimationTree.controller
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Playground/Unit/UnitAnimator.cs
merge
haloha(monpremiercommitofthedead)

Signed-off-by: Geetsuya <yannis.berkane@gmail.com>
HelloWorld

Signed-off-by: Geetsuya <yannis.berkane@gmail.com>
Merge branch 'master' into test_yannis
Tackle Jump & Fail Animation Added

Signed-off-by: Geetsuya <yannis.berkane@gmail.com>
Merge branch 'test_yannis' of git@github.com:sylafrs/rugby.git into test_yannis
add anims
test anim
tweak camera transfo : -1.8 12 -24.5
prepare merge avec l'ancienne branche de yannis.

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Merge remote-tracking branch 'remotes/origin/test_yannis'

Conflicts:
	Unity/Assets/FBX/Materials/lambert4.mat.meta
	Unity/Assets/FBX/Materials/lambert5.mat.meta
	Unity/Assets/FBX/Terrain.fbm/baked.jpg.meta
	Unity/Assets/FBX/jap_captain/JapAnimator.controller
	Unity/Assets/FBX/jap_captain/anims/Jap_Idle.fbx
	Unity/Assets/FBX/jap_captain/anims/Jap_Idle.fbx.meta
	Unity/Assets/FBX/jap_captain/anims/Jap_run.fbx
	Unity/Assets/FBX/jap_captain/anims/Jap_run.fbx.meta
	Unity/Assets/FBX/maori/Animation/Maori_Idle.fbx
	Unity/Assets/FBX/maori/Animation/Maori_Idle.fbx.meta
	Unity/Assets/FBX/maori/Animation/Maori_Run.fbx.meta
	Unity/Assets/FBX/maori/Animations/Maori_IdleBall.fbx.meta
	Unity/Assets/FBX/maori/Animations/Maori_Run.fbx.meta
	Unity/Assets/FBX/maori/Maori_Idle.fbx.meta
	Unity/Assets/FBX/maori/Maori_Run.fbx.meta
	Unity/Assets/Scripts/Game/Global/Gamer.cs
	Unity/Assets/Scripts/Game/Playground/Arbiter/Arbiter.cs
	Unity/Assets/Scripts/Game/Playground/Unit/States/MainUnitState.cs
	Unity/Assets/Scripts/Game/Playground/Unit/UnitAnimator.cs
merge
rem