another usefull commit
a usefull commit
Manos agregadas (gallina robot2)
Main Char con 2 modelos
Issue #223 Fixed the weight of feathers with the bones of model of crazy rooster in blender
Issue #108 @handrez Images of leader roozter and crazy rooster
Merge branch 'devel' into devel-B
Canvis efectuats per fer-ho funcional a mac
#277 Done

Ready for Test, and for up to devel.
Merge remote-tracking branch 'origin/devel' into devel-A

Conflicts:
	ChicknDestroy/unity/Mainmenu Scene/Assets/Blender/gallina_robot1_escopeta.fbx.meta
	ChicknDestroy/unity/Mainmenu Scene/Assets/Blender/gallina_robot1_katana.fbx.meta
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scenes/ChicknDestroy_Terrain.unity
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scripts/PlayerController.cs
Completar push anterior
Fixed merge bugs
#280 esquelet posat al model 2 de la gallina
Corregir modelo gallina robot2 Issue #281
#292 model escut

primer model escut (sense textura)
#292 model escut

model anterior ja texturitzat
 #292 model escut

fbx i animació enllestides, llest pera testejar
#280 esquelet creat i adaptat
Revert " #292 model escut"

This reverts commit 40a9f18bddec6ed87dbf020e4b61862d7b105ae0.
Revert "#292 model escut"

This reverts commit eacb2179312e062b7cfd4e92d6d226754c178e58.