Commit Graph

374 Commits

Author SHA1 Message Date
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 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 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 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 52d3737416 (717837ca0) Fixed: Editor spacing & element sizes in 4k 2019-05-16 06:24:55 +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 db4e3a6725 (d779d70f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:07:34 +03:00
Joonas Rikkonen b7ae35d942 (332837e80) Fixed: salvagenasonovartifactruin not having translations, using salvagenasonovartifactcave identifier instead 2019-05-16 06:07:17 +03:00
Joonas Rikkonen 5c90e26209 (ef5df81dc) Fixed personal slots not being visible in the sub editor 2019-05-16 06:06:24 +03:00
Joonas Rikkonen ca71fe5955 (a2700bdb3) Fixed crashing if there's an empty diving suit (or any other item with one empty inventory slot) in the personal slots while they're hidden 2019-05-16 06:05:50 +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
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 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 ce1aa39a4b (b1241e3dd) GUIMessageBoxes use relative sizes 2019-05-16 05:46:12 +03:00
Joonas Rikkonen 68ced76e1b (cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai 2019-05-16 05:45:37 +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 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 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
Joonas Rikkonen 828150e0ae (9d8f050b8) Added text wrapping to ItemInventory titles and changed pump GUI In/Out text to use a smaller font 2019-05-16 05:42:34 +03:00
Joonas Rikkonen 1d5de494cd (a185ec0cd) Don't report on broken items that have condition above the threshold. Optimize and fix. 2019-05-16 05:41:25 +03:00
Joonas Rikkonen 79d01822d2 (8015dd67d) Show a language selection prompt when launching the game for the first time (WIP) 2019-05-16 05:41:09 +03:00
Joonas Rikkonen ddd84a4f9e (c45394988) Refactor and fix button interaction and access checks in the indoors steering manager. 2019-05-16 05:40:00 +03:00
Joonas Rikkonen 3575c8df52 (03ab09991) Load chinese fonts dynamically, removed unnecessary duplicate block from DynamicRenderAtlas 2019-05-16 05:39:25 +03:00