Merge Xonotic Master

Commit 38aa70b2b5a9344f9d1eb9b07024ca37ac61f317
on cl_hitsound 1 just play the hit sound
Merge branch 'hitsound_fix' into disco_mode