Commit Graph

158 Commits

Author SHA1 Message Date
Joonas Rikkonen 61f5ccc71d (c93eaea48) Merge branch 'human-ai' into dev 2019-05-16 06:14:43 +03:00
Joonas Rikkonen 9c964b7843 (7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order. 2019-05-16 06:14:25 +03:00
Joonas Rikkonen 5f524ddd3f (457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor 2019-05-16 06:13:49 +03:00
Joonas Rikkonen 4b9fbe596c (8ba0db51b) Load connection displaynames from the prefab xml if not present in a sub or itemassembly xml, use display names in the connection panel interface 2019-05-16 06:04:24 +03:00
Joonas Rikkonen f259748910 (aebb26541) Added localizable connection names to all items (TODO: display in the connection panel interface, load from prefab if the value is not present in a sub or ItemAssembly file) 2019-05-16 06:03:51 +03:00
Joonas Rikkonen cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +03:00
Joonas Rikkonen 257889b9cc (42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool. 2019-05-16 05:58:15 +03:00
Joonas Rikkonen 412d46169e (1621785a9) Size variants of labels, also reverts 995d492 2019-05-16 05:57:39 +03:00
Joonas Rikkonen f8ca1444fd (7765c6989) Only show a bunch of pathfinder errors and warnings in debug builds. 2019-05-16 05:57:22 +03:00
Joonas Rikkonen 1ae482a84d (8c8a15639) Implemented new wall textures 2019-05-16 05:56:49 +03:00
Joonas Rikkonen fe5f386358 (61f67c194) Fix the raycast and angle checks. use the weapon position instead of the character position. 2019-05-16 05:56:16 +03:00
Joonas Rikkonen 2de6c7e47d (d752a1b58) Fixed lightsprite scale being wrong until the LightComponent is updated for the first time (caused fluorescent lights to look wrong in the sub editor) 2019-05-16 05:55:59 +03:00
Joonas Rikkonen 5b2bf67d66 (067f4d694) The recursive version of GetConnectedComponents can traverse between wifi components, use recursive GetConnectedComponents when finding the controller used to operate some item (-> AI characters can now figure out how to operate a turret that's connected to a periscope through wifi components, relays, etc) 2019-05-16 05:41:41 +03:00
Joonas Rikkonen 7614642d93 (e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai 2019-05-16 05:30:39 +03:00
Joonas Rikkonen 54a0164f89 (98501b696) Reduce the max accepted distance for repair tool ai operate. 2019-05-16 05:30:23 +03:00
Joonas Rikkonen 8621d9927e (a21f15055) Merge branch 'dev' into human-ai 2019-05-16 05:27:17 +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 c01eddbebb (e3ae570b4) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-03 13:52:49 +03:00
Joonas Rikkonen 7545e8efec (6fc1d03cd) Fixed humpback waypoints, removed extra door 2019-05-03 13:52:32 +03:00
Joonas Rikkonen 1218ebb719 (d1070d74c) Fixed CustomInterface labels displaying the text tag instead of the actual text when using translatable texts 2019-05-03 13:51:58 +03:00
Joonas Rikkonen c7a71d5627 (52c4b3002) Fixed CustomInterface labels & signals not being saved correctly 2019-05-03 13:50:32 +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 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 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 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 71128c27e6 (7764eef2d) CustomInterfaces can apply status effects when a button is pressed or depending on the state of a tickbox (OnUse when the tickbox is checked, OnSecondaryUse otherwise). 2019-04-08 23:11:56 +03:00
Joonas Rikkonen be96afc5dd (4ddf8b0b2) Fixed power not working correctly in some grids with chained relays and junction boxes. Closes #1385 2019-04-07 21:44:02 +03:00
Joonas Rikkonen be76bd53e9 (9a14162c6) Disabled spontaneous deterioration on items that are not being used. TODO: adjust all deterioration rates and delays 2019-04-07 21:43:35 +03:00
Joonas Rikkonen 6ac3ecd2b2 (86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:43:25 +03:00
Joonas Rikkonen 3b35ba056d (1a47431ff) Instead of displaying the red flash, automatically put the currently equipped item in the inventory (no matter if it's one or two handed) when picking up items that require two hands. If the item cannot be put into the inventory, the flash should be displayed (no auto dropping). 2019-04-04 11:12:32 +03:00
Joonas Rikkonen 709d9e44ab (541e3ffbe) Check that the mask is equipped in the head before trying to unequip. 2019-04-04 11:12:18 +03:00
Joonas Rikkonen 7126a60b7a (558e47075) -Reduced condition loss per use for plastiseal (-100 to -25), reduced the effect a bit (TODO: add more plastiseal to subs) -Reduced condition loss per use for antibiotic glue (-100 -> -50) -Implemented crafting recipes for antidotes -Made spacing more uniform in medical xml 2019-04-04 11:12:05 +03:00
Joonas Rikkonen 4e45876a6c (502e453a9) Instead of placing the weapon to a slot 3, find the allowed hand slots. 2019-04-04 11:11:51 +03:00
Joonas Rikkonen a7899b4b08 (869f6c46e) Restore text changes that were lost due to a merge: Display the binded key alongside the required tool. 2019-04-04 11:11:38 +03:00
Joonas Rikkonen 7c4f8fcb88 (153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag. 2019-04-04 11:11:24 +03:00
Joonas Rikkonen 87592720df (4c3f5c691) Changed default radio keybind to R and creature attack keybind to 3rd mouse button. Radio key is used much more frequently than the attack key, so it makes sense for it to be closer to WASD (+ R for radio is more intuitive). 2019-04-04 11:11:09 +03:00
Joonas Rikkonen 81239418f3 (218b21ab0) Set keybind textboxes to be equal height 2019-04-04 11:10:56 +03:00
Joonas Rikkonen 16c558a859 (7c1aa6679) Reset settings frame when controls are reset, added a button for resetting to default controls & tooltips for the control reset buttons, split keybind textboxes into two columns 2019-04-04 11:10:43 +03:00
Joonas Rikkonen cc122f2bbf (b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test 2019-04-04 11:10:29 +03:00
Joonas Rikkonen b08a31a68f (33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it. 2019-04-04 11:10:14 +03:00
Joonas Rikkonen 371bcb11c1 (7a980e4e6) Increased the range of docking port sounds and added a subtle camera shake when locking the ports to make it more noticeable when a sub docks. 2019-04-04 11:09:58 +03:00
Joonas Rikkonen 41da4e24a9 (cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:09:45 +03:00
Joonas Rikkonen 1966bcb4ab (c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes). 2019-04-04 11:09:32 +03:00
Joonas Rikkonen 66fa81bd3d (23a7169b0) Updated item assemblies to get the items in sync with the current prefabs (see #1363) 2019-04-04 11:09:17 +03:00
Joonas Rikkonen dce643e116 (a135020e9) Fixed item assembly names and descriptions not being fetched from the text xml 2019-04-04 11:09:03 +03:00
Joonas Rikkonen a3425a0432 (bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row 2019-04-04 11:08:49 +03:00