shot tracking particles
Merge branch 'master' into BasicPlayerClass