Commit Graph

656 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 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 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 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 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 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 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 9155b404ea (078e3646e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:31:02 +03:00
Joonas Rikkonen 9521f0ae2f (17fdbc9de) New path is also needed if the old becomes unreachable. Ignore the new path if it's unreachable. 2019-05-18 17:29:40 +03:00
Joonas Rikkonen 75640a321f (f4acd46ef) Don't enable the "report leaks" button inside ruins 2019-05-18 17:29:24 +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 112baf285d (291705dc5) updated drone 2019-05-16 06:56:19 +03:00
Joonas Rikkonen 89dc85adce (6e785d1ae) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:56:01 +03:00
Joonas Rikkonen f38aa90847 (546717195) Use the AIObjectiveFightIntruders.IsValidTarget for deciding whether or not the button should flash. 2019-05-16 06:55:43 +03:00
Joonas Rikkonen 7c2c31d8d8 (fbc73e63c) Fixed depth/scaling issues on Typhon 2019-05-16 06:53:55 +03:00
Joonas Rikkonen dbc35568cd (69d6e11bf) shuttle tweaks 2019-05-16 06:53:38 +03:00
Joonas Rikkonen f2e936e4d3 (39bf46af8) Don't wait when find safety or combat is active. 2019-05-16 06:53:21 +03:00
Joonas Rikkonen 5453518793 (238bbeef2) Fix find safety not working properly. Decrease the reaction times and cache the current hull safety when the hull safety is updated. 2019-05-16 06:53:04 +03:00
Joonas Rikkonen 2e3d3b2adf (69874bfe5) Fix bots loading only half of the target items in the contain item objective. 2019-05-16 06:52:46 +03:00
Joonas Rikkonen 1be99e4904 (700234d88) Fixed missing spacing in credits 2019-05-16 06:52:27 +03:00
Joonas Rikkonen 20b721a1db (9d5753aa6) Added Daedalic to the credits 2019-05-16 06:52:10 +03:00
Joonas Rikkonen 9a69c4ea60 (92fff3477) iterated shuttles 2019-05-16 06:51:51 +03:00
Joonas Rikkonen d794d22de0 (78fa52fb7) Add a bunch of null checks, which should fix the issues with shuttles. 2019-05-16 06:51:34 +03:00
Joonas Rikkonen a2f97bf303 (9cb944db7) Increase the priority modifier of extinguish fires for captain 2019-05-16 06:51:18 +03:00
Joonas Rikkonen 0ba5793b46 (3628de633) Use the visible hulls instead of the current hull in multiple cases. 2019-05-16 06:50:59 +03:00
Joonas Rikkonen 1e41ed6b63 (943a1e25b) Report all visible hulls, but add a dialogue line and icon only for current hull. 2019-05-16 06:50:42 +03:00
Joonas Rikkonen 437465690b (18165dcb9) Propagate hull safety once per second. 2019-05-16 06:50:23 +03:00
Joonas Rikkonen 4c0adb145d (d762b9ca6) Refresh visible hulls once per second. 2019-05-16 06:50:06 +03:00
Joonas Rikkonen d81457e3ef (8348f0003) Report in all the visible hulls (test). 2019-05-16 06:49:48 +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 97b6888274 (5b2ce3831) Restart the credits sequence when re-selecting the credits tab, some changes to the credit texts 2019-05-16 06:48:53 +03:00
Joonas Rikkonen 3bb405bc9b (27f19e205) Replaced oxygen generator refill message with localized one 2019-05-16 06:48:35 +03:00
Joonas Rikkonen 58330e8ec9 (8a4fb72fa) ToHashSet compiler error fix part #2 2019-05-16 06:48:17 +03:00
Joonas Rikkonen a4bb8efa79 (bfd04acda) Fixed compiler error on Mac (I think)? 2019-05-16 06:47:58 +03:00
Joonas Rikkonen 53d78d2a2a (0f7b2ad10) Incremented version number & updated changelog 2019-05-16 06:47:40 +03:00
Joonas Rikkonen 58d60c9162 (ee53e1507) Fixed crashing when a StatusEffect causes an item to be used on a target. Closes #1466 2019-05-16 06:47:23 +03:00