Test

zombi amb colisio, pero que s'aura de canviar, els deixo en la carpeta
general
Revert "Test"

This reverts commit eddb24a042ec66213ab6b703646c0f8fed40f67b.
Animacions noves
Codi post merge + animacions zombi i estat de morir
Arreglat petit error
Merge remote-tracking branch 'origin/TEAM-F' into TEAM-E_2

Conflicts:
	ARTIST/Mapa2.0.rar
	BasicGame/OpenAL64.dll
	BasicGame/assets/Character/porra.j3o
	BasicGame/assets/Interface/MenuPrincipal/FondoJuego.jpg
	BasicGame/assets/Interface/MenuPrincipal/botonJugar.png
	BasicGame/assets/Interface/MenuPrincipal/botonSalir.png
	BasicGame/assets/Interface/MenuPrincipal/interfacUB.png
	BasicGame/assets/Interface/MenuPrincipal/interfacUBPause.png
	BasicGame/assets/Interface/RunningGame/GUIrunningGame.xml
	BasicGame/assets/Interface/RunningGame/interfacUB.png
	BasicGame/assets/Scenes/Columna_cilindro.jpg
	BasicGame/assets/Scenes/Corcho.jpg
	BasicGame/assets/Scenes/Paredes.jpg
	BasicGame/assets/Scenes/Suelo Planta 1.jpg
	BasicGame/assets/Scenes/Suelo Planta 2.jpg
	BasicGame/assets/Scenes/Suelo Planta Baja.jpg
	BasicGame/assets/Scenes/TilesPlain0145_13_thumbhuge.jpg
	BasicGame/assets/Scenes/agua.jpg
	BasicGame/assets/Scenes/arbol1.jpg
	BasicGame/assets/Scenes/baldosas.jpg
	BasicGame/assets/Scenes/bancoPiedra.jpg
	BasicGame/assets/Scenes/botiquin.blend
	BasicGame/assets/Scenes/botiquin.blend1
	BasicGame/assets/Scenes/botiquin.blend2
	BasicGame/assets/Scenes/botiquin.j3o
	BasicGame/assets/Scenes/botiquin.j3odata
	BasicGame/assets/Scenes/cielo.jpg
	BasicGame/assets/Scenes/cipres.blend
	BasicGame/assets/Scenes/cipres.blend1
	BasicGame/assets/Scenes/cipres.blend2
	BasicGame/assets/Scenes/cipres.mtl
	BasicGame/assets/Scenes/cipres.png
	BasicGame/assets/Scenes/erare.blend
	BasicGame/assets/Scenes/hierba.jpg
	BasicGame/assets/Scenes/io_export_ogreDotScene.py
	BasicGame/assets/Scenes/mesasB5.jpg
	BasicGame/assets/Scenes/montextura.blend
	BasicGame/assets/Scenes/montextura.blend1
	BasicGame/assets/Scenes/montextura.blend2
	BasicGame/assets/Scenes/montextura.j3o
	BasicGame/assets/Scenes/montextura.j3odata
	BasicGame/assets/Scenes/raro.blend1
	BasicGame/assets/Scenes/sueloB5.jpg
	BasicGame/assets/Scenes/sueloBlanco.jpg
	BasicGame/assets/Scenes/texturaTexoP1.jpg
	BasicGame/assets/Scenes/texturas/madera.jpg
	BasicGame/assets/Scenes/texturas/madera_x.jpg
	BasicGame/assets/Sounds/Effects/button-click.wav
	BasicGame/assets/Sounds/Effects/button-over.wav
	BasicGame/liblwjgl.jnilib
	BasicGame/lwjgl64.dll
	BasicGame/openal.dylib
	BasicGame/src/mygame/Controller.java
	BasicGame/src/mygame/States/Scenario/ObjVida.java
	BasicGame/src/mygame/States/Scenario/ScenarioInterface.java
	BasicGame/src/mygame/States/Scenario/ScenarioManager.java
	BasicGame/src/mygame/model/character/CharacterMainInterface.java
	BasicGame/src/mygame/model/weapon/Gun.java
	BasicGame/src/mygame/model/weapon/Porra.java
	BasicGame/src/mygame/model/weapon/WeaponInterface.java
	BasicGame/src/mygame/model/zombie/Zombie.java
	BasicGame/src/mygame/model/zombie/ZombieBasic.java
	BasicGame/src/mygame/model/zombie/ZombieInterface.java
	BasicGame/src/mygame/model/zombie/ZombieManagerInterface.java
	BasicGame/src/mygame/model/zombie/ZombiePetia.java
	BasicGame/src/mygame/sound/SoundManager.java
Correcting error from merge not seen on xml file
Revert "Correcting error from merge not seen on xml file"

This reverts commit 9d2550041f80537236277dd4fc916995327e0372.
Revert "Merge remote-tracking branch 'origin/TEAM-F' into TEAM-E_2"

This reverts commit 42184dd414005c06e429778dcb74412a8c1179a5, reversing
changes made to 174d18958ae42efbeac2798fead48ebe0c794212.
animations, do damage, recieve damage and random

All the changes of the before reverted commits are here!!!
- animations from artist
- does damage to main player
- can receive damage from mainplayer
- initial random move
Merge branch 'TEAM-G'
Random movement v1
Merge remote-tracking branch 'origin/TEAM-F'
Adhesió del *.jar del 3er Sprint