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
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
#280 esquelet creat i adaptat
Clearing triangles the models of crazy and leader rooster in blender

The models have less of 30k triangles and their size is less than 10MB

Waiting for testing in unity 3D
Issue #294 Clearing triangles of the models of crazy and leader roosters in blender

The models have less of 30k triangles and their size is less than 10MB

Waiting for testing in unity 3D
Added team parameter (int)
#287 animacions del model de la gallina amb pistola
#315 Moar script adaptation.
#317 animacion de escopeta