Merge branch 'devel_c_Music_s2_issue#45' into devel_c
Merge branch 'devel_c_Music_s2_issue#45' into devel_c
borrar branch
Revert "borrar branch"

This reverts commit 4f674d9f720f73a318c2dfa2883e2a4b935c8273.
borrar
issue 80

Comprobar si cumple los requisitos para cerrar la issue 80. Subo este
terreno para que mis compañeros puedan ir trabajando sobre el. Hay que
cambiar el personaje principal y a las sombras cambiarle la resolución,
genera muchos triangulos y hace lag. Seguiré haciendo modificaciones.
Merge branch 'devel_c' of github.com:eloipuertas/ES2014A into devel_c

Conflicts:
	Nightrain/Assets/Animations/NPC.meta
	Nightrain/Assets/Animations/NPC/attackGolem.anim.meta
	Nightrain/Assets/Animations/NPC/death.anim.meta
	Nightrain/Assets/Animations/NPC/idle0.anim.meta
	Nightrain/Assets/Models/Barriles/heart/Model/Materials.meta
	Nightrain/Assets/Models/MainCharacter/Fat/Materials.meta
	Nightrain/Assets/Models/MainCharacter/Fat/Materials/Material_000.mat
	Nightrain/Assets/Models/MainCharacter/Fat/Materials/Material_002.mat
	Nightrain/Assets/Models/MainCharacter/Fat/Materials/Material_003.mat
	Nightrain/Assets/Models/MainCharacter/Fat/Materials/Material_4.mat
	Nightrain/Assets/Models/MainCharacter/Fat/escudo.blend.meta
	Nightrain/Assets/Models/MainCharacter/Materials.meta
	Nightrain/Assets/Models/MainCharacter/Materials/1174.mat
	Nightrain/Assets/Models/MainCharacter/Woman/Materials.meta
	Nightrain/Assets/Models/MainCharacter/hombre.fbm.meta
	Nightrain/Assets/Models/MainCharacter/joven_replace.fbx.meta
	Nightrain/Assets/Models/NPC/Golem/Golem Controller.controller
	Nightrain/Assets/Models/NPC/Golem/Materials/Material.mat
	Nightrain/Assets/Models/NPC/Golem/Materials/Materials/hielo 1.mat
	Nightrain/Assets/Models/NPC/Golem/Materials/Materials/roca.mat
	Nightrain/Assets/Models/NPC/Golem/Materials/hielo.png.meta
	Nightrain/Assets/Models/NPC/Golem/Materials/roca.png.meta
	Nightrain/Assets/Models/NPC/Golem/golem_armature.fbm.meta
	Nightrain/Assets/Music/MainMenu.meta
	Nightrain/Assets/Prefabs/NPCBar.prefab
	Nightrain/Assets/Resources/Cutscenes/Intro/Intro 501.jpg.meta
	Nightrain/Assets/Resources/Cutscenes/Intro/Intro 502.jpg.meta
	Nightrain/Assets/Resources/HealthBar/Materials/avatar.mat
	Nightrain/Assets/Resources/HealthBar/Materials/avatar_hombre.mat
	Nightrain/Assets/Resources/HealthBar/Materials/bar_health.mat
	Nightrain/Assets/Resources/HealthBar/Materials/bar_magic.mat
	Nightrain/Assets/Resources/HealthBar/avatar_hombre.png.meta
	Nightrain/Assets/Resources/HealthBar/avatar_joven.png.meta
	Nightrain/Assets/Resources/HealthBar/avatar_mujer.png.meta
	Nightrain/Assets/Resources/HealthBar/bar_health.png.meta
	Nightrain/Assets/Resources/MainMenu/caballero.png.meta
	Nightrain/Assets/Resources/MainMenu/escudero.png.meta
	Nightrain/Assets/Resources/MainMenu/guerrero.png.meta
	Nightrain/Assets/Resources/MainMenu/paladin.png.meta
	Nightrain/Assets/Resources/Misc.meta
	Nightrain/Assets/Resources/Misc/cursor.png.meta
	Nightrain/Assets/Resources/Misc/cursor_click.png.meta
	Nightrain/Assets/Resources/Prefabs/MainCharacters/joven.prefab
	Nightrain/Assets/Resources/Prefabs/MainCharacters/mujer.prefab
	Nightrain/Assets/Scene/Level01.unity
	Nightrain/Assets/Scripts/Utils/AspectRatio.cs.meta
	Nightrain/Assets/Scripts/Utils/ButtonAction.cs.meta
	Nightrain/Assets/Terrains/Level01/New Terrain.asset
	Nightrain/Assets/Terrains/Level01/scenario01.asset
	Nightrain/Assets/Textures/NPC/Materials/NPCbar_empty.mat
	Nightrain/ProjectSettings/QualitySettings.asset
test

problems with switching branch
issue93

Con este commit queda completada la issue #93
Merge branch 'devel_c_Terrain_s3_issue#93' into devel_c
Merge branch 'devel_c' of https://github.com/eloipuertas/ES2014A into devel_c
incrementar vida

Añadir al script que el personaje pueda coger una vida, y se le
incremente la suya.
cajas armas
Merge branch 'devel_c' into Devel