add weapon and bullets + hero.hitbox is now a collider
merge commits