Commit Graph

972 Commits

Author SHA1 Message Date
Joonas Rikkonen a3e67dd40a (7163b300e) Added: Way for capitalizing / lowercasing replaced variables depending on the position in the sentence & some implementations 2019-06-04 15:32:59 +03:00
Joonas Rikkonen bc566ac0e7 (bc44f3622) Fixed credits not resizing when resolution is changed 2019-06-04 15:32:04 +03:00
Joonas Rikkonen 93e4767fb8 (657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing? 2019-06-04 15:30:32 +03:00
Joonas Rikkonen bce99f2e6f (7e0adb991) Fixed legacy items failing to load if a sub is saved with a language other than English and the language then changed to something else. 2019-06-04 15:29:55 +03:00
Joonas Rikkonen ebd916e95c (9a7d83a40) Fullscreen bug workarounds 2019-06-04 15:29:36 +03:00
Joonas Rikkonen 405cdf63a3 (a7543019c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 17:04:47 +03:00
Joonas Rikkonen 304db988b1 (b63c9bf0c) Fixed OpenFileDialog not closing on Linux 2019-05-23 17:04:30 +03:00
Joonas Rikkonen 834ee2947b (32eb82193) Fix: bots not using the oxygen tanks found in their inventory when the find safety objective is active. 2019-05-23 16:28:22 +03:00
Joonas Rikkonen e9d31ed0be (1241a5bd4) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 16:28:04 +03:00
Joonas Rikkonen 44a5c9e588 (81babbeac) Added Linux System.Windows.Forms 2019-05-23 16:27:46 +03:00
Joonas Rikkonen 90149b9435 (912383b95) Unequip the diving gear when the follow target unequips it. 2019-05-23 16:27:10 +03:00
Joonas Rikkonen b8ebf34c38 (4c111302a) Fixed Shuttle Shell A01/A02 colliders not being resized according to the size of the wall 2019-05-23 16:26:51 +03:00
Joonas Rikkonen aab7b3ff16 (c08201dee) Hide the texture scale for now, because currently you shouldn't edit it in the editor. 2019-05-23 16:26:31 +03:00
Joonas Rikkonen 48e8c62cae (97bf93407) Fix a typo in a function name. 2019-05-23 16:26:13 +03:00
Joonas Rikkonen a95f1b7186 (d7b8238d6) Don't show reports from breaches that are room to room (the bots should still target them). 2019-05-23 15:18:50 +03:00
Joonas Rikkonen 90b0c208fc (1343e66e3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:08:45 +03:00
Joonas Rikkonen 1fb558d7ef (84593b8fb) Fixed: Oxygen levels of the patient on the submarine being adjusted too late 2019-05-23 15:08:27 +03:00
Joonas Rikkonen a965314b8f (15bea4eef) Only ask medical assistance if there is a character with the rescue all objective. Don't allow to add targets if the bot is dead. 2019-05-23 15:07:50 +03:00
Joonas Rikkonen f3cb071b1d (2921cd18b) Fix potential null reference exceptions in the IsValidTarget of the rescue all method. 2019-05-23 15:07:32 +03:00
Joonas Rikkonen 9b56fa9832 (db31ead65) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-20 21:03:14 +03:00
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 11d115cca4 (f33b03b1a) Remove the "repair job-specific"/"repair everything" options from the repair order and use "repair everything" by default. "Repair job-specific" isn't very useful anymore because the characters can prioritize what to fix based on their skills pretty well. 2019-05-20 20:35:44 +03:00
Joonas Rikkonen b8da5670c1 (220a59c65) Fixed nullref exception in AIObjectiveRescure.Act if the character has no FindSafety objective 2019-05-20 20:32:35 +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 120dc39a9e (36d2ff935) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-20 20:18:17 +03:00
Joonas Rikkonen 1340780205 (18af6c22d) Fixed: On/Off switches not being highlighted in mechanic tutorial 2019-05-20 20:17:59 +03:00
Joonas Rikkonen 1101252ad2 (a652b4140) Added missing "dialognorescuetargets" to EnglishVanilla, don't attempt to say the line on languages other than English 2019-05-20 20:17:42 +03:00
Joonas Rikkonen 3cf514db97 (29fc2e4d4) Fixed AIObjectiveRescue throwing a nullref exception if the target is not the character itself, added null checks 2019-05-20 20:17:25 +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 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 6332cfd55f (81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:44:13 +03:00
Joonas Rikkonen ada4e17dfe (e5eeacbd0) Cleanup. 2019-05-18 17:43:56 +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 dc1dd454fd (f900dfb1c) Added missing lines to EnglishVanilla 2019-05-18 17:43:19 +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 d893f27dc2 (4c4f47cc2) Fixed reports by bots not being sent to clients in MP 2019-05-18 17:33:48 +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 65019e8d19 (4ddd494a4) Add a todo note. 2019-05-18 17:32:43 +03:00
Joonas Rikkonen 5774f8b1f9 (af0e86583) Reset steering while waiting. 2019-05-18 17:32:09 +03:00