Merge branch 'master' into weapons
weapons prototype
accomodates slower weapons
Merge pull request #4 from NimbusBP1729/didory_weapons_speed

accomodates slower weapons
asd
Merge branch 'weapons' of https://github.com/didory123/hawkthorne-journey into weapons

Conflicts:
	src/nodes/weapons/battleaxe.lua

Major damage/stats overhaul, change player's base HP to 20
pixel fixes in levels
Merge branch 'master' into weapons
isolate only the weapon stuff
make sure player.lua isn't messed up
isolate weapon stuff
rename lance to glaive
Merge branch 'master' into weapons_stats

Conflicts:
	src/items/recipes.lua
turn glaive into longsword
Merge branch 'master' into weapons_stats

Conflicts:
	src/character_map.lua
fixes ile error at the end of valley of laziness
Add stat hat into our metrics platform
Merge pull request #1101 from NimbusBP1729/valley_fix

fixes tile error at the end of valley of laziness
fixed valley of laziness foreground issue
Merge pull request #1103 from NimbusBP1729/valley_fix

fixed valley of laziness foreground issue