Commit Graph

105 Commits

Author SHA1 Message Date
Joonas Rikkonen
fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen
fbb7daed00 (0c3442136) Merge branch 'dev' into docking-interface 2019-05-03 13:41:23 +03:00
Joonas Rikkonen
b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen
010411d434 (66fc3d1f9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:18:31 +03:00
Joonas Rikkonen
d425064a3b (28c455ff7) Improve the ai repair tool usage. 2019-04-26 11:18:14 +03:00
Joonas Rikkonen
8e15be3d42 (57e816cad) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:15:52 +03:00
Joonas Rikkonen
fa25735e9f (3851196d8) Show the campaign disclaimer when entering the New Game or Tutorials tab for the first time. 2019-04-26 11:15:37 +03:00
Joonas Rikkonen
ee1672408f (0bf65db0b) Removed: ContextualTutorial structure from tutorials.xml 2019-04-26 11:14:15 +03:00
Joonas Rikkonen
a7f56ced21 (3cc40bf1d) Added prefabs for new autodoors. Replaced doors in Dugong and Bunyip 2019-04-26 11:13:43 +03:00
Joonas Rikkonen
f3fbaedb42 (a0a15e2cb) Removed: ContextualTutorial related calls 2019-04-26 11:13:25 +03:00
Joonas Rikkonen
e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +03:00
Joonas Rikkonen
6262b3ea54 (ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:12:09 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
b705b1579c (c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 12:00:49 +03:00
Joonas Rikkonen
b4ec36f5bb (2fc72545e) new texts regarding missions and beacons. 2019-04-15 12:00:35 +03:00
Joonas Rikkonen
11a7bf3600 (6ed01ab09) Add a todo note. 2019-04-15 11:59:09 +03:00
Joonas Rikkonen
a7feb6f7e0 (a6a0c23a1) Close all message boxes when clicking the quit button in the pause menu. Fixes character wizard not closing if it's open when quitting to the main menu. 2019-04-15 11:58:38 +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
ddfd7274e9 (d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:24:17 +02:00
Joonas Rikkonen
ca08b803dc (891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions 2019-03-29 17:24:02 +02:00
Joonas Rikkonen
ce359f5309 (93669eac9) Fix cannot close pause menu by pressing esc. 2019-03-29 17:23:19 +02:00