Commit Graph

155 Commits

Author SHA1 Message Date
Joonas Rikkonen
c7efdbb0e3 (97afc6f16) Fixed: SubPatients list not cleared when restarting 2019-05-18 17:53:54 +03:00
Joonas Rikkonen
d36669c607 (7f6b8d538) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-18 17:53:38 +03:00
Joonas Rikkonen
b1326787f7 (32460d493) Fixed: Wait timers running in tutorials when pause menu is open 2019-05-18 17:53:18 +03:00
Joonas Rikkonen
e7db219943 (89d59c16f) Highlight screwdriver at repair junction box objective 2019-05-18 17:52:43 +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
82c735fcb9 (72ae6ed22) Use display name (translated) instead of room name. 2019-05-18 17:32:27 +03:00
Joonas Rikkonen
e63ffe652e (5e16139ed) Added "OrderGiver" field to AI orders, always show reports from the currently controlled character (even if the report is not targeted for the character's class) 2019-05-18 17:26:34 +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
e7e794b070 (a9b331570) Fixed incorrect aim and shoot instructions in mechanic tutorial 2019-05-18 17:22:06 +03:00
Joonas Rikkonen
e00ad76042 (072db26c1) Shortened delay between radio messages and deconstruct objective in mechanic tutorial 2019-05-18 17:21:48 +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
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
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
ff83e3fe38 (4ceb463a2) Fixed medic tutorial crashing on languages other than English due to RoomNames being used to find specific hulls (now uses cargo spawnpoints) 2019-05-16 06:44:27 +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
0a4a2aa35e (cdc3301a5) Fixed: Tutorial checkmark position 2019-05-16 06:22:53 +03:00
Joonas Rikkonen
0b837a6086 (1a3a48fee) Fixed: Tutorial stroke size 2019-05-16 06:22:36 +03:00
Joonas Rikkonen
cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +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
Joonas Rikkonen
1ae482a84d (8c8a15639) Implemented new wall textures 2019-05-16 05:56:49 +03:00
Joonas Rikkonen
fe5f386358 (61f67c194) Fix the raycast and angle checks. use the weapon position instead of the character position. 2019-05-16 05:56:16 +03:00
Joonas Rikkonen
0bb541bce8 (2c8e14bca) Added edge variants for new environment base textures 2019-05-16 05:54:50 +03:00
Joonas Rikkonen
e9664d3639 (084340338) Add an aim timer before the weapon can be used. Fix a null reference exception. 2019-05-16 05:54:33 +03:00
Joonas Rikkonen
71685ef28c (3ebdb2066) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 05:52:21 +03:00
Joonas Rikkonen
f8a0d54449 (d54773ab0) Fix the project references. 2019-05-16 05:52:02 +03:00
Joonas Rikkonen
f02c7cdda9 (ee538829d) Added docking tutorial video, removed highlight from old docking button. 2019-05-16 05:51:45 +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
e367f900b8 (2a4bd39c2) Merge branch 'dev' into human-ai 2019-05-16 05:33:13 +03:00
Joonas Rikkonen
3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen
b02565796a (98f1dbf5e) Merge branch 'dev' into human-ai 2019-05-16 05:14:58 +03:00