Commit Graph

1011 Commits

Author SHA1 Message Date
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 7ffcee3075 (df011a643) Fixed affliction source not being copied when creating a list of merged afflictions. Prevented affliction-based causes of death from getting the "killer" field assigned correctly, which prevented some afflictions from being unlocked. 2019-04-07 13:41:34 +03:00
Joonas Rikkonen bd174a8769 (c08b6301f) Fixed clients not converting achievement identifiers to lower case, making some achievements impossible to unlock in single player. 2019-04-07 13:41:21 +03:00
Joonas Rikkonen 1297127ae2 (0be4bd31d) Todo note about idling characters killing the framerate (see #1397) 2019-04-07 13:41:07 +03:00
Joonas Rikkonen db754188ce (bc739e38f) Added impact sounds to items (e.g. when dropped to the ground). Closes #841 2019-04-07 13:40:53 +03:00
Joonas Rikkonen d15a88c619 (3e8bdbb0a) v0.8.9.9 + merge fix 2019-04-06 17:54:39 +03:00
Joonas Rikkonen dc8b49b5b6 (e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512) 2019-04-06 17:52:23 +03:00
Joonas Rikkonen f80e9a29a7 (301f0a344) Option to set a custom preview image for subs 2019-04-06 17:50:53 +03:00
Joonas Rikkonen c19899769e (cb10b53db) Fixed GUIImage.RecalculateScale throwing an exception if the sprite is not set, use relative scales in GUINumberInput to make the child elements scale dynamically with the parent 2019-04-06 17:50:40 +03:00
Joonas Rikkonen 7b3ccde624 (46f58eedd) Set submarine preview image resolution back to 256x128. For some reason, higher resolutions seem to cause hangs for when loading the image. I suspected it was because of encoding the image as a Base64 string into the xml, but that doesn't seem to case: I tried saving the image as a separate file instead, and it still causes the same problem (see #19 in the private repo). 2019-04-06 17:50:27 +03:00
Joonas Rikkonen 8d8478432f (00783cc63) Don't premultiply submarine preview image alpha, fixed background texture not covering the whole preview image when using an image resolution larger than the size of the texture 2019-04-06 17:50:13 +03:00
Joonas Rikkonen 14d0daf16d (ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:49:31 +03:00
Joonas Rikkonen 45c1ed499a (e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used 2019-04-06 17:49:18 +03:00
Joonas Rikkonen c94f888c4d (5d73de170) Fixed RefreshSavedSub removing an extra sub from the list (causing an index out of range exception if refreshing a sub at the end of the list) 2019-04-06 17:48:13 +03:00
Joonas Rikkonen 0725e1c4b2 (1d7e76d1f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:46:55 +03:00
Joonas Rikkonen f958f5fb44 (248ac43ed) Added inventory icons for Physicorium items armor, helmet, ammunition box and spear + normal and explosive spear (not yet implemented) 2019-04-06 17:46:42 +03:00
Joonas Rikkonen 6fed28e80b (b00ce5ec2) Fixed character's feet levitating when standing at the base of a staircase without climbing it. Closes #1275 2019-04-05 16:21:41 +03:00
Joonas Rikkonen a3ff707a31 (cf99ace8a) Fix bots entering the combat state if taking damage from falling etc. 2019-04-05 16:21:12 +03:00
Joonas Rikkonen 69c414dfc9 (34cca982f) Steering tweaks that should fix bots not being able to proceed on ladders when the next waypoint is not on the ladder but the one after that is. 2019-04-05 16:20:58 +03:00
Joonas Rikkonen e086af2c6f (bebc37619) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:20:27 +03:00
Joonas Rikkonen 25768d8845 (4b54fb4bf) Refactor AIObjectiveCombat and the reactions to the damage. Fixes bots not reacting to any damage done with repair tools. Now they should flee (but not retaliate). 2019-04-05 16:20:11 +03:00
Joonas Rikkonen 501a114000 (4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:19:55 +03:00
Joonas Rikkonen d7364171fb (e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub 2019-04-05 16:19:40 +03:00
Joonas Rikkonen 161f725778 (2b36813ef) Added Back button to submarine editor 2019-04-05 16:19:07 +03:00
Joonas Rikkonen 8f42801c7a (2d473d38a) Add RequireAimToUse checks for being logical and for future. Shouldn't have any functional implications in the current version, but we could have RepairTools or Weapons that don't require aiming. 2019-04-05 16:18:52 +03:00
Joonas Rikkonen 350e6d6036 (5c39920a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:18:37 +03:00
Joonas Rikkonen aef3a96d60 (cb01ae2fe) Small adjustments to Sub Editor entity list 2019-04-05 16:18:23 +03:00
Joonas Rikkonen f6bf7d9219 (dc09b0993) Fix bots not aiming with the welding tool when trying to repair, because of a dump error when checking the RequireAimToUse property. 2019-04-05 16:18:08 +03:00
Joonas Rikkonen 07c40f317f (52c7231e3) Reparse item messages when key bindings are changed 2019-04-05 16:15:27 +03:00
Joonas Rikkonen 29e979d60a (7840e7e91) Fixed characters selecting entities when dragging and dropping items into them when the Select input is bind to Mouse1. 2019-04-05 16:13:27 +03:00
Joonas Rikkonen af1970e8a4 (3e7222290) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:11:59 +03:00
Joonas Rikkonen 7007804063 (1c5ab9230) Enemies don't attack outposts or targets inside it anymore. 2019-04-05 16:11:44 +03:00
Joonas Rikkonen e84203781e (e1b4346f3) Fix enemies not being able to get into the sub via vertical hatches. Removed the velocity manipulation, because it only caused issues. 2019-04-05 16:11:30 +03:00
Joonas Rikkonen 53443f5eee (d3b1aba39) Slightly reduced the amount of oxygen characters consume from hulls 2019-04-05 16:11:15 +03:00
Joonas Rikkonen 0589ecd9e2 (da4728791) Job preferences can be edited mid-round in the info menu. Closes #1237 2019-04-04 11:43:52 +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