Commit Graph

425 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 e38c896d42 (7f9b7df0c) Fixed items disappearing when they're dropped into a full container. Closes #1588 2019-06-11 21:50:38 +03:00
Joonas Rikkonen a4875cfeb3 (776291eb7) Create linked gaps when the door is selected. Move the gaps with the doors. 2019-06-11 21:44:32 +03:00
Joonas Rikkonen b988e633dd (c6a02d462) Don't show the "received a position update for an item with no physics body" error messages in release builds if verbose logging is not enabled (only send them to GameAnalytics). 2019-06-09 17:41:38 +03:00
Joonas Rikkonen 6c90d14462 (545598d02) Change the repair tooltip color from gray to cyan even when the character doesn't have required skills. 2019-06-09 17:37:43 +03:00
Joonas Rikkonen 9341ac772d (d616acca8) Empty contained item indicators (oxygen tank, battery, etc indicators) keep pulsating when they're empty 2019-06-09 17:37:25 +03:00
Joonas Rikkonen 7056cbdeb3 (d34672075) Fixed items not being positioned correctly in itemcontainers that are rotated. Closes #1511 2019-06-04 16:44:27 +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 babc87903b (f9330e2e0) Modified: MacOS to use the same monokickstart when launching server 2019-06-04 16:03:35 +03:00
Joonas Rikkonen 8184f0e6f6 (6b3ca1aae) Fixed the "item in use by x" text not being visible in item interfaces 2019-06-04 16:03:00 +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 7babe75d18 (262cb429c) More implementation 2019-06-04 15:33:16 +03:00
Joonas Rikkonen 2a20b68f3c (33a87d5c8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:11:49 +03:00
Joonas Rikkonen b6a0cd3871 (7a85fb03d) Added: Possibility to access any tutorial in a debug build 2019-05-23 15:11:31 +03:00
Joonas Rikkonen f7d2a61b6c (5acbb955e) Slice the overlay sprite of the connection panel to prevent it from overlapping with the connections on larger resolutions (TODO: test on resolutions higher than 1080p) 2019-05-23 15:11:13 +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 84b034b34d (bf1f4d5e8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:41:06 +03:00
Joonas Rikkonen 3635568b6a (6ac5b80f0) Fixed: PauseOnFocusLost always treated as if being enabled 2019-05-18 17:40:49 +03:00
Joonas Rikkonen f758ae9329 (fef7ff248) Workaround to missing "hold to unequip" text 2019-05-18 17:40:15 +03:00
Joonas Rikkonen 744fb70829 (53329f471) Fixed translated connection names not being used in the connection panel interface 2019-05-18 17:39: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 d84832296c (cd17ab725) Cleanup. 2019-05-18 17:28:18 +03:00
Joonas Rikkonen c7ceed07c7 (7a7e715ad) Fixed report messages not going through to some clients when there are multiple clients on the server. Happened because the server would reuse the same OrderChatMessage instance for all clients, and it would get assigned the chat message ID according to the last recipient, which may not be the correct ID for other clients. 2019-05-18 17:28:01 +03:00
Joonas Rikkonen 382e05facd (75f4c1e5a) Apparently this case is already handled in the indoorssteering. 2019-05-18 17:27:44 +03:00
Joonas Rikkonen 0b8005f721 (5154265e6) Don't round ItemLabel text positions to the nearest pixel (causes weird looking "jitter" when the sub moves) 2019-05-18 17:27:25 +03:00
Joonas Rikkonen b4919df766 (6bf70233b) Fixed invisible directional sonar indicators. Closes #1472 2019-05-18 17:25:43 +03:00
Joonas Rikkonen fb206ee5a3 (71a7f5c3c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:25:27 +03:00
Joonas Rikkonen cb519b455d (e7e775e7b) Fixed non-translated "Toggle Battery Output" display text in Orca, increased the size of the docking labels in Bunyip to create more space for translated texts 2019-05-18 17:25:11 +03:00
Joonas Rikkonen 75b88e0c18 (33abbb810) Fixed: Interfaces that were too small on 4k by removing the use of maxsize & adding scale related multipliers to absolute values 2019-05-18 17:24:54 +03:00
Joonas Rikkonen f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +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 e7d1ae2cda (b45ff81a1) Log an error if a client can't find the prefab for an item spawned by the server 2019-05-16 07:02:40 +03:00
Joonas Rikkonen d72187bbd0 (2a25dbfad) Wrap minimap room info texts 2019-05-16 07:01:44 +03:00
Joonas Rikkonen 19b4caa576 (a7fed8657) More punctuation fixes 2019-05-16 07:01:26 +03:00