Commit Graph

67 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 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 03a7093486 (1c5ce3fee) More descriptive error messages when publishing a Workshop item fails. 2019-06-15 19:44:13 +03:00
Joonas Rikkonen 63999fc17b (62b9ca04f) Removed Berilia from the build 2019-06-15 19:43:32 +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 b14abc0cb0 (684b4ac74) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:48:29 +03:00
Joonas Rikkonen d8e7c79a21 (74c45abbe) Fixed: GUIDropdown parent returning a null GUIComponent when opening CharacterEditor & promptly crashing after 2019-06-11 21:48:10 +03:00
Joonas Rikkonen 3b936e41ba (d49897af2) Removed debug code I used to test the position of the workshop item update button 2019-06-11 21:47:18 +03:00
Joonas Rikkonen e9c8103be4 (5a6865d0f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:46:57 +03:00
Joonas Rikkonen c30f1de8f3 (8814bcb6b) Null checks on GUIStyle fonts 2019-06-11 21:46:39 +03:00
Joonas Rikkonen 5f497543a4 (1986bc0d3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:46:21 +03:00
Joonas Rikkonen dd1ce8bf2f (df244251c) Fixed: Electric devices that are underwater and are broken by flooding being repairable forever, due to condition never staying at full condition for long enough for the repairing to stop 2019-06-11 21:46:02 +03:00
Joonas Rikkonen a841f75ea0 (6e52daaaa) Fixed workshop item "update" button overlapping with the other elements, made the workshop menu larger, fixed incorrect filename in one of the workshop tooltips 2019-06-11 21:45:22 +03:00
Joonas Rikkonen 7dfa6e89fe (ffa166343) Workshop fixes: - Refresh content package file in the staging folder when adding/removing files, not just when publishing. - Allow multiselecting files in the "add files" dialog. - Fixed autoupdating workshop files not working because Workshop.GetItem doesn't query the time the item was modified. - Some extra exception handling. 2019-06-11 21:45:01 +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 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 304db988b1 (b63c9bf0c) Fixed OpenFileDialog not closing on Linux 2019-05-23 17:04:30 +03:00
Joonas Rikkonen cddc049a6a (c0e610a99) Ugly temporary workaround to OpenFileDialog crashing on some Linux systems. If instantiating the dialog fails, a message box pops up where the user can enter the path to the file manually. 2019-05-23 15:14:34 +03:00
Joonas Rikkonen 80a3a26fcd (eb8bec90d) Use RestSharp to download workshop preview images (WebClient seems to be unreliable on Linux & Mac) 2019-05-23 15:14:17 +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 851e6f76cd (38baa1f78) Changed tag layout in Workshop screen to prevent overflows 2019-05-16 07:04:08 +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
Joonas Rikkonen c18f72e12e (13b4e32e2) Added a method that can be used to add punctuation between strings, while taking into account special rules in some languages (e.g. a breaking space before a colon in French). Removed colons from a bunch of menu labels where they're not necessary. 2019-05-16 07:01:08 +03:00
Joonas Rikkonen 3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +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 dd24c604d1 (d653e2340) Fixed workshop items switching order in the workshop menu when the preview thumbnails are received. 2019-04-29 21:11:07 +03:00
Joonas Rikkonen 2ffb8d922d (acf0cb343) Fixes to EnableWorkShopItem: - Don't allow enabling if the item is not compatible with the user's version of Barotrauma or if it's a core package that's missing some required files. - Don't allow enabling if the item external files referenced in the content package are not found (e.g. if a mod uses vanilla files but the vanilla files aren't found). 2019-04-29 21:10:51 +03:00
Joonas Rikkonen e427981b86 (9d0bc3391) Fixed console error when attempting to publish a sub with no preview image in the workshop 2019-04-23 17:24:06 +03:00
Joonas Rikkonen ea54fa24fe (0d11c0779) Select the vanilla content package if no core content packages are enabled on startup, or when disabling a core content package from the workshop menu. Closes #1424 2019-04-18 12:05:59 +03:00
Joonas Rikkonen 91d3ea6a0f (10dd92c0a) Added Steam overlay support to workshop 2019-04-17 12:44:21 +03:00
Joonas Rikkonen 56a24772ec (d0a23dc66) Convert workshop item texts (title, description & owner name) to UTF8. Fixes #1423 2019-04-17 12:44:03 +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