Commit Graph

360 Commits

Author SHA1 Message Date
Joonas Rikkonen
157f6cfd21 (62b9ca04f) Removed Berilia from the build 2019-06-15 20:00:44 +03:00
Joonas Rikkonen
03a7093486 (1c5ce3fee) More descriptive error messages when publishing a Workshop item fails. 2019-06-15 19:44:13 +03:00
Joonas Rikkonen
63999fc17b (62b9ca04f) Removed Berilia from the build 2019-06-15 19:43:32 +03:00
Joonas Rikkonen
e3ca616fff (869ac975f) Merge branch 'master' into dev 2019-06-12 16:43:56 +03:00
Joonas Rikkonen
eaf4f6afb8 (face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568 2019-06-12 16:43:34 +03:00
Joonas Rikkonen
b14abc0cb0 (684b4ac74) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:48:29 +03:00
Joonas Rikkonen
d8e7c79a21 (74c45abbe) Fixed: GUIDropdown parent returning a null GUIComponent when opening CharacterEditor & promptly crashing after 2019-06-11 21:48:10 +03:00
Joonas Rikkonen
3d57999f2d (2246b239b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:47:35 +03:00
Joonas Rikkonen
3b936e41ba (d49897af2) Removed debug code I used to test the position of the workshop item update button 2019-06-11 21:47:18 +03:00
Joonas Rikkonen
e9c8103be4 (5a6865d0f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:46:57 +03:00
Joonas Rikkonen
c30f1de8f3 (8814bcb6b) Null checks on GUIStyle fonts 2019-06-11 21:46:39 +03:00
Joonas Rikkonen
5f497543a4 (1986bc0d3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-11 21:46:21 +03:00
Joonas Rikkonen
dd1ce8bf2f (df244251c) Fixed: Electric devices that are underwater and are broken by flooding being repairable forever, due to condition never staying at full condition for long enough for the repairing to stop 2019-06-11 21:46:02 +03:00
Joonas Rikkonen
20d88b3769 (add36f1cf) Fixed dropdowns in workshop item publish menu being draw behind the buttons below them. 2019-06-11 21:45:41 +03:00
Joonas Rikkonen
85d19d7f3c (53c44ee8a) Disallow shooting and attacking when hovering over a GUIComponent + added guimessagebox command 2019-06-09 17:36:48 +03:00
Joonas Rikkonen
0f38f154d9 (9cec8d97d) Fixed GUINumberInput buttons not becoming disabled when setting the min/max values (e.g. the minus button in the extra cargo menu was clickable even if the value was 0) 2019-06-04 16:51:31 +03:00
Joonas Rikkonen
d1ca8f1fb8 (04efc4310) Fixed splash screens playing after loading screen is closed + fixed splash screens getting skipped while out of focus 2019-06-04 16:42:18 +03:00
Joonas Rikkonen
3393cb7a1b (4ca1f10d7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-04 16:41:59 +03:00
Joonas Rikkonen
fd8fe59688 (7d2df62c0) fixed ID card tags 2019-06-04 16:41:39 +03:00
Joonas Rikkonen
aadb0ffa80 (cb59734bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-04 16:41:00 +03:00
Joonas Rikkonen
7f5a6f77dd (c8c4b0d92) Require that the bot is in the same hull as the goto target, before calling it done. 2019-06-04 16:40:23 +03:00
Joonas Rikkonen
7eb06c3b5c (dfb859379) Additional fixes to audio device capture list 2019-06-04 16:39:47 +03:00
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
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
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
928ace7063 (c0f7f880e) Made the bug report button in the pause menu a little less prominent, more aliasing at the edges of the bug and notification icons 2019-05-20 20:34:52 +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
f24db4d3ae (77c9efbf8) Display the language names in the respective languages in the initial language selection screen. Closes #1467 2019-05-18 21:55:34 +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
1a5bf77149 (a40a61508) Added: Not drawing cursor when the window is not active 2019-05-18 17:41:28 +03:00
Joonas Rikkonen
6abe73b889 (3f196aed7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:38:16 +03:00
Joonas Rikkonen
5bd1bc4ae3 (e7d380c4c) Removed size variants of the number/letter/icon decals. Not needed because they can be scaled. 2019-05-18 17:37:03 +03:00
Joonas Rikkonen
5dc3767a8e (6db19454d) Updated: Cursor with a higher resolution version 2019-05-18 17:36:47 +03:00
Joonas Rikkonen
be4db3ee12 (aa84bc3c8) Fixed: UI Scaling issues in 4k 2019-05-18 17:36:15 +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
9155b404ea (078e3646e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:31:02 +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