Commit Graph

171 Commits

Author SHA1 Message Date
Joonas Rikkonen 3595d24ff2 (847bb48ed) Disable loading in a separate thread for now to get rid of the FreeType errors 2019-06-09 20:58:10 +03:00
Joonas Rikkonen 017293fdd9 (fe150b924) Fix crashing when an invalid resolution is defined in the configs. Probably doesn't fix all crashes due to high resolutions. 2019-06-09 17:42:51 +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 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
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 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 edccfe223d (9a7d83a40) Fullscreen bug workarounds 2019-06-04 16:00:38 +03:00
Joonas Rikkonen e592c49fa8 (221f9f2a6) Merge branch 'dev' into capitalizationfixes 2019-06-04 15:38:31 +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 04f69dbe63 (b3c71807f) Updated to the latest version of GameAnalytics 2019-06-04 15:33: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 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 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 6ef3828ac1 (21d03e165) Increased maximum voice chat volume further 2019-05-23 15:14:54 +03:00
Joonas Rikkonen 827f54fcff (a13c74ce0) Fixed: Loading screen dismissable & escape usable when the game is not active 2019-05-23 15:10:38 +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 f0d8186c69 (fc5c8644d) Automatically enable user statistics if the "do you want to send statistics" prompt cannot be shown on the selected language 2019-05-18 17:54:46 +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 3635568b6a (6ac5b80f0) Fixed: PauseOnFocusLost always treated as if being enabled 2019-05-18 17:40:49 +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 52f773027b (1da19b35c) Increased maximum voice chat volume 2019-05-18 17:34:37 +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 9f87239724 (f3d83a912) Disabled: Separate mac path to test if editing the actual application folder when using steam is OK 2019-05-16 06:32:38 +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