Commit Graph

166 Commits

Author SHA1 Message Date
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 6b01c29a01 (fc1d72489) Fixed crash when no audio capture devices are available 2019-06-04 16:38:51 +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 5208b922d8 (46e39d26c) v0.9.0.4 2019-06-04 16:12:45 +03:00
juanjp600 9364b3839a (6eee2e437) Replaced OpenTK + replaced reference OpenAL implementation with soft_oal 2019-06-04 16:06:05 +03:00
Joonas Rikkonen 8184f0e6f6 (6b3ca1aae) Fixed the "item in use by x" text not being visible in item interfaces 2019-06-04 16:03:00 +03:00
Joonas Rikkonen aaa945ded8 (0f1d327f0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-04 16:02:42 +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 51c311aecb (5b6f8ab90) Assign displayModeDD.OnSelected before adding items to it 2019-06-04 16:02:06 +03:00
Joonas Rikkonen c39eec8c89 (034bb920b) Fixed selecting display resolution when using borderless on Linux 2019-06-04 16:01:49 +03:00
Joonas Rikkonen 6ffe13b4b7 (e4191497a) Workaround to changing resolution in fullscreen + force borderless windowed to display resolution 2019-06-04 16:01:31 +03:00
Joonas Rikkonen a1e558d14a (99824fa09) Reallow changing resolution in fullscreen/borderless, 4 real now 2019-06-04 16:01:14 +03:00
Joonas Rikkonen 12ad53297d (657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing? 2019-06-04 16:00:57 +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 9e345fb7c6 (b17ad03b6) Removed accidental ">" from credits 2019-06-04 15:32:22 +03:00
Joonas Rikkonen bc566ac0e7 (bc44f3622) Fixed credits not resizing when resolution is changed 2019-06-04 15:32:04 +03:00
Joonas Rikkonen 04932e960a (5b6f8ab90) Assign displayModeDD.OnSelected before adding items to it 2019-06-04 15:31:46 +03:00
Joonas Rikkonen b3b9167c48 (034bb920b) Fixed selecting display resolution when using borderless on Linux 2019-06-04 15:31:27 +03:00
Joonas Rikkonen adaa59a39b (e4191497a) Workaround to changing resolution in fullscreen + force borderless windowed to display resolution 2019-06-04 15:31:09 +03:00
Joonas Rikkonen 19eb50d4fb (99824fa09) Reallow changing resolution in fullscreen/borderless, 4 real now 2019-06-04 15:30:49 +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 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 0021a71d2d (4112b048e) Convert the name of the currently selected capture device to UTF8 in the settings menu, not just the available capture device names 2019-05-18 17:56:16 +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 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
Joonas Rikkonen 5fdc5f65f3 (d9779ffb1) Don't reset the language when resetting settings to defaults 2019-05-18 17:24:20 +03:00
Joonas Rikkonen 6055f10c5a (0744e6c3f) Use keybinds to AZERTY when language is set to French 2019-05-18 17:17:20 +03:00
Joonas Rikkonen efb9dcd0f0 (89b895e0a) Added bug report buttons to game settings and pause menu 2019-05-18 17:17:03 +03:00
Joonas Rikkonen e42a0a33a4 (2d9e06198) Attempt to fix incorrectly displayed Chinese capture device names (haven't been able to reproduce) 2019-05-16 07:02:57 +03:00
Joonas Rikkonen 19b4caa576 (a7fed8657) More punctuation fixes 2019-05-16 07:01:26 +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 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 96b2d953d2 (bad03a33d) Don't translate language names to the current display language in the settings menu (should be translated to the target language instead) 2019-05-16 05:44:31 +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