Commit Graph

236 Commits

Author SHA1 Message Date
Joonas Rikkonen 87a0ee21eb (6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix 2019-06-15 20:24:01 +03:00
Joonas Rikkonen 3edae38d05 (f26b88b8c) Ignore revision number (the last digit of the version number) when determining client/server compatibility. Allows us to release hotfixes etc with a different version number without breaking compatibility. Also incremented version number to make the next version incompatible with older ones. 2019-06-15 20:17:15 +03:00
Joonas Rikkonen 403baab0a4 (30c3f2268) Fixed server crashing when attempting to send voip from living players to spectators 2019-06-15 20:10:24 +03:00
Joonas Rikkonen 157f6cfd21 (62b9ca04f) Removed Berilia from the build 2019-06-15 20:00:44 +03:00
Joonas Rikkonen 4b6a753947 (f2b1c4b73) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-06-15 19:45:32 +03:00
Joonas Rikkonen b64d3d17ac (ee4193544) Modified: Reduced the health interface opening range mildly to prevent ragdoll flailing at or close to old max range 2019-06-15 19:45:11 +03:00
Joonas Rikkonen 6c72136fa9 (fd30b1df7) Added some workshop item tags 2019-06-15 19:44:53 +03:00
Joonas Rikkonen cd5f8735e7 (d2accb97f) Restrict server name length to 60 characters, prevent long server names from overflowing in the "host server" menu & server lobby 2019-06-12 16:42:33 +03:00
Joonas Rikkonen 53ff77d428 (953c0c5de) Forgot to commit this 2019-06-04 16:43:34 +03:00
Joonas Rikkonen bea7b58ff3 (a410fd46c) Trying to help the merge script through a jungle of merges 2019-06-04 16:37:31 +03:00
Joonas Rikkonen 81dd2f3202 (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
Joonas Rikkonen edccfe223d (9a7d83a40) Fullscreen bug workarounds 2019-06-04 16:00:38 +03:00
Joonas Rikkonen e592c49fa8 (221f9f2a6) Merge branch 'dev' into capitalizationfixes 2019-06-04 15:38:31 +03:00
Joonas Rikkonen f797235bfd (38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla 2019-06-04 15:38:12 +03:00
Joonas Rikkonen b31fbe23da (618410bf9) Fixed clients crashing when opening the server settings menu 2019-06-04 15:36:58 +03:00
Joonas Rikkonen f6e6218bb1 (6736960da) Fixes to name-based item checks that wouldn't work correctly if playing in a language other than English: - Fixed Item.ReadSpawnData failing to find the correct prefab if the client is using a different language than the server, a couple of fixes to name-based item checks. - Fixed extra cargo spawning. - Fixed clients not getting correct ID card tags for the respawn shuttle. 2019-06-04 15:36:21 +03:00
Joonas Rikkonen 970a5a8732 (0b88fdd81) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:49:30 +03:00
Joonas Rikkonen af7fcb823d (63921aa0d) Implement GetVisibleHulls method. 2019-05-16 06:49:11 +03:00
Joonas Rikkonen 75b9ea6cce (cb3078117) Merged hulls to fix speech issue 2019-05-16 06:46:30 +03:00
Joonas Rikkonen 496ee1492c (1fe9abf75) Fix the GetAdjacentHulls method. 2019-05-16 06:45:36 +03:00
Joonas Rikkonen 49b0ee7c50 (de26bb46c) AutoScale CustomInterface texts to prevent overflows 2019-05-16 06:43:54 +03:00
Joonas Rikkonen 3153771cc7 (6f231d0fc) Add generic methods for getting linked map entities. TODO: memory-optimized overload for hulls. 2019-05-16 06:43:33 +03:00
Joonas Rikkonen 114fada396 (779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:42:08 +03:00
Joonas Rikkonen 42f287e254 (59629f0e1) Fixed: ContentPackage path not being valid on MacOS 2019-05-16 06:41:51 +03:00
Joonas Rikkonen 464aa46980 (359537369) Don't do visibility checks in ChatMessage.GetGarbleAmount if the listener and the speaker are in the same hull 2019-05-16 06:41:33 +03:00
Joonas Rikkonen e367f900b8 (2a4bd39c2) Merge branch 'dev' into human-ai 2019-05-16 05:33:13 +03:00
Joonas Rikkonen 3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen 108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen 029f5fccda (8df97f638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-06 11:35:46 +03:00
Joonas Rikkonen 26eaf244ed (b17b66c5f) updated remora and drone 2019-05-06 11:35:29 +03:00
Joonas Rikkonen f42a7c1ec6 (69d450d58) Initialize SteamManager before creating the GameMain instance 2019-05-06 11:34:36 +03:00
Joonas Rikkonen 904cad71a5 (3be596a23) Don't allow using invalid filename characters in a save name. Fixes crashing when attempting to use symbols such as <, > or | in the name. 2019-05-03 13:45:10 +03:00
Joonas Rikkonen fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen 9930a3081c (e082ed22d) Fixed AllowRagdollButton settings not being synced with clients. Might be related to #1297 2019-04-29 21:11:24 +03:00
Joonas Rikkonen 67a0636470 (b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:09:50 +03:00
Joonas Rikkonen 2554e17189 (621326f05) Don't flee when taking damage if part of a swarm. 2019-04-29 21:08:32 +03:00
Joonas Rikkonen c5452048d7 (d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:08:16 +03:00
Joonas Rikkonen b3b1d1851d (eda627512) Fixed MonoKickStart files needed by the dedicated server not being copied to the output directory in release builds 2019-04-29 21:08:00 +03:00
Joonas Rikkonen fedde72056 (35fabe831) Fixed different EntitySpawner error messages having the same identifier (preventing successive errors from being reported to GameAnalytics after one has been reported) 2019-04-29 21:07:28 +03:00
Joonas Rikkonen b6d854fc94 (8b6b6ed4c) Added indication to server preview window if server has VOIP enabled 2019-04-23 11:17:55 +03:00
Joonas Rikkonen a84407928f (5288a26dd) Fixed SteamManager.OverlayCustomURL crashing the game if SteamManager has not been initialized 2019-04-17 12:45:30 +03:00
Joonas Rikkonen 91d3ea6a0f (10dd92c0a) Added Steam overlay support to workshop 2019-04-17 12:44:21 +03:00
Joonas Rikkonen 6262b3ea54 (ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:12:09 +03:00
Joonas Rikkonen bd07acf26d (052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0 2019-04-16 17:11:49 +03:00
Joonas Rikkonen 66de47f041 (a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml 2019-04-15 12:06:58 +03:00
Joonas Rikkonen 2af78d096e (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