Commit Graph

1832 Commits

Author SHA1 Message Date
Joonas Rikkonen 2b5e828716 (afc093585) Removed leftover debug message from whitelist 2019-06-13 11:46:23 +03:00
Joonas Rikkonen a34a6bf1db (31379c825) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-13 11:44:39 +03:00
Joonas Rikkonen bd5c18aea2 (eeeb15d3d) Added: Platform collision for items 2019-06-13 11:44:18 +03:00
Joonas Rikkonen a92e01b6af (1256d7edc) Fixed servers using a local campaign save path sent by the client setupping the campaign. Closes #1564 2019-06-12 16:45:44 +03:00
Joonas Rikkonen adab8589da (f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-12 16:45:24 +03:00
Joonas Rikkonen dce98349ea (23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing 2019-06-12 16:45:02 +03:00
Joonas Rikkonen b598459179 (65e2b5073) Fixed crashing when an item that requires aim to use is used by something else than a character. Not sure if there are any vanilla items that can cause this error, but can be reproduced for example by creating a projectile that RequiresAimToUse and triggers the Use method when it hits something. Closes #1602 2019-06-12 16:44:18 +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 54fe039c8a (5b697f37f) Link the door and the gap even more strictly. It shouldn't be possible to destroy or move the other without moving the other. Fixes #1528. 2019-06-12 16:43:13 +03:00
Joonas Rikkonen cd5f8735e7 (d2accb97f) Restrict server name length to 60 characters, prevent long server names from overflowing in the "host server" menu & server lobby 2019-06-12 16:42:33 +03:00
Joonas Rikkonen e38c896d42 (7f9b7df0c) Fixed items disappearing when they're dropped into a full container. Closes #1588 2019-06-11 21:50:38 +03:00
Joonas Rikkonen 8f4cbad15c (4675d2f8d) Fixed the bottom of the background ice texture not rendering correctly on high resolutions. Fixes #1595 2019-06-11 21:50:01 +03:00
Joonas Rikkonen 3cc9abed76 (fdab0615d) Recharge headset batteries between rounds in single player. Partial fix to #369. 2019-06-11 21:49:43 +03:00
Joonas Rikkonen ee1f10b482 (8637a4530) Enable the damage overlay code. Remove deprecated human damage overlays. The overlay on Tigertresher should now work. 2019-06-11 21:49:26 +03:00
Joonas Rikkonen cf7c0533fe (46cd6704b) Add some extra null checks trying to blind fix #1529. 2019-06-11 21:49:07 +03:00
Joonas Rikkonen 7de768085e (a89aca5c0) Fixed: Having a broken device on a sub and switching to Character Mode causing a crash 2019-06-11 21:48:48 +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 a841f75ea0 (6e52daaaa) Fixed workshop item "update" button overlapping with the other elements, made the workshop menu larger, fixed incorrect filename in one of the workshop tooltips 2019-06-11 21:45:22 +03:00
Joonas Rikkonen 7dfa6e89fe (ffa166343) Workshop fixes: - Refresh content package file in the staging folder when adding/removing files, not just when publishing. - Allow multiselecting files in the "add files" dialog. - Fixed autoupdating workshop files not working because Workshop.GetItem doesn't query the time the item was modified. - Some extra exception handling. 2019-06-11 21:45:01 +03:00
Joonas Rikkonen a4875cfeb3 (776291eb7) Create linked gaps when the door is selected. Move the gaps with the doors. 2019-06-11 21:44:32 +03:00
Joonas Rikkonen b8bca945bb (a75fe2e5e) Added: OSX hack for some Macs having a distorted Main Menu on launch 2019-06-11 21:44:08 +03:00
Joonas Rikkonen b294aee91e (75834911e) Fixed crash after opening OpenFileDialog more than once on Linux 2019-06-11 21:43:23 +03:00
Joonas Rikkonen 4a401c865d (4d56b6900) Fixed ability to drop items into secure lockers (or other containers that require specific items) without having access to it. Closes #1559 2019-06-11 21:43:02 +03:00
Joonas Rikkonen a145b04662 (9f1c10ee0) Update the ladder and gap reference if the waypoint is moved around in the editor. TODO: stairs. 2019-06-11 21:42:39 +03:00
Joonas Rikkonen 11c014bb46 (00d02cb8a) Change the waypoint debug info a bit. 2019-06-10 17:54:51 +03:00
Joonas Rikkonen 67086111a1 (a336a3189) Increased maximum file transfer size to 50 MB 2019-06-10 11:36:54 +03:00
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 f455467765 (bcf4eea95) Allow muting players mid-round through the info menu 2019-06-09 17:46:07 +03:00
Joonas Rikkonen 772b39bd7b (a0870be3a) Fixed all servers showing up as "Round has not started" in the server list 2019-06-09 17:45:32 +03:00
Joonas Rikkonen 3e68a63a9d (02937a371) Fixed server list height not being updated when filtering servers 2019-06-09 17:45:14 +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 b988e633dd (c6a02d462) Don't show the "received a position update for an item with no physics body" error messages in release builds if verbose logging is not enabled (only send them to GameAnalytics). 2019-06-09 17:41:38 +03:00
Joonas Rikkonen 0b4579a571 (b7fdbd373) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-06-09 17:41:03 +03:00
Joonas Rikkonen 8e65bd62b9 (7df498c13) Fixed: Doors being weldable in the tutorial with no access to crowbar or info on how to open shut doors, thus causing the player to get stuck 2019-06-09 17:40:45 +03:00
Joonas Rikkonen 39a9e1cc72 (482371a1e) Lowered default video volume to make the splash screens less eardrum-bursting 2019-06-09 17:40:25 +03:00
Joonas Rikkonen b1ee229170 (6c5225d9e) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-06-09 17:39:50 +03:00
Joonas Rikkonen 6dc3e64bf5 (fba51acd3) Fixed: Mechanic tutorial getting stuck if repairing the broken pump before the leaks are repaired 2019-06-09 17:39:32 +03:00
Joonas Rikkonen 45e05f7c4b (0fe4c8adb) Fixed server ignoring the max players value set in the "host server" menu 2019-06-09 17:39:14 +03:00
Joonas Rikkonen a70319bbd2 (97e5bb5d1) Don't show the "kick / vote to kick" buttons when inspecting the owner of the server, or display the "x voted to kick" message if someone tries to vote kick the owner. 2019-06-09 17:38:20 +03:00
Joonas Rikkonen 6c90d14462 (545598d02) Change the repair tooltip color from gray to cyan even when the character doesn't have required skills. 2019-06-09 17:37:43 +03:00
Joonas Rikkonen 9341ac772d (d616acca8) Empty contained item indicators (oxygen tank, battery, etc indicators) keep pulsating when they're empty 2019-06-09 17:37:25 +03:00