Commit Graph

300 Commits

Author SHA1 Message Date
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 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 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
Joonas Rikkonen 9ba7dee1d7 (e858408c2) Use localizable "signal_out_x" text in CustomInterface elements with an empty label (TODO: disable empty elements) 2019-05-16 06:59:56 +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 75b9ea6cce (cb3078117) Merged hulls to fix speech issue 2019-05-16 06:46:30 +03:00
Joonas Rikkonen 496ee1492c (1fe9abf75) Fix the GetAdjacentHulls method. 2019-05-16 06:45:36 +03:00
Joonas Rikkonen 49b0ee7c50 (de26bb46c) AutoScale CustomInterface texts to prevent overflows 2019-05-16 06:43:54 +03:00
Joonas Rikkonen 114fada396 (779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:42:08 +03:00
Joonas Rikkonen 42f287e254 (59629f0e1) Fixed: ContentPackage path not being valid on MacOS 2019-05-16 06:41:51 +03:00
Joonas Rikkonen d21ccf5ecd (566a98ad3) Fixed docking button usage not being synced 2019-05-16 06:36:55 +03:00
Joonas Rikkonen 7ceba13e8f (deebc187d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:25:48 +03:00
Joonas Rikkonen e500ba2bdf (a17abe3fa) Remove a not so useful loop from a method, which might be used often. 2019-05-16 06:25:12 +03:00
Joonas Rikkonen dc2f96443a (ff4df7194) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:24:39 +03:00
Joonas Rikkonen 880b7b1c02 (35b1c9d08) Fixed: NetLobby permission view dialog 2019-05-16 06:24:21 +03:00
Joonas Rikkonen a2276b308f (0634c0518) Fixed docking interface not activating in subs with more than one docking port (e.g. Selkie) or on nav terminals that control another sub (e.g. Remora's drone control terminal) 2019-05-16 06:23:47 +03:00
Joonas Rikkonen 66e0ac9dc6 (0151f8b18) Fixed: StatusMonitor overlapping with the Sonar in 4k 2019-05-16 06:21:27 +03:00
Joonas Rikkonen 48070a3f90 (23ecb8f20) Fixed: Scaling past 1920x1080 for: Reactor UI, Submarine labels, loading tips, inventoryslot container status 2019-05-16 06:20:54 +03:00
Joonas Rikkonen 61f5ccc71d (c93eaea48) Merge branch 'human-ai' into dev 2019-05-16 06:14:43 +03:00
Joonas Rikkonen 9c964b7843 (7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order. 2019-05-16 06:14:25 +03:00
Joonas Rikkonen 5f524ddd3f (457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor 2019-05-16 06:13:49 +03:00
Joonas Rikkonen ce7b9c4f52 (94ad97066) Refactor combat objective. The bots should now be able to reload and seek more ammunition. When they run out of ammunition, they first try to use another weapon and only if no other weapon is found, they seek more ammunition. Had to change the contain item and get item objectives a bit. Hopefully doesn't break things too much. 2019-05-16 06:13:15 +03:00
Joonas Rikkonen 4b9fbe596c (8ba0db51b) Load connection displaynames from the prefab xml if not present in a sub or itemassembly xml, use display names in the connection panel interface 2019-05-16 06:04:24 +03:00
Joonas Rikkonen c73fe6e132 (277003233) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:04:08 +03:00
Joonas Rikkonen f259748910 (aebb26541) Added localizable connection names to all items (TODO: display in the connection panel interface, load from prefab if the value is not present in a sub or ItemAssembly file) 2019-05-16 06:03:51 +03:00
Joonas Rikkonen a469dad251 (4b8a3151a) Replaced: Untranslated editor line 'FilterMapEntities' with the translated 'serverlog.filter' 2019-05-16 06:03:17 +03:00
Joonas Rikkonen 79e38a0fa0 (345ac3e2d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 05:59:40 +03:00