Commit Graph

271 Commits

Author SHA1 Message Date
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
52d3737416 (717837ca0) Fixed: Editor spacing & element sizes in 4k 2019-05-16 06:24:55 +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
db4e3a6725 (d779d70f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:07:34 +03:00
Joonas Rikkonen
b7ae35d942 (332837e80) Fixed: salvagenasonovartifactruin not having translations, using salvagenasonovartifactcave identifier instead 2019-05-16 06:07:17 +03:00
Joonas Rikkonen
4953a218d6 (a0bd05063) Fixed item assembly icons being drawn upside-down in the sub editor 2019-05-16 06:06:41 +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
18b6775457 (aee208587) Option to configure multiple sprite variants for a LevelObject, implemented new ice/rock sprites 2019-05-16 05:57:58 +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
6b1500aa8d (203af66e8) Allow to attack other enemies too. 2019-05-16 05:56:32 +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
566f1d16e4 (913cde46d) Refactor AIObjectiveUsing to use the TryAddSubObjective method. Reorganize a bit. 2019-05-16 05:50:04 +03:00
Joonas Rikkonen
5d7cc6599c (9db806bbf) Don't report on targets that have been reported. 2019-05-16 05:49:48 +03:00
Joonas Rikkonen
b105ef71eb (b4d4f6802) Re-enable initiative. 2019-05-16 05:49:32 +03:00
Joonas Rikkonen
c28106812d (29f9396dc) Fix the devotion clamps. 2019-05-16 05:49:15 +03:00
Joonas Rikkonen
351e7bbd71 (6401d5d4b) The medic should now drag only unconcious targets into safety before applying treatment. Increase the VitalityThreshold and reduce the distance factor. Add a couple new dialogs. 2019-05-16 05:48:59 +03:00
Joonas Rikkonen
44d78a1466 (29e9d88c2) Whoops. I though I already used absolute velocities. 2019-05-16 05:48:44 +03:00
Joonas Rikkonen
ca8fbe4390 (4a761e62c) Default priority modifier is 1. 2019-05-16 05:48:25 +03:00
Joonas Rikkonen
ed49bea3ef (c21615b5b) More optimizations. 2019-05-16 05:48:09 +03:00
Joonas Rikkonen
480bba392c (20fcd3853) Optimizations. 2019-05-16 05:47:52 +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
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
28eef39b64 (97c11681e) Abandon the operate item objective if the controller is not found. 2019-05-16 05:36:23 +03:00
Joonas Rikkonen
8280ed9c1a (3b137aa1a) Merge remote-tracking branch 'origin/dev' into human-ai 2019-05-16 05:36:05 +03:00
Joonas Rikkonen
e4f41789b0 (143d158cb) Merge branch 'dev' into human-ai 2019-05-16 05:25:02 +03:00