add weapon rendering
Merge branch 'master' into mrivera