Merge branch 'master' into chatter-fixes-and-improvements
This commit is contained in:
commit
9e24eb6be4
15 changed files with 852 additions and 850 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -1,5 +1,6 @@
|
|||
# Auto detect text files and perform LF normalization
|
||||
* text=lf
|
||||
* text eol=lf
|
||||
|
||||
# Custom for Visual Studio
|
||||
*.sln merge=union
|
||||
|
|
|
|||
|
|
@ -2201,7 +2201,8 @@ void Bot::checkGrenadesThrow () {
|
|||
}
|
||||
break;
|
||||
|
||||
case Weapon::Flashbang: {
|
||||
case Weapon::Flashbang:
|
||||
{
|
||||
const int nearest = graph.getNearest (m_lastEnemy->v.velocity.get2d () + m_lastEnemy->v.origin);
|
||||
|
||||
if (nearest != kInvalidNodeIndex) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue