Marcel d1a9264a99 Merge branch 'angryanimals' into 'master' ... animal attacks See merge request veloren/veloren!1542		2020-11-25 01:33:20 +00:00
..
common	Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body.	2020-11-24 17:56:39 -06:00
voxygen	Merge branch 'angryanimals' into 'master'	2020-11-25 01:33:20 +00:00
world	Better town colour	2020-11-23 10:58:22 +00:00