e3ca616fff
(869ac975f) Merge branch 'master' into dev
2019-06-12 16:43:56 +03:00
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
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
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
bea7b58ff3
(a410fd46c) Trying to help the merge script through a jungle of merges
2019-06-04 16:37:31 +03:00
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
edccfe223d
(9a7d83a40) Fullscreen bug workarounds
2019-06-04 16:00:38 +03:00
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
04f69dbe63
(b3c71807f) Updated to the latest version of GameAnalytics
2019-06-04 15:33:38 +03:00
a3e67dd40a
(7163b300e) Added: Way for capitalizing / lowercasing replaced variables depending on the position in the sentence & some implementations
2019-06-04 15:32:59 +03:00
c6f2125b4f
(85a4d4243) Fixed Steam servers never refreshing their info on the master server (game started, settings, etc), report the currently selected sub to Steam. Closes #1489
2019-05-23 15:18:13 +03:00
78b67de866
(e9f10995d) Merge branch 'bugreporterUI' into dev
2019-05-18 17:43:00 +03:00
3a2310e547
(3ac5065f5) Fixed: Rendering order for Bugreporter window, OK button position
2019-05-18 17:42:41 +03:00
f1d794cb39
(86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-05-18 17:35:10 +03:00
65a914e5ed
(0b29f1236) Added: Scaling to mouse cursor size
2019-05-18 17:34:53 +03:00
9155b404ea
(078e3646e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-05-18 17:31:02 +03:00
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
75640a321f
(f4acd46ef) Don't enable the "report leaks" button inside ruins
2019-05-18 17:29:24 +03:00
d84832296c
(cd17ab725) Cleanup.
2019-05-18 17:28:18 +03:00
c7ceed07c7
(7a7e715ad) Fixed report messages not going through to some clients when there are multiple clients on the server. Happened because the server would reuse the same OrderChatMessage instance for all clients, and it would get assigned the chat message ID according to the last recipient, which may not be the correct ID for other clients.
2019-05-18 17:28:01 +03:00
e367f900b8
(2a4bd39c2) Merge branch 'dev' into human-ai
2019-05-16 05:33:13 +03:00
3d7a113d75
(048b753e6) Merge branch 'dev' into human-ai
2019-05-16 05:20:29 +03:00
60f52375e6
(7788ec72a) Test issuing orders automatically.
2019-05-16 05:03:49 +03:00
cffaef3c3c
(4dba94638) Legacy save file support (= save files present in Data/Saves will still be usable)
2019-05-06 11:29:24 +03:00
fb21005258
(6f4bea467) Updated doors
2019-05-03 13:43:47 +03:00
b551ae7999
(c1468d39d) Overhauled docking interface (WIP)
2019-05-03 13:39:54 +03:00
9930a3081c
(e082ed22d) Fixed AllowRagdollButton settings not being synced with clients. Might be related to #1297
2019-04-29 21:11:24 +03:00
6262b3ea54
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-16 17:12:09 +03:00
bd07acf26d
(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0
2019-04-16 17:11:49 +03:00
f4275de1ac
(845cfe372) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-11 18:26:56 +03:00
a57b7184fb
(f6c34b377) Fix crawlers not reacting to any targets if properly latched on walls.
2019-04-11 18:26:42 +03:00
9b0e0ab278
(ec990ac7c) Save chatbox & crew menu toggle state between rounds
2019-04-11 18:26:26 +03:00
e7e858c05b
(db7e4d6d5) Fix "crawler balling" caused by crawlers taking damage when targeting the sub and not yet latched on it.
2019-04-11 18:25:58 +03:00
16cc5c8bc2
(7960f5b50) Fixed nullref exception when attempting to start a mission round with mission type set to None
2019-04-11 18:25:44 +03:00
c9cdbcc7ed
(aa49312e0) Fixed bots failing to do almost anything in multiplayer due to the submarine's team ID not matching theirs
2019-04-11 18:23:47 +03:00
2eaf22683d
(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)
2019-04-01 22:47:22 +03:00
ec7e23061b
(38b5d9aad) Experimental changes to syncing ragdolled (unconscious/dead) characters: - Higher error tolerance when syncing the positions. It's often hard to get the main limb exactly to the same position as the collider, because the positions of the limbs aren't synced and the pose of the ragdoll may differ between the server and clients. Increasing the tolerance makes it less likely for dead/unconscious characters to "twitch" when the game attempts to force the main limb to the position of the collider. - If the position of the ragdoll differs from the position of the collider so much that CheckDistFromCollider disables limb collisions, apply an additional force to all limbs to force the ragdoll to the correct position. Otherwise the ragdoll can occasionally start "hanging" midair, clipping through solid objects, because the main limb's pull joint doesn't necessarily have enough force to pull the entire ragdoll up to the collider.
2019-04-01 22:47:03 +03:00
9e1a4d8902
(718d22401) Don't attempt to send position updates for items that have no enabled physics body (e.g. attached items). Closes #1376
2019-03-31 19:13:24 +03:00
4cb3469c4f
(8f9250974) Fix spritesheet orientation offestting the joint widgets in the wrong direction, which made it a bit difficult to use.
2019-03-27 20:54:00 +02:00
080ac78ded
(5c35a640e) Update tutorial-rework with dev
2019-03-27 20:52:47 +02:00
3f82c9a2cb
(f417b026f) Fetched: Changes for playing video tutorial from local branch
2019-03-27 20:45:14 +02:00
237f164123
(afe15e7b2) Fixed server sending campaign saves and campaign character data to clients after the game mode has been switched to something else. Closes #1346
2019-03-26 17:12:45 +02:00
6c4649fe3f
(4b1fa5c86) Fixed client-side console errors during campaign setup because the client tried to load save files that only exist server-side. Now the server sends the information needed for the campaign setup window in the CAMPAIGN_SETUP_INFO message.
2019-03-26 17:10:20 +02:00
4b3e78b566
(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai
2019-03-26 14:07:11 +02:00
14832e2040
(aea5053bf) Fix wall target position not updated when the submarine moves. Fix latchontoai attach positions and distance checks. Detaching should also work both when the characters can get in and when the submarine velocity is enough to detach the characters. Still not synced, but re-enabled for testing.
2019-03-26 14:06:55 +02:00
ccd496b769
(99836db69) Fixed clients being unable to end campaign rounds at all if the sub isn't at the start/end outpost (regardless if they have the permission to end the round or not), added a verification prompt when trying to end the round when the sub isn't at either outpost.
2019-03-26 14:06:40 +02:00
006d53ccf1
(5a10ddbee) Server ends the round if the owner of the server reports an error.
2019-03-25 19:51:25 +02:00
26594e2c6c
(4b33eda28) Merge branch 'dev' into enemy-ai
2019-03-25 19:49:34 +02:00
5ec6a7fba9
(325184804) Fix distance based attacks not registering if they hit a submarine.
2019-03-25 19:49:05 +02:00
c2e8263927
f9e8100...ccacceb
...
commit ccacceb16a184f00ecd384eede64ca9c4fab08a0
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 14:05:59 2019 +0200
NetEntityEventManager checks the length of the event data (and logs an error if it's too long) before checking if there's still room to keep writing events in the packet. Checking the available room first could lead to situations where an excessively large event can't fit to any packet, "soft-locking" the EventManager without any error messages.
commit 5ac8259372aa900adc724aa4da1fd81af41ca195
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:41:52 2019 +0200
Don't display disabled limbs on sonar (i.e. severed limbs that have "faded out")
commit 5f84df73ad86be96f3678c450351b3905e7317a4
Merge: b981f1635 dc429d6c4
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:41:16 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
commit b981f163575b2bfc9a83b9925c94eca19b9d4554
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:36:19 2019 +0200
Multiplayer campaign fixes:
- Server uses a different temp folder to decompress save/sub files into than the clients. Should fix files occasionally getting corrupted and exceptions when trying to read the files when hosting a server from the main executable.
- Some additional debug logging.
- Use the base names of the adjacent locations as level seeds (i.e. "Vorta" instead of "Vorta Outpost"). The levels should not change when the type (and full name) of the location changes.
commit 42c5d18df77fc7acd5873d8e25f20bdd31b1ed76
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:31:06 2019 +0200
Don't transfer files through the network when sending them to the owner of the server (i.e. a client hosting directly from the main executable), but simply tell the client where the file is located.
commit dc429d6c450f4893fe29c51d3c830527e587a871
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com >
Date: Mon Mar 25 13:30:26 2019 +0200
Added labels next to periscopes in Humpback and Dugong
commit 789f02a87a2917dd2ae378f136cbe8dd3236c60d
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:29:29 2019 +0200
If loading a submarine fails, wait a bit and retry up to 4 times. Fixes loading occasionally failing when running multiple instances of the game from the same directory.
commit be9ea3a58832992b6226917117247e1bf1efeff9
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 11:03:36 2019 +0200
Fixed a bunch of disconnection messages being in an incorrect format & DisconnectUnauthClient not getting the messages from the xml
commit c6f744b4d6b3520720010f5cd4f22a25b42bfc8b
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 10:43:10 2019 +0200
Log entity event errors into server logs when verbose logging is enabled
2019-03-25 14:30:00 +02:00
Joonas Rikkonen