Commit Graph

421 Commits

Author SHA1 Message Date
Joonas Rikkonen 2aec2414be (12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:25:25 +03:00
Joonas Rikkonen 3eb883fbb3 (9253f5b70) Added libvlc.so to LinuxClient 2019-04-26 11:25:10 +03:00
Joonas Rikkonen d425064a3b (28c455ff7) Improve the ai repair tool usage. 2019-04-26 11:18:14 +03:00
Joonas Rikkonen 4f746b04ea (b8e5081e1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:14:20 +03:00
Joonas Rikkonen eb7ac2bfbe (8e98e6343) Add and implement new clown gear. 2019-04-25 18:13:47 +03:00
Joonas Rikkonen 07b937ca90 (ce70f0edf) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:13:28 +03:00
Joonas Rikkonen 03797df87b (224725392) fixed default state of a few emergency pumps. 2019-04-25 18:12:55 +03:00
Joonas Rikkonen df0f8c79ab (dbc56728c) Fixed item scale not being taken into account in light sprites 2019-04-25 18:12:19 +03:00
Joonas Rikkonen f31114ea01 (9f6737ced) Fixed: Old text tag in sonar.cs 2019-04-25 18:10:37 +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 99344e4031 (b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix 2019-04-25 17:52:14 +03:00
Joonas Rikkonen 52991e1ded (41a4cf029) Merge 2019-04-25 17:50:53 +03:00
Joonas Rikkonen 8be51d71bd (444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead 2019-04-25 17:50:35 +03:00
Joonas Rikkonen e4ac5434d7 (f1791560b) Switched back to old fonts (requested by art) 2019-04-25 17:50:17 +03:00
Joonas Rikkonen 457000c8dd (9e2b50b03) Removed unused duplicate texture 2019-04-25 17:49:59 +03:00
Joonas Rikkonen 3a83ac42c9 (dd2b3452f) Social center png added (was missing) 2019-04-25 17:49:41 +03:00
Joonas Rikkonen 47ef561a03 (ade7449ec) increase stun baton damage slightly, should take 6 or so hits to kill a crawler instead of 12. 2019-04-25 17:49:23 +03:00
Joonas Rikkonen a90cdb7843 (c5ad20e76) Graphics for outposts: Added new backwalls for outpost rooms (shop,maintenance bay and social center) aswell as some corridor pieces 2019-04-25 17:49:05 +03:00
Joonas Rikkonen 9df0141640 (ca0e4bd45) When attempting to deconstruct an item that can't be deconstructed, put it in the output inventory instead of leaving it in the input 2019-04-25 17:48:45 +03:00
Joonas Rikkonen ba6a4450eb (3f55858c9) Made the volume and range parameters of SoundPlayer.PlaySound optional: if they're omitted, the values defined in the sound xml are used. 2019-04-24 11:49:27 +03:00
Joonas Rikkonen b0580a9050 (7e43eae73) Optimized Item.ApplyStatusEffects & ItemComponent.PlaySound: check if the item has effects/sounds of the correct type from a bool array instead of doing a dictionary lookup. A small thing, but the methods are called so frequently that it adds up to a lot. 2019-04-18 12:05:11 +03:00
Joonas Rikkonen 1a3184dbad (4c452f172) Force reactor IsActive=true when an AI character or a remote player operates it. Previously this was only done in UpdateHUD, so inactive reactors would not become enabled. 2019-04-18 12:04:56 +03:00
Joonas Rikkonen c85cf63494 (99fb00391) Don't allow deconstructing items that don't give anything when deconstructed. Closes #690 2019-04-18 12:03:22 +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 edb8c39c58 (7dc4f5c23) Fix the doors: - Don't allow to pick, if the doors has no requirments. In this case the door should be opened by using the [select] key. - Display "UNAUTHORIZED ACCESS" when the door has integrated buttons but the requirements are not met. Display the cannot open the door text when the door doesn't have integrated buttons and the player is trying to open the door with the [select] key. 2019-04-16 17:11:23 +03:00
Joonas Rikkonen 30a3203051 (19307be45) Implement random wearable variants. Should be synced with the server by using the same random seed. Add a console command "loadwearable" as a development feature (could also be used by modders) to enforce a certain variant. Refresh wearable sprite paths when the items are reloaded. 2019-04-16 17:09:56 +03:00
Joonas Rikkonen b8b61ebb02 (a405d1aed) Check volume validity in SoundPlayer.UpdateWaterAmbience (there was a report on GameAnalytics about the method setting the gain to an invalid value) + Merge fix 2019-04-15 14:12:14 +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 8290c577d8 (1dd58d3ff) CustomInterface editor shows each label/signal as a separate textbox (w/ text picker option) 2019-04-15 12:10:05 +03:00
Joonas Rikkonen 373554ddfb (461eade89) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-04-15 12:09:36 +03:00
Joonas Rikkonen 8a42bb3bbd (add7a8fe6) Fixed: Error in localization when importing npc conversations. Added: proofread englishvanilla 2019-04-15 12:09:22 +03:00
Joonas Rikkonen 45be409a84 (84bcafc68) Added "text picker menu" to ItemMsgs, replace """ with a quotation mark in texts 2019-04-15 12:08:39 +03:00
Joonas Rikkonen 66de47f041 (a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml 2019-04-15 12:06:58 +03:00
Joonas Rikkonen 2f86991ce5 (fdf8cfbbe) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-11 18:27:41 +03:00
Joonas Rikkonen a3342ca96d (ffa3ddbca) Implemented changing mineral sprites when attached to a wall 2019-04-11 18:27:25 +03:00
Joonas Rikkonen 3eaec8bbc6 (c490f5118) Fixed bots not appearing to use repair tools or weapons client-side when repairing something or attacking (i.e. they aimed the item but never fired/used it) 2019-04-11 18:24:01 +03:00
Joonas Rikkonen a53c0fd9bb (8f575fa16) Fixed chatbox & crew menu being hidden if any character uses a controller 2019-04-11 18:23:31 +03:00
Joonas Rikkonen 90086375a4 (9837460b8) Display a progress bar when welding doors shut. 2019-04-11 18:23:03 +03:00
Joonas Rikkonen 9f55da3677 (8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item). 2019-04-10 15:13:25 +03:00
Joonas Rikkonen 488fded57f (208dc8793) Fixed ElectricalDischarger electricity effect staying visible if the item breaks or the component is deactivated from outside (e.g. via a StatusEffect or the parent component). Closes #1402 2019-04-10 15:13:08 +03:00
Joonas Rikkonen e94228d346 (b948206e8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-10 13:35:03 +03:00
Joonas Rikkonen 9a54b89bf3 (0eb0c36ec) Fixed door background sprites being drawn in front of characters (TODO: update sprite depths in the subs) 2019-04-10 13:30:25 +03:00
Joonas Rikkonen 06ac9a04ba (84bc4cdae) Display another message when trying to directly open a door that doesn't have buttons on it (wired to remote buttons/controllers). 2019-04-10 13:29:50 +03:00
Joonas Rikkonen 2ca299af10 (ab07307c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-10 13:27:49 +03:00
Joonas Rikkonen 593d99ec38 (df9b1966f) Added an option to disable directional voice chat. Closes #1414 2019-04-10 13:27:30 +03:00
Joonas Rikkonen 74da38bd10 (3315662d5) Implement optional required items (lol) and fix the doors. It's a bit confusing, but should work. 2019-04-10 13:26:56 +03:00
Joonas Rikkonen ca5e11e859 (476b2ba9b) Don't allow deattaching items when another component of the item is selected (e.g. wiring interface), interrupt picking if the item is removed or moved to an inventory 2019-04-10 13:24:53 +03:00