Commit Graph

272 Commits

Author SHA1 Message Date
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
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
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
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
Joonas Rikkonen
7614642d93 (e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai 2019-05-16 05:30:39 +03:00
Joonas Rikkonen
54a0164f89 (98501b696) Reduce the max accepted distance for repair tool ai operate. 2019-05-16 05:30:23 +03:00
Joonas Rikkonen
3bce90251a (133a5b1da) Merge branch 'dev' into human-ai 2019-05-16 05:27:51 +03:00
Joonas Rikkonen
8621d9927e (a21f15055) Merge branch 'dev' into human-ai 2019-05-16 05:27:17 +03:00
Joonas Rikkonen
f46990d539 (d74fee449) Revert "Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons." 2019-05-16 05:25:20 +03:00
Joonas Rikkonen
e4f41789b0 (143d158cb) Merge branch 'dev' into human-ai 2019-05-16 05:25:02 +03:00
Joonas Rikkonen
88de435487 (cf495e03c) Check the visibility to the target when engaging (the distance is not enough, if there's something blocking the line of sight). 2019-05-16 05:20:45 +03:00
Joonas Rikkonen
3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen
bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen
454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen
039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen
60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen
427526aba2 (d4a475f03) Added text wrapping to pump GUI texts 2019-05-07 18:05:16 +03:00
Joonas Rikkonen
1e1c772d8a (3fb6030aa) Fixed CustomInterface labels not being translated 2019-05-07 16:25:32 +03:00
Joonas Rikkonen
5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +03:00
Joonas Rikkonen
65d627d57c (2c9775b8e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-06 11:22:36 +03:00