Commit Graph

76 Commits

Author SHA1 Message Date
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
Joonas Rikkonen e6c3d6d537 (6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 21:00:33 +02:00
Joonas Rikkonen 0ab2f2ac69 (29faa9c06) Reinstate charybdis monster events. 2019-03-27 20:57:50 +02:00
Joonas Rikkonen 98224c6ec9 (cc0f963d6) Fixed nullref exception when loading campaign character inventories in single player. 2019-03-27 20:57:36 +02:00
Joonas Rikkonen 776f71647d (3c77ed62a) Add attack, particles (copied from legacy), ai (copied from legacy), and sounds (legacy) to charybdis. Tweak the ragdoll and the animations a bit. 2019-03-27 20:57:23 +02:00
Joonas Rikkonen 8a22dbfebd (92723d062) Increase Hammerhead head attack dmg to characters. 2019-03-27 20:57:10 +02:00
Joonas Rikkonen 7a5f589639 (99336eacb) Modified: Reduced video's textframe alpha 2019-03-27 20:56:55 +02:00
Joonas Rikkonen 4215e97720 (724e27ce7) Made damaged junction boxes less sensitive to overvoltage. Nearly broken junction boxes were barely able to handle any overvoltage, leading to chain reaction where one junction box breaking causes the grid to be overloaded, and the rest of the boxes start taking damage at an increasing speed. Related to #1361 2019-03-27 20:56:42 +02:00
Joonas Rikkonen 7c8f19ee14 (875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 20:56:29 +02:00
Joonas Rikkonen 86d1102f56 (88961a6ea) Fix wrong spelling: Blatter -> Bladder. 2019-03-27 20:56:01 +02:00
Joonas Rikkonen 963657cd9c (f5d1ca382) Video title padding 2019-03-27 20:55:48 +02:00
Joonas Rikkonen 567fb99864 (c3950a782) Tweaks to video title size & placement, wording 2019-03-27 20:55:35 +02:00
Joonas Rikkonen 55cb2b84d7 (6934499e1) Removed: Duplicates from EnglishVanilla 2019-03-27 20:55:22 +02:00
Joonas Rikkonen 9c5b43bf72 (02c733ec8) Added: Notion of how to rewatch the tutorial instructions 2019-03-27 20:55:06 +02:00
Joonas Rikkonen 81833e7920 (65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 20:54:53 +02:00
Joonas Rikkonen 6ca760ceda (93f4e5d57) Allow repair tools to hit structures even if the barrel is inside the structure. Possibly closes #1306 2019-03-27 20:54:40 +02:00
Joonas Rikkonen ac60c9477e (d8c40ca6c) Merge branch 'dev' into tutorial-rework 2019-03-27 20:54:27 +02:00
Joonas Rikkonen 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
Joonas Rikkonen ad1a726e91 (8d8ed7727) Fixed: Invalid title font & color in tutorial infobo. Added: Some rudimentary scaling based on screen resolution for VideoPlayer 2019-03-27 20:53:46 +02:00
Joonas Rikkonen 8808edcd21 (025652eb8) Fixed: Holding an item preventing interaction with tutorial elements, medical overlay appearing on top of video / info, reactor command tutorial not completing when powered up by the player 2019-03-27 20:53:30 +02:00
Joonas Rikkonen ec481eba45 (e54f169fe) Better quality videos for tutorial, removed sound 2019-03-27 20:53:17 +02:00
Joonas Rikkonen 0c8772f6a1 (4589e2b8d) Minor changes to tutorial text 2019-03-27 20:53:00 +02:00
Joonas Rikkonen 080ac78ded (5c35a640e) Update tutorial-rework with dev 2019-03-27 20:52:47 +02:00
Joonas Rikkonen 47b16f4f9e (9f4948c63) Fixed: Welcome text size. Added: Using enter / escape to close both videoplayer and infobox to prevent errors when quitting while these are active 2019-03-27 20:52:30 +02:00
Joonas Rikkonen b66bdb6da4 (a7d754a40) Fixed: ContextualTutorial not resetting properly when quitting a single player campaign session and starting a new game after. Added: Forced on for contextual tutorial when the selected sub is 'PAX' 2019-03-27 20:52:16 +02:00
Joonas Rikkonen 018fcb0fa0 (65082ada7) Changed some tutorial text titles 2019-03-27 20:52:01 +02:00
Joonas Rikkonen c0192ad19b (fd98de428) Merge branch 'tutorial-rework' of github.com:Regalis11/Barotrauma-development into tutorial-rework 2019-03-27 20:51:47 +02:00
Joonas Rikkonen 5a620ec60d (771621c77) Added: Delays for medical & flooding tutorials, resetting of injuredmember when starting again 2019-03-27 20:51:33 +02:00
Joonas Rikkonen 723df67f6f (f68ad6ccc) Minor changes to tutorial texts 2019-03-27 20:51:17 +02:00
Joonas Rikkonen 0f405512b2 (69e52eea2) Fixed: Tutorial not resetting properly on retry 2019-03-27 20:51:03 +02:00