From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 11 Jan 2016 00:23:37 +0000 (+0000)
Subject: Merge branch 'packer/fix_team_chat_beep' into 'master'
X-Git-Tag: xonotic-v0.8.2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4d74c9a52cc233ee3a305d21ee0c2e12f935830;p=xonotic%2Fxonotic.git

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
---

d4d74c9a52cc233ee3a305d21ee0c2e12f935830