subiendo mejoras
delete
design level 1 sprint 5
Testing
Update terrain
Update
Update terrain
Commit end issue #137 and #194
Delete TestParticles.cs
Delete OrbitCamera.cs
Merge branch 'devel_d' into Devel

Conflicts:
	Nightrain/Assets/Models/BoxWeapon/baston.fbm.meta
	Nightrain/Assets/Models/BoxWeapon/escudo.fbm.meta
	Nightrain/Assets/Models/BoxWeapon/hacha.fbm.meta
	Nightrain/Assets/Models/MainCharacter/Mujer/mujer_sprint3.fbm.meta
	Nightrain/Assets/Models/MainCharacter/hombre.fbm.meta
	Nightrain/Assets/Models/NPC/GOLEMREAL_LAVA_TEXT_mejora22222 (1).fbm.meta
	Nightrain/Assets/Models/NPC/Golem Lava/GOLEMREAL_LAVA_TEXT_mejora22222.fbm.meta
	Nightrain/Assets/Models/NPC/Golem fire/GOLEMREAL_LAVA_TEXT.fbm.meta
	Nightrain/Assets/Models/NPC/Golem ice/GOLEMREAL_HIELO_TEXT.fbm.meta
	Nightrain/Assets/Models/NPC/Golem rock/GOLEMREAL2_TEXTROCA.fbm.meta
	Nightrain/Assets/Models/NPC/Golem/golem_armature.fbm.meta
	Nightrain/Assets/Models/NPC/Graveler/graveler_textura_rig.toon.fbm.meta
	Nightrain/Assets/Models/NPC/ModelNPC_graveler&lava/GOLEMREAL_LAVA_TEXT_mejora22222.fbm.meta
	Nightrain/Assets/Models/NPC/ModelNPC_graveler&lava/graveler(1).fbm.meta
	Nightrain/Assets/Resources/HealthBar/Materials/bar_health.mat
	Nightrain/Assets/Resources/HealthBar/Materials/bar_magic.mat
	Nightrain/Assets/Resources/HealthBar/Materials/damage_health.mat
	Nightrain/Assets/Scene/Level01.unity
FireWall del puente ahora se elimina
Controlar orden de muerte de los NPCs
Testing
Commit
Delete OrbitCamera.cs
Delete TestParticles.cs
tirar flechas desde la torre

Atacar al personaje des de la torre, tirando flechas en direccion al
player
Merge
Fixed a bug that generated null reference