(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:45:37 +03:00
parent 04997cd2f3
commit 68ced76e1b
53 changed files with 791 additions and 243 deletions
@@ -927,6 +927,7 @@ namespace Barotrauma

            textTag = textTag.ToLowerInvariant();
            var tagTextPairs = TextManager.GetAllTagTextPairs();
+            tagTextPairs.Sort((t1, t2) => { return t1.Value.CompareTo(t2.Value); });
            foreach (KeyValuePair<string, string> tagTextPair in tagTextPairs)
            {
                if (!tagTextPair.Key.StartsWith(textTag)) { continue; }