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
|
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
|
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
|
be4db3ee12
|
(aa84bc3c8) Fixed: UI Scaling issues in 4k
|
2019-05-18 17:36:15 +03:00 |
|
Joonas Rikkonen
|
f605651966
|
(683b11c00) High-res shuttle preview images + merge fix
|
2019-05-16 08:49:01 +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
|
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
|
57302f7bb8
|
(4ff749939) Added new environment assets for implementation
|
2019-05-16 05:51:28 +03:00 |
|
Joonas Rikkonen
|
049d3ba795
|
(e7bd8839d) Remove unused parameters.
|
2019-05-16 05:51:12 +03:00 |
|
Joonas Rikkonen
|
ef374ada71
|
(990e36132) Merge branch 'human-ai' into dev
|
2019-05-16 05:50:20 +03:00 |
|
Joonas Rikkonen
|
068089ae5c
|
(d622ac851) Fix double updates of current orders.
|
2019-05-16 05:47:36 +03:00 |
|
Joonas Rikkonen
|
306cb77167
|
(6facb21fe) Reminder to self: save before committing
|
2019-05-16 05:46:29 +03:00 |
|
Joonas Rikkonen
|
ce1aa39a4b
|
(b1241e3dd) GUIMessageBoxes use relative sizes
|
2019-05-16 05:46:12 +03:00 |
|
Joonas Rikkonen
|
b02565796a
|
(98f1dbf5e) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:58 +03:00 |
|
Joonas Rikkonen
|
7f72f72ca7
|
(9c0250ef1) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:40 +03:00 |
|
Joonas Rikkonen
|
2ae54a01a5
|
(ac7ab10b0) Pass AIObjectiveManager reference in the constructors instead of methods so that we can always access it.
|
2019-05-16 05:14:20 +03:00 |
|
Joonas Rikkonen
|
bec7aadfa9
|
(af16ecdfa) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:00 +03:00 |
|
Joonas Rikkonen
|
8be0b0676e
|
(83868bb0e) Refactor AIObjectiveExtinguishFires to use the AIObjectiveLoop class. Significant refactoring of the other looping objectives. Reduce the duplicate code.
|
2019-05-16 05:13:40 +03:00 |
|
Joonas Rikkonen
|
7fb7c13198
|
(fbfb76aeb) Implement automatic extinguishing. TODO: should use the AIObjectiveLoop class.
|
2019-05-16 05:13:21 +03:00 |
|
Joonas Rikkonen
|
ab2ca90d08
|
(900eddc26) Take the priority modifier in account when calculating the priority, not the max value.
|
2019-05-16 05:13:03 +03:00 |
|
Joonas Rikkonen
|
3c8707fc16
|
(d9d8b0f27) Always display waypoint ids in debug draw. Adjust the positions and the colors.
|
2019-05-16 05:12:44 +03:00 |
|
Joonas Rikkonen
|
e06a473b41
|
(a63bd205d) Adjust automatic order priority modifiers.
|
2019-05-16 05:12:24 +03:00 |
|
Joonas Rikkonen
|
019712ef66
|
(829458a66) Don't apply priority modifier on the priority value, because it's already applied to the max value. The priority value should be normalized, because we are using the lerp.
|
2019-05-16 05:12:07 +03:00 |
|
Joonas Rikkonen
|
dbccd76613
|
(c6ca0ef58) Recreate objectives when the bot is dismissed.
|
2019-05-16 05:11:49 +03:00 |
|
Joonas Rikkonen
|
de8a23f687
|
(1137f730e) Instead of forcing the looping objectives to use the average, let them decide the method of evaluating the targets. Use the highest priority for now.
|
2019-05-16 05:11:32 +03:00 |
|
Joonas Rikkonen
|
759e4aee0d
|
(96ccafd88) Fix the goto objective not always completing because of too high NearEnough value.
|
2019-05-16 05:11:17 +03:00 |
|
Joonas Rikkonen
|
9a1e7f8212
|
(1c6954251) Add IsLoop property. Fixes operate item orders being removed when they are done. Instead of calling loopable objectives done, let's just use the priority system.
|
2019-05-16 05:11:01 +03:00 |
|
Joonas Rikkonen
|
781fd44a8c
|
(4efa46ffe) Limit the base priority due to devotion to 10.
|
2019-05-16 05:10:42 +03:00 |
|
Joonas Rikkonen
|
cdeb6d40b3
|
(f3bfe1ac4) Fix damage priority calculation.
|
2019-05-16 05:10:25 +03:00 |
|
Joonas Rikkonen
|
9cc9137fff
|
(b8fa3b004) Merge branch 'dev' into human-ai
|
2019-05-16 05:10:07 +03:00 |
|
Joonas Rikkonen
|
7ebb0be29b
|
(db42ef494) Don't allow combat priority go over 100.
|
2019-05-16 05:09:51 +03:00 |
|
Joonas Rikkonen
|
171c42f077
|
(3241b8fe7) Adjust the priorities. The orders should now always have higher priority than other objectives (except find safety and combat).
|
2019-05-16 05:09:33 +03:00 |
|
Joonas Rikkonen
|
7c901d8d77
|
(8fd36f702) Add a separate value for run threshold. Increase the order priority from 50 to 70.
|
2019-05-16 05:09:15 +03:00 |
|
Joonas Rikkonen
|
3a3d55d780
|
(39b4d0859) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:56 +03:00 |
|
Joonas Rikkonen
|
616efac2bf
|
(19b26d13b) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:39 +03:00 |
|
Joonas Rikkonen
|
454dda56c7
|
(1762f02b3) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:22 +03:00 |
|
Joonas Rikkonen
|
4797f6b0d3
|
(307219669) Add some automatic orders.
|
2019-05-16 05:08:02 +03:00 |
|
Joonas Rikkonen
|
b51fd32b88
|
(de7949704) Rewrite the leak priority calculations. Ensure that the damage priority is not negative.
|
2019-05-16 05:07:45 +03:00 |
|