Added BIRD with its behavior, and imported TOON SHADES. Modified all the materials.
Script de generación de oasis e ilusión
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
fixed player .fbx
Added bird prefab
Merge branch 'modeloPlayer'

Conflicts:
	Assets/objects/player_model.fbx.meta
Merge branch 'master' into Parte-Roxanne
Ajustes finales
Merge branch 'feature/ScriptIlusion'
Corregido el movimiento del pj: no vuela y lo se desliza
Tamaño de las palmeras x2
Added head snake for blender. Re-organized prefabs.
Fixed small error.
Merge branch 'master' of https://github.com/pabloppp/Albondiga-GameJamUA

Conflicts:
	Assets/New Terrain.asset
	Assets/Standard Assets/Toon Shading/Toony-Basic.mat
	Assets/Standard Assets/Toon Shading/Toony-BasicOutline.mat
	Assets/Standard Assets/Toon Shading/Toony-Lighted Outline.mat
	Assets/Standard Assets/Toon Shading/Toony-Lighted.mat
	Assets/objects/player_model.fbx.meta
serpiente animada
Merge branch 'master' into Player
Banda sonora
no message