start of attack rendering
Merge remote-tracking branch 'origin/master'
fix the bounding box for attacking
Merge remote-tracking branch 'origin/master'