Commit Graph

2792 Commits

Author SHA1 Message Date
Joonas Rikkonen
5cf66d7343 (ecda2cb2a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-02 12:41:32 +03:00
Joonas Rikkonen
e86d86c41f (9bd8db487) Allow to aim in ladders when not moving. 2019-04-02 12:41:18 +03:00
Joonas Rikkonen
7d8b489319 (683847e26) Test: disable camera movement completely when an item interface is open (not just when the cursor is on the interface) 2019-04-02 12:41:04 +03:00
Joonas Rikkonen
6de0fa4b73 (c5f9e6070) Fixed lighting artifacts cause by the LOS changes 2019-04-02 12:40:50 +03:00
Joonas Rikkonen
b2c71e92c0 (f37be42bb) Fixed severed limbs occasionally noclipping into the submarine 2019-04-02 12:40:36 +03:00
Joonas Rikkonen
95fb792cd6 (06f76e063) Set preview image size a bit larger to commodate larger resolutions and to get a clear image 2019-04-02 12:40:22 +03:00
Joonas Rikkonen
1aad8b2038 (007519ad5) Higher-res submarine preview images 2019-04-02 12:40:08 +03:00
Joonas Rikkonen
28a8a5a2ed (99be2b970) Fixed submarine preview info text overlap 2019-04-02 12:39:55 +03:00
Joonas Rikkonen
34ee220bc9 (bb5ebaee3) Minor layout improvements to New Game and Game Settings 2019-04-02 12:39:42 +03:00
Joonas Rikkonen
cae366e807 (4d924cc86) Fixes to New Game and Game Settings layouts
+ merge fix
2019-04-01 22:55:04 +03:00
Joonas Rikkonen
22372dfffe (061c63299) Wall collider tuning 2019-04-01 22:53:41 +03:00
Joonas Rikkonen
43578f3bb2 (bb8a4525e) Progress on LOS effect improvements. Hiding the unnecessary shadows at spots where the ends of two walls meet works now, still got to do something about corner areas where a vertical wall meets a horizontal one. 2019-04-01 22:53:27 +03:00
Joonas Rikkonen
98e0504e1f (52748e937) Fixed nullref exception if a character eats another one when a gamesession has not been started 2019-04-01 22:53:12 +03:00
Joonas Rikkonen
ae3dea40b0 (3c1d889c9) Fixed voice activity controls going outside the settings frame 2019-04-01 22:52:58 +03:00
Joonas Rikkonen
ee18a1b508 (66b8e2955) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:52:44 +03:00
Joonas Rikkonen
6332a6e077 (c896c51fb) Display submarine preview in the "new game" menu, layout tweaks 2019-04-01 22:52:31 +03:00
Joonas Rikkonen
ca9a516403 (8ea276c68) Fixed game settings panel input consistency 2019-04-01 22:52:17 +03:00
Joonas Rikkonen
26210da6a6 (7076afabd) Reimplemented the "new game" menu changes in b378675 using layout groups 2019-04-01 22:52:04 +03:00
Joonas Rikkonen
a3eabfabac (2400ab447) Revert "Improved New Game panel" (easier to do the columns with layoutgroups than by setting the contents to half the width) 2019-04-01 22:51:50 +03:00
Joonas Rikkonen
8b12f85f48 (b6f451292) Moved crafting recipes from the fabricator xml to the xmls of the items. Makes it possible for modders to add new craftable items without having to modify the fabricators. Closes #1001 2019-04-01 22:51:37 +03:00
Joonas Rikkonen
508bd960be (b378675eb) Improved New Game panel 2019-04-01 22:51:21 +03:00
Joonas Rikkonen
a46c195532 (2a183f60c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:51:07 +03:00
Joonas Rikkonen
8cb4702a5a (cda6af1ad) Increase the steering speed when going to eat. TODO: Adjusting the weight shouldn't have any effect on character speed. The steering vector should be normal until multiplied by the movement speed in the Update function. 2019-04-01 22:50:53 +03:00
Joonas Rikkonen
5d6cbb5898 (b522c4551) Don't assign the attackinglimb if we shouldn't be attacking. Fixes Hammerhead not falling back after hitting the sub. 2019-04-01 22:50:39 +03:00
Joonas Rikkonen
e9a3577316 (b2df6e88c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:50:25 +03:00
Joonas Rikkonen
d511ecd4e3 (5218c43a0) Server sends the IDs of both selected characters and selected items to the clients. Previously this wasn't needed, because it wasn't possible to have both a character and an item selected at the same time. Fixes characters floating mid-air client-side when dragging others up stairs, and probably some other undiscovered bugs as well. 2019-04-01 22:50:11 +03:00
Joonas Rikkonen
ae6b797d73 (c2e1b24e2) Fixed remote characters sliding slowly to the left in multiplayer. Happened because linear velocity was written with an accuracy of 12 bits, causing the lowest possible value to be about 1.5 cm/s. Now extremely low velocity values are rounded down to zero. The server also now quantizes the LinearVelocity/AngularVelocity values, which should make position syncing a little more reliable because the server runs the physics using the same rounded values as the clients. 2019-04-01 22:49:58 +03:00
Joonas Rikkonen
c5725dbb62 (d47fee08d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:49:42 +03:00
Joonas Rikkonen
9fffb05625 (9db186429) Double the wall priorioties for crawlers and mudraptors, so that they remain effectively the same after the code changes. 2019-04-01 22:49:28 +03:00
Joonas Rikkonen
3062e4c705 (1a1137b26) Charybdis now also targets the walls. Tweak Charybdis' attacks and priorities. Fix targeting walls for non-aggressiveboarders. Don't double the wall priority. 2019-04-01 22:49:15 +03:00
Joonas Rikkonen
fc9a3893f6 (b9babfcf6) Merge branch 'ragdoll-syncing-improvements' into dev 2019-04-01 22:49:01 +03:00
Joonas Rikkonen
a0e1ba52eb (0bd92547e) Show ping direction when adjusting the direction slider even if directional ping is not enabled. Closes #1298 2019-04-01 22:48:47 +03:00
Joonas Rikkonen
885c30f70d (10a8ba8fc) Fix reversing getting reset when the target is not in range causing issues in steering. 2019-04-01 22:48:33 +03:00
Joonas Rikkonen
ed3d5fadeb (f46ddf83f) Fixed calyxanide not being usable in syringe guns 2019-04-01 22:48:20 +03:00
Joonas Rikkonen
cbb3216466 (633f44200) Emptying the "required items" field of an item in the sub editor now removes the item requirements (instead of using the default ones) 2019-04-01 22:48:03 +03:00
Joonas Rikkonen
4558d8b919 (f17acef79) Added the new electrical discharge sound to the project file 2019-04-01 22:47:50 +03:00
Joonas Rikkonen
7cb70fa344 (73193fb71) Updated a couple of sound effects 2019-04-01 22:47:36 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
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
Joonas Rikkonen
11f2bf4b38 (f152bbbe1) Servers includes skill identifiers in CharacterInfo data sent to clients. Sending only the levels and assuming the client has the same skills in the same order made it difficult for servers to modify the skills without client-side modifications. Closes #1335 2019-04-01 14:27:11 +03:00
Joonas Rikkonen
3219479774 (f202305e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 14:26:57 +03:00
Joonas Rikkonen
e154492a05 (a4e1c30c0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 14:26:43 +03:00
Joonas Rikkonen
0ca4a8db06 (169dbd4fd) Increased submarine masses to make it less easy for characters to push them around. 2019-04-01 14:26:29 +03:00
Joonas Rikkonen
7e67c20ccd (b99c0ef39) Fix the enemies not selecting another attack if they cannot reach the target. 2019-04-01 14:26:01 +03:00
Joonas Rikkonen
7971d8d3a7 (f0911ad58) Scale settings menu according to screen resolution, repositioned main menu tabs so that they don't overlap with the menu buttons 2019-04-01 14:25:46 +03:00
Joonas Rikkonen
5cc2806185 (3db48532f) Give joining players "None" permissions by default (so server hosts can automatically give players some permissions if they want to). Save client permissions using the name of the permission preset instead of listing all the permissions given by the preset. Partially implements #1334 2019-04-01 14:25:33 +03:00
Joonas Rikkonen
6ffb28b6fb (b9690c3b8) Improved settings screen layout 2019-04-01 14:25:18 +03:00
Joonas Rikkonen
0d0bf022b0 (20b8797d8) WIP los effect improvements to prevent weird-looking shadows at spots where two wall pieces meet 2019-04-01 14:25:04 +03:00
Joonas Rikkonen
54ad37081d (4ec4fe293) Fixed nullref exception when attempting to speak as a monster in single player. Closes #1374 2019-03-31 20:22:46 +03:00
Joonas Rikkonen
1d766ef349 (b6b2972ea) Fixed linked subs not getting docked correctly when loading a saved game. Closes #1381 2019-03-31 20:22:33 +03:00