Commit Graph

45 Commits

Author SHA1 Message Date
Joonas Rikkonen cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +03:00
Joonas Rikkonen 0a67590572 (21a808335) Added: 4k fixes 2019-05-16 05:58:32 +03:00
Joonas Rikkonen 68ced76e1b (cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai 2019-05-16 05:45:37 +03:00
Joonas Rikkonen f8090d470e (5670a7c58) Don't get stuck if cannot use the button. 2019-05-16 05:44:48 +03:00
Joonas Rikkonen 5ec107bf83 (0d96091e5) Adjusted layout spacing on Reactor to make the warning labels slightly more readable on Brazilian Portugese 2019-05-16 05:43:40 +03:00
Joonas Rikkonen de2246fe57 (e0d673b0d) Test: Don't calculate the distance to the buttons when seeking path. Instead, check the distance when checking the doors. Allows the bots to access the Remora ballast through the door where the button is a bit farther from the door than usually. 2019-05-16 05:42:51 +03:00
Joonas Rikkonen 828150e0ae (9d8f050b8) Added text wrapping to ItemInventory titles and changed pump GUI In/Out text to use a smaller font 2019-05-16 05:42:34 +03:00
Joonas Rikkonen 1d5de494cd (a185ec0cd) Don't report on broken items that have condition above the threshold. Optimize and fix. 2019-05-16 05:41:25 +03:00
Joonas Rikkonen 79d01822d2 (8015dd67d) Show a language selection prompt when launching the game for the first time (WIP) 2019-05-16 05:41:09 +03:00
Joonas Rikkonen ddd84a4f9e (c45394988) Refactor and fix button interaction and access checks in the indoors steering manager. 2019-05-16 05:40:00 +03:00
Joonas Rikkonen 704e0731c9 (a73e09604) Fixed inventory locking up when rewiring items with a Controller component (e.g. periscopes). Don't open the health interface by clicking on the healthbar when using a controller. 2019-05-16 05:39:42 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +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 e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +03:00
Joonas Rikkonen ade4ef48b6 (241123ab2) Some checks to prevent crashing if a limb has an invalid health index 2019-04-18 12:04:24 +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 578a36b29d (4d9a797c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:09:12 +03:00
Joonas Rikkonen f667455659 (ba5343957) Button for hiding personal inventory slots 2019-04-16 17:08:58 +03:00
Joonas Rikkonen c361edfb8b (6d8c1f21d) Whoops. 2019-04-16 17:08:44 +03:00
Joonas Rikkonen 53f9202909 (8f7813f79) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 13:43:50 +03:00
Joonas Rikkonen e839260a9d (a3d3d1671) Health interface layout tweaking, change "drop" to "use as treatment" when dragging an item to the health interface 2019-04-15 13:43:35 +03:00
Joonas Rikkonen fe235eb37a (2fc766fe5) Add support for wearable item variants. Not used yet. Not synced (not sure if it should). 2019-04-15 13:42:37 +03:00
Joonas Rikkonen 918fac9e5e (6c6831abf) Some new sounds, fixed damage sounds not being played if no damage modifiers are applied 2019-04-15 13:42:08 +03:00
Joonas Rikkonen 3e0d4f5122 (16b390a10) Remove an empty line. 2019-04-15 13:41:55 +03:00
Joonas Rikkonen d3481c1dd6 (eaf02c38d) If the character has no mentionable afflictions, automatically select the limb with highest dmg on it (if none selected) to be displayed in the health interface. 2019-04-15 12:10:33 +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 854c90c89a (e38a3fef5) Fixed characters not letting go of the character they're grabbing when the health interface is closed with Esc or by clicking outside the window. 2019-03-29 21:51:24 +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 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 080ac78ded (5c35a640e) Update tutorial-rework with dev 2019-03-27 20:52:47 +02:00
Joonas Rikkonen 3f82c9a2cb (f417b026f) Fetched: Changes for playing video tutorial from local branch 2019-03-27 20:45:14 +02:00
Joonas Rikkonen a8309b5766 69487a2...d38c50c
commit d38c50cc354476d5309645bc1487a4c03fe97d57
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Wed Mar 20 16:27:45 2019 +0200

    Fixed inability to throw anything in the multiplayer. The clients would create a network event about dropping the item during the throw, which prevented throwing it server-side (because the item isn't in the character's inventory anymore by the time it should be launched). Closes #1318

commit 25cc1ceefcf62e346281c24c41964053d102701c
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Wed Mar 20 16:21:33 2019 +0200

    Merge same afflictions into one icon in the preview above the health bar (instead of showing the same icon for each limb that has the affliction)
2019-03-20 16:28:15 +02:00
Joonas Rikkonen cb6dcd469e af8a4af...8a2a718
commit 8a2a718a0544d5c1707f10b75498e528a7912726
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 19 16:47:49 2019 +0200

    Only update affliction icons every 0.5 seconds (or when switching limb selection in the health interface). Otherwise afflictions can flicker rapidly when the player for example has status effects that cause an affliction's strength to fluctuate around the ShowIconThreshold. Also set the default ShowIconThreshold value to 0.05. Closes #1304
2019-03-19 16:50:15 +02:00
Joonas Rikkonen 044fd3344b 2f107db...5202af9 2019-03-18 21:42:26 +02:00
Joonas Rikkonen 6c0679c297 38f1ddb...178a853: v0.8.9.1, removed content folder 2019-03-18 20:39:27 +02:00