Commit Graph

776 Commits

Author SHA1 Message Date
Joonas Rikkonen adab8589da (f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-12 16:45:24 +03:00
Joonas Rikkonen dce98349ea (23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing 2019-06-12 16:45:02 +03:00
Joonas Rikkonen e3ca616fff (869ac975f) Merge branch 'master' into dev 2019-06-12 16:43:56 +03:00
Joonas Rikkonen eaf4f6afb8 (face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568 2019-06-12 16:43:34 +03:00
Joonas Rikkonen ee1f10b482 (8637a4530) Enable the damage overlay code. Remove deprecated human damage overlays. The overlay on Tigertresher should now work. 2019-06-11 21:49:26 +03:00
Joonas Rikkonen 7de768085e (a89aca5c0) Fixed: Having a broken device on a sub and switching to Character Mode causing a crash 2019-06-11 21:48:48 +03:00
Joonas Rikkonen 4a401c865d (4d56b6900) Fixed ability to drop items into secure lockers (or other containers that require specific items) without having access to it. Closes #1559 2019-06-11 21:43:02 +03:00
Joonas Rikkonen aefa46eaa5 (7754ad698) Fixed scooters occasionally flicking around in the multiplayer. I think the issue was that clients/server would set the cursor position 60 units away from aim ref position (= upper part of the collider), but due to the inaccuracy of the ragdoll syncing, the aim ref pos is not always where the shoulder of the character is, which in laggy situations could cause the cursor position to be at the wrong side of the ragdoll. 2019-06-04 16:52:43 +03:00
Joonas Rikkonen e633ecca69 (e83e351e8) Fixed health interface now focusing to the most damaged limb when closing and reopening the interface 2019-06-04 16:51:49 +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 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 04f69dbe63 (b3c71807f) Updated to the latest version of GameAnalytics 2019-06-04 15:33:38 +03:00
Joonas Rikkonen a3e67dd40a (7163b300e) Added: Way for capitalizing / lowercasing replaced variables depending on the position in the sentence & some implementations 2019-06-04 15:32:59 +03:00
Joonas Rikkonen bc566ac0e7 (bc44f3622) Fixed credits not resizing when resolution is changed 2019-06-04 15:32:04 +03:00
Joonas Rikkonen 93e4767fb8 (657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing? 2019-06-04 15:30:32 +03:00
Joonas Rikkonen bce99f2e6f (7e0adb991) Fixed legacy items failing to load if a sub is saved with a language other than English and the language then changed to something else. 2019-06-04 15:29:55 +03:00
Joonas Rikkonen ebd916e95c (9a7d83a40) Fullscreen bug workarounds 2019-06-04 15:29:36 +03:00
Joonas Rikkonen e9d31ed0be (1241a5bd4) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 16:28:04 +03:00
Joonas Rikkonen 44a5c9e588 (81babbeac) Added Linux System.Windows.Forms 2019-05-23 16:27:46 +03:00
Joonas Rikkonen 90149b9435 (912383b95) Unequip the diving gear when the follow target unequips it. 2019-05-23 16:27:10 +03:00
Joonas Rikkonen b8ebf34c38 (4c111302a) Fixed Shuttle Shell A01/A02 colliders not being resized according to the size of the wall 2019-05-23 16:26:51 +03:00
Joonas Rikkonen 48e8c62cae (97bf93407) Fix a typo in a function name. 2019-05-23 16:26:13 +03:00
Joonas Rikkonen 65eb8f35c9 (7e8f246d2) Fixed clients not seeing turrets rotating at their end when another client is operating the turret. Happened because the cursor position was only synced when the aim key was pressed, and aiming is not required anymore when using turrets. 2019-05-23 15:16:42 +03:00
Joonas Rikkonen 7c67b1f164 (57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2. 2019-05-20 21:00:11 +03:00
Joonas Rikkonen b71adc7589 (2e0e45e1f) Updated: Localization 2019-05-20 20:46:21 +03:00
Joonas Rikkonen 97b095bd10 (0e668e083) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev (squashed together 20290af96..0e668e083 because the merge script shit itself due to the merges in between) 2019-05-20 20:25:12 +03:00
Joonas Rikkonen 120dc39a9e (36d2ff935) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-20 20:18:17 +03:00
Joonas Rikkonen 1340780205 (18af6c22d) Fixed: On/Off switches not being highlighted in mechanic tutorial 2019-05-20 20:17:59 +03:00
Joonas Rikkonen 51e3e8d667 (2c8393f34) Fixed "The suitable treatments list may be inaccurate" overflowing in German & Russian, show item name tooltips when hovering over the treatment suggestions 2019-05-18 21:52:36 +03:00
Joonas Rikkonen 55d380d1f0 (3c067d94f) Removed: Holding onto unconcious characters after closing the health interface 2019-05-18 21:52:02 +03:00
Joonas Rikkonen 6332cfd55f (81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:44:13 +03:00
Joonas Rikkonen 71d1738498 (76e16f98e) Use outdoorsteering when far enough from the sub. Increase the wait until reachable time a bit. 2019-05-18 17:43:38 +03:00
Joonas Rikkonen 78b67de866 (e9f10995d) Merge branch 'bugreporterUI' into dev 2019-05-18 17:43:00 +03:00
Joonas Rikkonen 3a2310e547 (3ac5065f5) Fixed: Rendering order for Bugreporter window, OK button position 2019-05-18 17:42:41 +03:00
Joonas Rikkonen da693c20fa (7bfeac605) More space for the labels in the Pump interface 2019-05-18 17:42:20 +03:00
Joonas Rikkonen 11d08f4f70 (2df363efc) Refactor avoiding, because the previous method wasn't working well. It now should work better, but requires a heading vector. Add some notes on how to improve the method. TODO: revisit fishes. 2019-05-18 17:41:58 +03:00
Joonas Rikkonen be4db3ee12 (aa84bc3c8) Fixed: UI Scaling issues in 4k 2019-05-18 17:36:15 +03:00
Joonas Rikkonen f1d794cb39 (86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:35:10 +03:00
Joonas Rikkonen 65a914e5ed (0b29f1236) Added: Scaling to mouse cursor size 2019-05-18 17:34:53 +03:00
Joonas Rikkonen e63ffe652e (5e16139ed) Added "OrderGiver" field to AI orders, always show reports from the currently controlled character (even if the report is not targeted for the character's class) 2019-05-18 17:26:34 +03:00
Joonas Rikkonen f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +03:00
Joonas Rikkonen 5438a65852 (f2c7469a6) Workarounds to missing label translations: use "High pressure" for the "WARNING: High pressure" label in the tutorial outpost, use "Warning" and "Reactor temp." for "Reactor temp caution". Also made the labels a little larger to accommodate longer words in some of the translations. 2019-05-16 07:04:47 +03:00
Joonas Rikkonen ce05d50a2b (9c4e324eb) Fixed chat messages going slightly off-frame on top of the in-game chat box. 2019-05-16 07:04:27 +03:00
Joonas Rikkonen 851e6f76cd (38baa1f78) Changed tag layout in Workshop screen to prevent overflows 2019-05-16 07:04:08 +03:00
Joonas Rikkonen 48a232533b (217571764) Fixed "No living players on the server and Jouer vous-même" again (TODO: note about this to the translator so it gets fixed at their end as well) 2019-05-16 07:03:50 +03:00
Joonas Rikkonen 5ff09db449 (eff616485) Don't show mission info in the round summary if there's no localized "mission failed" text available and there's nothing else to show. TODO: add the text to localization so this isn't needed 2019-05-16 07:03:32 +03:00
Joonas Rikkonen d03e1995bc (375481a35) Write save times as unix time values and display them using the system's current date format 2019-05-16 07:03:15 +03:00
Joonas Rikkonen e42a0a33a4 (2d9e06198) Attempt to fix incorrectly displayed Chinese capture device names (haven't been able to reproduce) 2019-05-16 07:02:57 +03:00