Commit Graph

79 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 a01729514b (deeaf479b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:52:26 +03:00
Joonas Rikkonen 31f74aca8d (e3fee50d9) Use roughly matching "fallback translations" for ConnectionPanel texts that haven't been translated yet (e.g. "signal_1" -> "signal_in_1", "trigger_out" -> "shoot"). Still missing the charge-related connection names in batteries, couldn't find any suitable replacements for them 2019-05-18 17:51:52 +03:00
Joonas Rikkonen 79282f5321 (f6436b630) Manually tweak Bunyip waypoints. 2019-05-18 17:48:28 +03:00
Joonas Rikkonen 1973a824bf (91366496d) Removed connection displayname attributes from ItemAssemblies (ended up there with liberal use of Find & Replace, but it's better to use values from the item prefab) 2019-05-18 17:48:06 +03:00
Joonas Rikkonen 90e1786f92 (6f6fc33e7) The bots having the follow order now also equip mask/diving suit if the follow target has one. Unequipping not yet implemented. 2019-05-18 17:47:48 +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 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 26c5f7a87e (8a9446ac2) Added larger GUIFrames w/ relative scale to alien containers 2019-05-18 17:33:30 +03:00
Joonas Rikkonen ea6df7ce0d (ca59bc50f) Need to offset the sim position when not using the insidesteering. 2019-05-18 17:33:15 +03:00
Joonas Rikkonen 2945d103f9 (f825eae18) Fix follow objective not keeping the distance. 2019-05-18 17:30:12 +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 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 1e0d7daa56 (bfc857b70) Ignore the requirement for being able to interact with a character while following the player. 2019-05-18 17:22:41 +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 b97ecddf03 (da82264a0) Use ISpatialEntity as the target of "go to" objective to get rid of the reaching issues. Use display units instead of sim units. Don't calculate a standing point in "fix leak" objective, because it's handled in the AIOperate method when the bot get's near enough, 2019-05-16 06:57:32 +03:00
Joonas Rikkonen a8b1da225b (487a00f40) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:36:01 +03:00
Joonas Rikkonen 420a673653 (725b0f956) nerfed mudraptor swim speeds to offset the mess they make if they do catch up with the player 2019-05-16 06:35:44 +03:00
Joonas Rikkonen 2145a50b1a (d33badbc4) Fixed crashing if AIObjectiveGoTo targets an entity that's part of a submarine but not inside a hull 2019-05-16 06:35:28 +03:00
Joonas Rikkonen 80c563e7b0 (86280d29b) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-16 06:31:49 +03:00
Joonas Rikkonen fc22eb5088 (fc5e081d3) Fixed: Hull names not saving properly in submarineditor 2019-05-16 06:31:32 +03:00
Joonas Rikkonen bf57a48c7e (ebf4529cc) Use a uniform way to check if the bot has reached it's target. Should fix issues where bot is stuck when trying to get or operate an item in some cases. 2019-05-16 06:25:31 +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 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 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