 Joonas Rikkonen
|
bea7b58ff3
|
(a410fd46c) Trying to help the merge script through a jungle of merges
|
2019-06-04 16:37:31 +03:00 |
|
|
Joonas Rikkonen
|
81dd2f3202
|
(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."
|
2019-06-04 16:02:25 +03:00 |
|
|
Joonas Rikkonen
|
edccfe223d
|
(9a7d83a40) Fullscreen bug workarounds
|
2019-06-04 16:00:38 +03:00 |
|
|
Joonas Rikkonen
|
f797235bfd
|
(38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla
|
2019-06-04 15:38:12 +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
|
dfa584c2c5
|
(0b650589c) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-05-18 21:51:29 +03:00 |
|
|
Joonas Rikkonen
|
50f379086c
|
(3b88adb46) Added: Highlighting to player health bar before the health interface has been opened for the first time
|
2019-05-18 21:51:12 +03:00 |
|
|
Joonas Rikkonen
|
896dd9469c
|
(b13f5d345) If the "mysteries lie ahead" text that pops up when clicking the location at the center of the map is not available in the selected language, show the campaign roadmap (which mentions the center location not being reachable) instead
|
2019-05-18 17:55:58 +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
|
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
|
84b034b34d
|
(bf1f4d5e8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-18 17:41:06 +03:00 |
|
|
Joonas Rikkonen
|
3635568b6a
|
(6ac5b80f0) Fixed: PauseOnFocusLost always treated as if being enabled
|
2019-05-18 17:40:49 +03:00 |
|
|
Joonas Rikkonen
|
a5adf362b8
|
(2c1d76ee3) Fixed structure sprites being drawn behind their background sprite if the depth is set higher than the background sprite's depth in the sub editor.
|
2019-05-18 17:38:34 +03:00 |
|
|
Joonas Rikkonen
|
f605651966
|
(683b11c00) High-res shuttle preview images + merge fix
|
2019-05-16 08:49:01 +03:00 |
|
|
Joonas Rikkonen
|
19b4caa576
|
(a7fed8657) More punctuation fixes
|
2019-05-16 07:01:26 +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
|
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 |
|