Commit Graph

215 Commits

Author SHA1 Message Date
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 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 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 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 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 7c4f8fcb88 (153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag. 2019-04-04 11:11:24 +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 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 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 5f05322fdb (fdc038d5d) Keymapping and UX test: - Map use to "E" and Select to "Left Mouse". - Introduce a dedicated key for deselecting ("Right Mouse"). - Introduce a dedicated key for shooting ("Left Mouse"). - Define certain objects as shootables, which simply means that they use the "Shoot" key instead of using the "Use" key. This required the least amount of refactoring the existing code. - TODO: don't register the "Select" input when aiming or when an interface is open -> should prevent interacting through UI elements. - TODO: sync the new input types with the server. 2019-04-04 11:06:12 +03:00
Joonas Rikkonen 4e525633bf (575357b4b) Made settings and quit buttons larger 2019-04-03 16:29:06 +03:00
Joonas Rikkonen 311a34da80 (733c6d509) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-03 16:27:56 +03:00
Joonas Rikkonen 095a51f620 (98fa23c8d) Changed alien harpoon and alien shell to physicorium harpoon and shell 2019-04-03 16:27:42 +03:00
Joonas Rikkonen 1a8d4d5562 (98c4c2bac) Added custom colors to sub editor and keybind inputs, some minor tweaks to sub editor layout 2019-04-03 16:27:27 +03:00
Joonas Rikkonen d6fb2b4861 (64bd73a57) Changed sub editor entity list height in order to get the second row of items fully visible, helps scrolling the list. 2019-04-03 16:25:59 +03:00
Joonas Rikkonen 8e47a0d1b0 (d44357df6) Improved Sub Editor screen 2019-04-03 16:25:45 +03:00
Joonas Rikkonen 1f94e174ef (50a891840) Lazy deformable LevelObject sprite loading 2019-04-03 16:25:31 +03:00
Joonas Rikkonen 4685121eee (3ffde5103) Disabled alpha premultiplication on a bunch of non-transparent textures (-> minor loading time reduction) 2019-04-03 16:24:48 +03:00
Joonas Rikkonen 0ecfc426ff (45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-03 16:22:12 +03:00
Joonas Rikkonen 0dd1823eb1 (44a496915) Added: Template for using a video with the Welcome text in the tutorial if needed. Removed: Old spritesheets. Fixed: Bug in fetching crew with certain jobs 2019-04-03 16:21:57 +03:00
Joonas Rikkonen e4eb6c131c (c225b9831) Fixed crashing if none of the selected content packages contain location portraits suitable for the main menu. 2019-04-03 16:20:52 +03:00
Joonas Rikkonen 4009a2f2b7 (5ef33c5cd) Revert "Set preview image size a bit larger to commodate larger resolutions and to get a clear image". Loading the preview image caused the game to hang. 2019-04-02 12:41:46 +03:00
Joonas Rikkonen 95fb792cd6 (06f76e063) Set preview image size a bit larger to commodate larger resolutions and to get a clear image 2019-04-02 12:40:22 +03:00
Joonas Rikkonen 1aad8b2038 (007519ad5) Higher-res submarine preview images 2019-04-02 12:40:08 +03:00
Joonas Rikkonen 34ee220bc9 (bb5ebaee3) Minor layout improvements to New Game and Game Settings 2019-04-02 12:39:42 +03:00
Joonas Rikkonen cae366e807 (4d924cc86) Fixes to New Game and Game Settings layouts
+ merge fix
2019-04-01 22:55:04 +03:00
Joonas Rikkonen 6332a6e077 (c896c51fb) Display submarine preview in the "new game" menu, layout tweaks 2019-04-01 22:52:31 +03:00
Joonas Rikkonen 26210da6a6 (7076afabd) Reimplemented the "new game" menu changes in b378675 using layout groups 2019-04-01 22:52:04 +03:00
Joonas Rikkonen a3eabfabac (2400ab447) Revert "Improved New Game panel" (easier to do the columns with layoutgroups than by setting the contents to half the width) 2019-04-01 22:51:50 +03:00
Joonas Rikkonen 508bd960be (b378675eb) Improved New Game panel 2019-04-01 22:51:21 +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 0ca4a8db06 (169dbd4fd) Increased submarine masses to make it less easy for characters to push them around. 2019-04-01 14:26:29 +03:00
Joonas Rikkonen 7e67c20ccd (b99c0ef39) Fix the enemies not selecting another attack if they cannot reach the target. 2019-04-01 14:26:01 +03:00
Joonas Rikkonen 7971d8d3a7 (f0911ad58) Scale settings menu according to screen resolution, repositioned main menu tabs so that they don't overlap with the menu buttons 2019-04-01 14:25:46 +03:00
Joonas Rikkonen 848b069ab2 (fc5127152) Fixed inability to select a submarine in the multiplayer campaign setup UI due to the PAX checks 2019-03-31 19:12:52 +03:00
Joonas Rikkonen fa2a338d73 (b8f75ee96) Fixed level inequality errors caused by 866621c. Accessing the level start/end location properties during level generation caused the seed of RandSync.Server to be changed. Now generating a new random location uses a new MTRandom instance and doesn't touch RandSync.Server. 2019-03-31 19:12:27 +03:00
Joonas Rikkonen 0b098efbf6 (92a838f87) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 21:50:58 +02:00