Commit Graph

815 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 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 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 3cc9abed76 (fdab0615d) Recharge headset batteries between rounds in single player. Partial fix to #369. 2019-06-11 21:49:43 +03:00
Joonas Rikkonen cf7c0533fe (46cd6704b) Add some extra null checks trying to blind fix #1529. 2019-06-11 21:49:07 +03:00
Joonas Rikkonen f455467765 (bcf4eea95) Allow muting players mid-round through the info menu 2019-06-09 17:46:07 +03:00
Joonas Rikkonen 8e65bd62b9 (7df498c13) Fixed: Doors being weldable in the tutorial with no access to crowbar or info on how to open shut doors, thus causing the player to get stuck 2019-06-09 17:40:45 +03:00
Joonas Rikkonen 6dc3e64bf5 (fba51acd3) Fixed: Mechanic tutorial getting stuck if repairing the broken pump before the leaks are repaired 2019-06-09 17:39:32 +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 5208b922d8 (46e39d26c) v0.9.0.4 2019-06-04 16:12:45 +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 12ad53297d (657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing? 2019-06-04 16:00:57 +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 a83532f7a9 (5f61edb68) Allow to issue orders in single player while not controlling any character (freecam debug). 2019-06-04 15:35:45 +03:00
Joonas Rikkonen a9786ec7ad (24bc74c0b) Added a missing line to credits 2019-06-04 15:33:55 +03:00
Joonas Rikkonen 04f69dbe63 (b3c71807f) Updated to the latest version of GameAnalytics 2019-06-04 15:33:38 +03:00
Joonas Rikkonen 7babe75d18 (262cb429c) More implementation 2019-06-04 15:33:16 +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 aea21aa9d4 (1587318e9) Don't show the combat mission success text if it hasn't been translated 2019-05-23 15:13:40 +03:00
Joonas Rikkonen ebd215df53 (6c4495e04) Fixed: Mechanic cabinet highlighting before deconstructing 2019-05-23 15:12:26 +03:00
Joonas Rikkonen 827f54fcff (a13c74ce0) Fixed: Loading screen dismissable & escape usable when the game is not active 2019-05-23 15:10:38 +03:00
Joonas Rikkonen 1cd47a351e (0c95d9c7b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:10:03 +03:00
Joonas Rikkonen cd5d81c3f1 (e8befa230) Added: Unlocking of tutorials one by one. Fixed: EngineerTutorial's submarine reactor not starting properly in the off-state 2019-05-23 15:09:42 +03:00
Joonas Rikkonen a359450b0d (e54e87ee6) Fixed mechanic tutorial deconstruct objective not triggering if hatch is closed and repair ui thresholds 2019-05-23 15:09:23 +03:00
Joonas Rikkonen d3b60d3d6a (52b71b2f2) Fixed captain tutorial being impossible to complete due to the "all"/"job specific" options being removed from the "repair systems" order 2019-05-23 15:09:04 +03:00
Joonas Rikkonen 90b0c208fc (1343e66e3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:08:45 +03:00
Joonas Rikkonen 1fb558d7ef (84593b8fb) Fixed: Oxygen levels of the patient on the submarine being adjusted too late 2019-05-23 15:08:27 +03:00
Joonas Rikkonen 6e47589ae2 (7b464c5f7) Fix report intruders button flickering when it shouldn't. 2019-05-23 15:08:09 +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 d43b3737c8 (20290af96) Fixed: Security Officer tutorial highlights 2019-05-20 20:18:51 +03:00
Joonas Rikkonen 2dd6bac801 (33e7bf99e) Added: Missing repair button highlight to broken junction box in EngineerTutorial 2019-05-20 20:18:34 +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 0b9cac7b96 (cd9ea8b04) Fixed: Missing yield return, patient1 AI toggle 2019-05-18 21:51:46 +03:00
Joonas Rikkonen 50f379086c (3b88adb46) Added: Highlighting to player health bar before the health interface has been opened for the first time 2019-05-18 21:51:12 +03:00
Joonas Rikkonen c44d64df1b (a08a47a7f) Readded: Interval based reporting after entering the sub 2019-05-18 17:54:28 +03:00
Joonas Rikkonen 1146ecf3f3 (73fb25a43) Fixed: AI medic reporting by faking the reports 2019-05-18 17:54:12 +03:00
Joonas Rikkonen c7efdbb0e3 (97afc6f16) Fixed: SubPatients list not cleared when restarting 2019-05-18 17:53:54 +03:00
Joonas Rikkonen d36669c607 (7f6b8d538) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-18 17:53:38 +03:00
Joonas Rikkonen b1326787f7 (32460d493) Fixed: Wait timers running in tutorials when pause menu is open 2019-05-18 17:53:18 +03:00
Joonas Rikkonen e7db219943 (89d59c16f) Highlight screwdriver at repair junction box objective 2019-05-18 17:52:43 +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