Commit Graph

325 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 1a5bf77149 (a40a61508) Added: Not drawing cursor when the window is not active 2019-05-18 17:41:28 +03:00
Joonas Rikkonen 6abe73b889 (3f196aed7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:38:16 +03:00
Joonas Rikkonen 5bd1bc4ae3 (e7d380c4c) Removed size variants of the number/letter/icon decals. Not needed because they can be scaled. 2019-05-18 17:37:03 +03:00
Joonas Rikkonen 5dc3767a8e (6db19454d) Updated: Cursor with a higher resolution version 2019-05-18 17:36:47 +03:00
Joonas Rikkonen be4db3ee12 (aa84bc3c8) Fixed: UI Scaling issues in 4k 2019-05-18 17:36:15 +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 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 4874c07d5e (6056b4603) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:23:31 +03:00
Joonas Rikkonen 3cc0b65946 (b1fa1d68c) Fix stairs not being properly assigned due to a failing raycast. 2019-05-18 17:22:23 +03:00
Joonas Rikkonen fdb9161932 (05abb966f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:21:15 +03:00
Joonas Rikkonen fefa1a067b (fa5639a1d) Added: Space in the beginning of tutorial info frames to have indenting on all paragraphs 2019-05-18 17:20:59 +03:00
Joonas Rikkonen 09ddcc8436 (d9894f840) Round UI text positions to integers, rendering at a fractional position makes them look messy 2019-05-18 17:20:25 +03:00
Joonas Rikkonen 62b690cd94 (69f7a4d52) Fixed: Index out of range error in DoctorTutorial if proceeding too fast to the submarine. Added: Prevention of tooltip drawing when tutorial content is running 2019-05-18 17:19:02 +03:00
Joonas Rikkonen 53cf6c2fef (0dbd7be3d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:17:52 +03:00
Joonas Rikkonen f077a92f5e (965abc29d) If the target sub is not the same as the current sub, need to take the difference into account in sim positions. 2019-05-18 17:17:36 +03:00
Joonas Rikkonen 6055f10c5a (0744e6c3f) Use keybinds to AZERTY when language is set to French 2019-05-18 17:17:20 +03:00
Joonas Rikkonen efb9dcd0f0 (89b895e0a) Added bug report buttons to game settings and pause menu 2019-05-18 17:17:03 +03:00
Joonas Rikkonen f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +03:00
Joonas Rikkonen ce05d50a2b (9c4e324eb) Fixed chat messages going slightly off-frame on top of the in-game chat box. 2019-05-16 07:04:27 +03:00
Joonas Rikkonen d03e1995bc (375481a35) Write save times as unix time values and display them using the system's current date format 2019-05-16 07:03:15 +03:00
Joonas Rikkonen 531c572216 (f6f86c3b6) Use relative scales in store UI, gave more space to the amount input box 2019-05-16 07:00:14 +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 3e8d6cdfc8 (1b9acec1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:22:19 +03:00
Joonas Rikkonen ed2f3f0b11 (643118ce3) Fixed a typo in Credits.xml 2019-05-16 06:22:03 +03:00
Joonas Rikkonen 6b2d6aabe5 (917534b2b) Fixed: tooltip overflowing from container on 4k 2019-05-16 06:21:46 +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 79e38a0fa0 (345ac3e2d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 05:59:40 +03:00
Joonas Rikkonen 018f20e0f0 (5c867d67d) Added a couple of missing lines to EnglishVanilla 2019-05-16 05:59:21 +03:00
Joonas Rikkonen cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +03:00
Joonas Rikkonen 0a67590572 (21a808335) Added: 4k fixes 2019-05-16 05:58:32 +03:00
Joonas Rikkonen 257889b9cc (42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool. 2019-05-16 05:58:15 +03:00
Joonas Rikkonen 412d46169e (1621785a9) Size variants of labels, also reverts 995d492 2019-05-16 05:57:39 +03:00
Joonas Rikkonen f8ca1444fd (7765c6989) Only show a bunch of pathfinder errors and warnings in debug builds. 2019-05-16 05:57:22 +03:00