Commit Graph

259 Commits

Author SHA1 Message Date
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 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 1d766ef349 (b6b2972ea) Fixed linked subs not getting docked correctly when loading a saved game. Closes #1381 2019-03-31 20:22:33 +03:00
Joonas Rikkonen fa2a338d73 (b8f75ee96) Fixed level inequality errors caused by 866621c. Accessing the level start/end location properties during level generation caused the seed of RandSync.Server to be changed. Now generating a new random location uses a new MTRandom instance and doesn't touch RandSync.Server. 2019-03-31 19:12:27 +03:00
Joonas Rikkonen 8668647049 (866621cd8) Display a warning on the status monitor when docked to an outpost ("Docked to X, undock before attempting to maneuver the submarine"). 2019-03-31 19:12:13 +03:00
Joonas Rikkonen d4d6a2ad30 (f16622a9d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:26:26 +02:00
Joonas Rikkonen a64096b5aa (24cde6cae) Add a static sight range. Considerably increase the hull sight ranges. 2019-03-29 17:25:58 +02:00
Joonas Rikkonen c1ac2bb5a9 (aa5cc0abe) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:25:14 +02:00
Joonas Rikkonen ce8501adf3 (b05f3e3d1) Fixed: Flood check logic 2019-03-29 17:25:00 +02:00
Joonas Rikkonen b375cd3be1 (db658d442) Keep oxygen percentage at the same level when resizing hulls in the sub editor (otherwise scaling up a hull will cause it to have less oxygen and vice versa) 2019-03-29 17:24:31 +02: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 296ec8bab8 (d95fc9893) Fixed crashing when dragging waypoints in the sub editor due to waypoints not being assigned a prefab 2019-03-29 17:23:47 +02:00
Joonas Rikkonen d974a5d72f (3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:21:37 +02:00
Joonas Rikkonen c0cf060526 (7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature). 2019-03-29 17:20:54 +02:00
Joonas Rikkonen c76fb32e15 (5bab406f1) Fixed "allowInsideFixture" raycasts not working correctly - checking if the ray is inside the AABB is not enough, we also need to take the shape and rotation of the fixture into account. 2019-03-28 18:12:23 +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 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 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 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
Joonas Rikkonen 8b5e18c348 (edf82e6ca) Modified: VideoPlayer video position, medical objective completion, saving segment when objective is completed 2019-03-27 20:50:50 +02:00
Joonas Rikkonen 91e87e8b74 (f9949667c) Modified: Default video resolutio multiplied by 1.5, default text width for video set to 450 2019-03-27 20:50:35 +02:00
Joonas Rikkonen ff20f7f374 (936119c69) Fixed: Aligning problems when an objective is removed, crashing when EnemyOnSonar is triggered, dead monsters still counting for EnemyOnSonar, ReactorCommand objective to complete when the order is given. 2019-03-27 20:50:21 +02:00
Joonas Rikkonen 3b8aeb27c5 (aefc763e9) Changed tutorial navconsole text and fixed tag 2019-03-27 20:50:07 +02:00
Joonas Rikkonen 69852a141e (6840c9114) Set the objective frame to be drawn behind other gui elements. TODO: test and complain if doesn't work ;) 2019-03-27 20:49:53 +02:00
Joonas Rikkonen 5c324a6de9 (4ad359147) Fix an index out of array exception when trying to set the update order (draw order) while the updateList contains no elements. 2019-03-27 20:49:38 +02:00
Joonas Rikkonen 632dce88c0 (cba4939e3) Formatting 2019-03-27 20:49:24 +02:00
Joonas Rikkonen 2cdc7ce5f3 (57c934c4b) Added: Padding for video text, missing xml elements for titles, instructions. 2019-03-27 20:49:10 +02:00
Joonas Rikkonen 179b17e9aa (093cf0b49) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework 2019-03-27 20:48:56 +02:00
Joonas Rikkonen 68aa95a5df (351e4f8b8) Added: hiding of objectives via button 2019-03-27 20:48:42 +02:00
Joonas Rikkonen a90ce22107 (8be88da45) Included videos in project, added them to xml 2019-03-27 20:48:29 +02:00
Joonas Rikkonen 27efec90c9 (ef6d724ea) Fixed: Invalid pathname when triggering a video for the first time 2019-03-27 20:48:13 +02:00
Joonas Rikkonen 7140151882 (c9b5d70ff) Removed: Hardcoded video path 2019-03-27 20:47:58 +02:00
Joonas Rikkonen 12f963d2a5 (094e3b371) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework 2019-03-27 20:47:44 +02:00
Joonas Rikkonen 37f44b87fa (43425b834) Added: Video looping, replaying, pre-video text 2019-03-27 20:47:30 +02:00