Commit Graph

105 Commits

Author SHA1 Message Date
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 97b095bd10 (0e668e083) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev (squashed together 20290af96..0e668e083 because the merge script shit itself due to the merges in between) 2019-05-20 20:25:12 +03:00
Joonas Rikkonen eed0666879 (76909c3c7) Fixed "clowncostume" and "crewaway" achievements not unlocking in multiplayer, fixed being able to get the "killclown" achievement by committing suicide while wearing a clown costume. Closes #1478
+ merge fix
2019-05-18 18:24:03 +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 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 6463face3b (ad01c2907) Don't set the path unreachable if cannot press buttons, because we might just be too far (if the waypoint is so far). Happens when trying to enter Dugong. 2019-05-18 17:29:06 +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 d5594ee591 (ee3387a0d) Attempted fix for bots occasionally getting stuck between nodes and reversing to a previous node. Only replace the previous path when the cost of it is lower than the current path's cost (or if the target is not at the same place/ not yet assigned). Didn't have enough time to test, not sure if it works. 2019-05-18 17:23:13 +03:00
Joonas Rikkonen f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +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 3153771cc7 (6f231d0fc) Add generic methods for getting linked map entities. TODO: memory-optimized overload for hulls. 2019-05-16 06:43:33 +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 f01747e822 (773ace2cd) Fixed RagdollParams/AnimationParams GetDefaultPath failing if there are multiple installed content packages that define characters with the same name. TODO: take custom ragdoll/anim paths into account when calculating content package hashes 2019-05-16 06:40:57 +03:00
Joonas Rikkonen 2b95c55070 (5f20d1b76) Remove custom steering logic for stairs, because most of the waypoints going over the stairs don't have stairs assigned to them. Bots shouldn't drop the diving suit if any of the nodes in the path has stairs. Doesn't work well, but it's a minor issue. Don't want to do raycasts here. 2019-05-16 06:40:39 +03:00
Joonas Rikkonen 4690c441e3 (985be28e4) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:39:48 +03:00
Joonas Rikkonen 5a4f50cfd2 (a6aea4ada) Fixed clients failing to spawn items when using a different language than the server 2019-05-16 06:39:31 +03:00
Joonas Rikkonen 82a3e21510 (e40e55726) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:39:14 +03:00
Joonas Rikkonen f4c4fd2a23 (70a10e3f3) added supplies 2019-05-16 06:38:55 +03:00
Joonas Rikkonen 2a3c4a5796 (9edc98796) Fix a bug where the bots is stuck next to a stairway. 2019-05-16 06:38:38 +03:00
Joonas Rikkonen fb21fe7b44 (00d1e066a) Take also the previous node into account when determining if the bot is using stairs or not. Should fix bots occasionally dropping the diving suit in stairs. 2019-05-16 06:38:19 +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 884360216f (de60c0961) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 05:50:56 +03:00
Joonas Rikkonen fd7dfebd3a (50c25dbf6) Added a "back" button that closes the credits, minor credits tweaks 2019-05-16 05:50:39 +03:00
Joonas Rikkonen 44d78a1466 (29e9d88c2) Whoops. I though I already used absolute velocities. 2019-05-16 05:48:44 +03:00
Joonas Rikkonen 068089ae5c (d622ac851) Fix double updates of current orders. 2019-05-16 05:47:36 +03:00
Joonas Rikkonen c09df5c602 (567dd3eb2) Wait for the splash videos to finish before continuing with loading if the loading coroutine cannot be run in a separate thread. Not an ideal solution, but better than the unbearably choppy videos. TODO: figure out a way to run the loading screen and the loading coroutine in separate threads on Mac & Linux 2019-05-16 05:47:18 +03:00
Joonas Rikkonen bb6bffe88a (b597640aa) Implemented the new splash videos (each can be skipped separately), language selection on first startup works now 2019-05-16 05:47:02 +03:00
Joonas Rikkonen 436c5d4d73 (373a0d300) Daedalic splash video, split FF & UTF videos 2019-05-16 05:46:46 +03:00
Joonas Rikkonen 306cb77167 (6facb21fe) Reminder to self: save before committing 2019-05-16 05:46:29 +03:00
Joonas Rikkonen ce1aa39a4b (b1241e3dd) GUIMessageBoxes use relative sizes 2019-05-16 05:46:12 +03:00
Joonas Rikkonen 04997cd2f3 (fc1a963c7) Double the path wait time when targeting entities. 2019-05-16 05:45:19 +03:00
Joonas Rikkonen b9cca44ce2 (8045205b5) Test a velocity based calculation for skipping the nodes in steering. 2019-05-16 05:45:04 +03:00
Joonas Rikkonen f8090d470e (5670a7c58) Don't get stuck if cannot use the button. 2019-05-16 05:44:48 +03:00
Joonas Rikkonen 96b2d953d2 (bad03a33d) Don't translate language names to the current display language in the settings menu (should be translated to the target language instead) 2019-05-16 05:44:31 +03:00
Joonas Rikkonen 7ae2b2f387 (2ffcd0a06) Retry writing files in SaveUtil.DecompressFile up to 4 times (in case the file is being used by another process), fixed DecompressFiletoStream "retrying" 4 times even if the first try succeeds 2019-05-16 05:44:15 +03:00
Joonas Rikkonen ec7e45e021 (914b4d519) Set Reactor window max size to be slightly larger, fixed ItemInventory text wrapping to work better on different resolutions 2019-05-16 05:43:59 +03:00
Joonas Rikkonen 5ec107bf83 (0d96091e5) Adjusted layout spacing on Reactor to make the warning labels slightly more readable on Brazilian Portugese 2019-05-16 05:43:40 +03:00
Joonas Rikkonen 3c17c976d7 (e8b231370) Reduce the required distance to the next node before skipping to the next node while in stairs. Should make it easier for bots to use the stairs. 2019-05-16 05:43:06 +03:00
Joonas Rikkonen de2246fe57 (e0d673b0d) Test: Don't calculate the distance to the buttons when seeking path. Instead, check the distance when checking the doors. Allows the bots to access the Remora ballast through the door where the button is a bit farther from the door than usually. 2019-05-16 05:42:51 +03:00