no message
Added cantimplora and scripts for the drinking from oasis.
Alucinacion de roca, cantimplora
Merge branch 'master' into Player

Conflicts:
	Assets/objects/Materials/cantimplora_base.mat.meta
	Assets/objects/palmtree_set.blend
	Assets/objects/palmtree_set.blend1
	Assets/objects/palmtree_set.blend1.meta
	Assets/objects/tower.blend
	Assets/objects/tower.blend1
	Assets/objects/tower.blend1.meta
	Assets/scripts/player_movement.cs
	ProjectSettings/TagManager.asset
añadido modelo Player + Animaciones: Idle - Walking
Añadido player con 3 animaciones
Merge remote-tracking branch 'origin/modeloPlayer' into Player

Conflicts:
Añadido player con 3 animaciones
added player prefab
Merge remote-tracking branch 'origin/modeloPlayer' into Player

Conflicts:
	Assets/animations/playerAnimator.controller
updated- Fixed
Merge remote-tracking branch 'origin/modeloPlayer' into Player
Personaje en movimiento con los objetos
Added BIRD with its behavior, and imported TOON SHADES. Modified all the materials.
Merge branch 'Parte-Roxanne'

Conflicts:
	Assets/animations.meta
Merge branch 'feature/ScriptIlusion'

Conflicts:
	Assets/Standard Assets.meta
	Assets/Standard Assets/Toon Shading/Sources/Textures/toon ramp.png.meta
	Assets/Standard Assets/Toon Shading/Sources/Textures/toony lighting.psd.meta
	Assets/objects/Materials/coconut.mat
	Assets/objects/Materials/leaves.mat
	Assets/objects/Materials/sand.mat
	Assets/objects/Materials/trunk.mat
	Assets/objects/Materials/unnamed.mat.meta