Joonas Rikkonen bea7b58ff3 (a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

..

FileTransfer

(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai

2019-03-26 14:07:11 +02:00

NetEntityEvent

(8b3cd3de5) Fixed clients never removing network events the server has already received (!), don't create a new client event if there's already an identical event waiting to be sent

2019-04-11 18:23:17 +03:00

Voip

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

BanList.cs

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

ChatMessage.cs

(e9f10995d) Merge branch 'bugreporterUI' into dev

2019-05-18 17:43:00 +03:00

Client.cs

(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00

EntitySpawner.cs

2f107db...5202af9

2019-03-18 21:42:26 +02:00

GameClient.cs

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

NetStats.cs

2f107db...5202af9

2019-03-18 21:42:26 +02:00

OrderChatMessage.cs

38f1ddb...178a853: v0.8.9.1, removed content folder

2019-03-18 20:39:27 +02:00

RespawnManager.cs

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

ServerInfo.cs

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

ServerLog.cs

(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00

ServerSettings.cs

(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."

2019-06-04 16:02:25 +03:00

SteamManager.cs

(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:37:31 +03:00

Voting.cs

2f107db...5202af9

2019-03-18 21:42:26 +02:00

WhiteList.cs

2f107db...5202af9

2019-03-18 21:42:26 +02:00