another usefull commit
a usefull commit
Manos agregadas (gallina robot2)
Main Char con 2 modelos
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
Fixed merge bugs
#280 esquelet posat al model 2 de la gallina
Corregir modelo gallina robot2 Issue #281
#280 esquelet creat i adaptat
Added team parameter (int)
#287 animacions del model de la gallina amb pistola
#315 Moar script adaptation.
#317 animacion de escopeta
Mejora del script player
Merge branch 'devel-B' into devel-AB-scripting

Conflicts:
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scenes/ChicknDestroy_Terrain.unity
Merging ChicknDestroy_Terrain.unity
Merge branch 'devel-B' into devel-AB-scripting
Limpando/Comentando codigo NPC y pequeños cambios
#350 script preparation done

The script is DynamiChickenCreation.cs

there's more to explain inside the script comments
Uso de rutas avanzadas