 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 |
|
|
Joonas Rikkonen
|
1e85abf09d
|
(8cbc4391a) Disable find safety while going somewhere in the sea with an order.
|
2019-05-18 17:30:46 +03:00 |
|
|
Joonas Rikkonen
|
7155525d5b
|
(4d2ab0cd2) Reset the find safety priority when a safe hull has been reached or when there is no danger to flee from. Use wandering instead of resetting the steering (unfortunately doesn't work in very small hulls like airlocks).
|
2019-05-18 17:30:30 +03:00 |
|
|
Joonas Rikkonen
|
2945d103f9
|
(f825eae18) Fix follow objective not keeping the distance.
|
2019-05-18 17:30:12 +03:00 |
|
|
Joonas Rikkonen
|
3660df1906
|
(bdf4ed547) Store the last safe hull and use it if cannot find a new.
|
2019-05-18 17:29:56 +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
|
6463face3b
|
(ad01c2907) Don't set the path unreachable if cannot press buttons, because we might just be too far (if the waypoint is so far). Happens when trying to enter Dugong.
|
2019-05-18 17:29:06 +03:00 |
|
|
Joonas Rikkonen
|
f304dab929
|
(67f76f467) Ignore submarine in the pathfinder raycasts, because it can prevent the bots to steer into the sub from outside of it. Doesn't seem to have any negative implications.
|
2019-05-18 17:28:51 +03:00 |
|
|
Joonas Rikkonen
|
3d91dfa76b
|
(910c0c784) Use squared distance instead of distance.
|
2019-05-18 17:28:35 +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
|
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 |
|