Merge branch 'packer/fix_team_chat_beep' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 11 Jan 2016 00:23:37 +0000 (00:23 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 11 Jan 2016 00:23:37 +0000 (00:23 +0000)
commitd4d74c9a52cc233ee3a305d21ee0c2e12f935830
treefba4cb244805c98caad301c6cfbb3027c5ce882e
parent69c459f92b217fefbb864c963c6dc868ff45feab
parentbb0f2ecaa7abc56013cadb71ac7fb4f9db2cd7da
Merge branch 'packer/fix_team_chat_beep' into 'master'

fix team chat beep sound

There are two beep sounds :
* General chat and (**talk.wav**)
* team messages (**talk2.wav**)

These should not be converted to **ogg**, otherwise the engine does not find **talk2.wav**.

See: https://gitlab.com/xonotic/darkplaces/blob/div0-stable/cl_parse.c#L517

This causes that the beep sound for general chat is used for team messages, too.

The script *cached_converter.sh* already tries excludes them (But uses wrong path.)

See merge request !15