introduce hearts for RPG phase
Make player get hurt when collided with enemy, animate it and spawn it a little bit further away
Generalized swordcode based on tilewidth
Merge branch 'master' of https://github.com/2machten/pixel-evolution
Implemented sword-action, needs tweaking.
Fix idle position of dungeon phase
Implemented sword action.
"Removed" buggy pathfinding code.
Edited hitbox of player in rpgphase to make walking horizontally easier
increase death red-blink speed
Merge branch 'master' of https://github.com/2machten/pixel-evolution
Add sword animation to dungeon phase. Implemented very poorly: it would be better to just add an animation to the player and retain the original hitbox with this.body.setSize().. unfortunately there is no time..
fix scales of pixel stage characters sprites
Add basic evolution scene (and some sword related improvements that I forgot to push)
First attempt at 'find x' quest.
Made 'orange box spawning' work.
Moved orange box creation into NPC.
Stopped duplication of orange boxes.
Fix evolution state so it works when you run it more often than once
Improvements in enemy and swordaction
Merge branch 'master' of https://github.com/2machten/pixel-evolution

Conflicts:
	js/player.js