fix resolve-hits
Merge branch 'master' into sauerbraten
colortag
decide
Merge branch 'master' into sauerbraten