(4b33eda28) Merge branch 'dev' into enemy-ai

2019-03-25 19:49:34 +02:00
parent 7d74b5bd52
commit 26594e2c6c
31 changed files with 207 additions and 148 deletions
@@ -403,6 +403,11 @@ namespace Barotrauma
            AssignRelayToServer("help", false);
            AssignRelayToServer("verboselogging", false);
            AssignRelayToServer("freecam", false);
+#if DEBUG
+            AssignRelayToServer("simulatedlatency", false);
+            AssignRelayToServer("simulatedloss", false);
+            AssignRelayToServer("simulatedduplicateschance", false);
+#endif

            commands.Add(new Command("clientlist", "", (string[] args) => { }));
            AssignRelayToServer("clientlist", true);
@@ -957,6 +962,8 @@ namespace Barotrauma
                            }
                        }
                    }
+                    element.Value = lines[i];
+                    i++;
                }
            }, isCheat: false));
 #endif