Commit Graph

4640 Commits

Author SHA1 Message Date
Joonas Rikkonen
5a1f55ade5 (9cf9078c7) Changelog additions 2019-04-05 16:16:26 +03:00
Joonas Rikkonen
2fbd1a1d92 (93746b96f) Workshop menu layout improvements 2019-04-05 16:16:09 +03:00
Joonas Rikkonen
2b1458a89f (6e2d03d7f) Changelog update 2019-04-05 16:15:54 +03:00
Joonas Rikkonen
19b451ff17 (5ddee76aa) Workshop UI improvements #2 2019-04-05 16:15:40 +03:00
Joonas Rikkonen
07c40f317f (52c7231e3) Reparse item messages when key bindings are changed 2019-04-05 16:15:27 +03:00
Joonas Rikkonen
94fe1ba331 (064609500) Fixed nearby items being selected when dragging/selecting/modifying wires in the sub editor. 2019-04-05 16:15:12 +03:00
Joonas Rikkonen
6c2c522f30 (250dbe18e) Don't prevent item UI panels from overlapping with the chatbox or crew list areas when in the sub editor 2019-04-05 16:14:57 +03:00
Joonas Rikkonen
f00b74926b (47f7024a5) Adjusted door/hatch shadow sizes to get them to match the sprite more closely 2019-04-05 16:14:43 +03:00
Joonas Rikkonen
7dae8639cc (2c4d0cf44) Fixed memorystream not being disposed when saving a submarine preview image 2019-04-05 16:14:26 +03:00
Joonas Rikkonen
1db710b92b (fdce94d18) Fixed steam workshop menu being way too tinty & moved text changes to the end of the text xml 2019-04-05 16:14:12 +03:00
Joonas Rikkonen
52e8d4acc8 (42760ea3b) First pass of workshop UI improvements 2019-04-05 16:13:57 +03:00
Joonas Rikkonen
9e62d2219a (335f60e63) Don't deselect items in the subeditor with "select" key. Use "deselect" instead. Fixes inventories and other interfaces closing when clicking trying to interact with the items inside them. 2019-04-05 16:13:41 +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
57e5a969ba (f95283b36) Submarine preview layout changes, don't display attributes that don't have a value, GUIMessageBox layout tweaking 2019-04-05 16:13:12 +03:00
Joonas Rikkonen
f91e28c248 (5643d05c2) Show wall count in the sub editor, color the item/structure/wall counts orange/red if there's a very high number of them 2019-04-05 16:12:57 +03:00
Joonas Rikkonen
c5136838d0 (e34759bb4) Fixed large engine emitting smoke before it can be repaired 2019-04-05 16:12:41 +03:00
Joonas Rikkonen
9f8e3143be (dc5ca92e4) Removed colliders and background sprites from the wall cap/tie structures. 2019-04-05 16:12:27 +03:00
Joonas Rikkonen
04ca38b01c (4d1b2ceab) Front structures (depth <= 0.5) are drawn in front of damageable walls. Makes it possible to create decorative structures that go in front of the walls without having to make them damageable. 2019-04-05 16:12:13 +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
b5b5177bc5 (090f1227e) Fixed crew list occasionally not scrolling with the arrow buttons 2019-04-05 16:11:00 +03:00
Joonas Rikkonen
95698f5eb5 (42c79b8de) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:10:45 +03:00
Joonas Rikkonen
458143c84a (e86a06f54) Halve Mudraptor texture resolution and fix the ragdoll accordingly. 2019-04-05 16:10:31 +03:00
Joonas Rikkonen
c68e353c55 (90fefeea4) Added missing vents to Dugong 2019-04-05 16:10: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
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
Joonas Rikkonen
7eb03ea6b3 (874c38a79) Show keybindings for use or shoot in the tooltips. 2019-04-04 11:08:33 +03:00
Joonas Rikkonen
d4752bb6a0 (9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time. 2019-04-04 11:08:18 +03:00
Joonas Rikkonen
7491b06a5d (bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults. 2019-04-04 11:08:02 +03:00
Joonas Rikkonen
79ea41e6c9 (4f4395b00) Reduced the size of the disallowed item interface area around the chatbox 2019-04-04 11:07:45 +03:00
Joonas Rikkonen
860e5204ab (cad2b1306) Fix the camera issue on turrets. 2019-04-04 11:07:29 +03:00