I played again and the waves lock when I melee like you said. I also suggest removing the camera turning when the player turns since we can move the camera with the mouse also.
