Commit Graph

  • 9f8e3143be (dc5ca92e4) Removed colliders and background sprites from the wall cap/tie structures. Joonas Rikkonen 2019-04-05 16:12:27 +03:00
  • 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. Joonas Rikkonen 2019-04-05 16:12:13 +03:00
  • af1970e8a4 (3e7222290) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-05 16:11:59 +03:00
  • 7007804063 (1c5ab9230) Enemies don't attack outposts or targets inside it anymore. Joonas Rikkonen 2019-04-05 16:11:44 +03:00
  • e84203781e (e1b4346f3) Fix enemies not being able to get into the sub via vertical hatches. Removed the velocity manipulation, because it only caused issues. Joonas Rikkonen 2019-04-05 16:11:30 +03:00
  • 53443f5eee (d3b1aba39) Slightly reduced the amount of oxygen characters consume from hulls Joonas Rikkonen 2019-04-05 16:11:15 +03:00
  • b5b5177bc5 (090f1227e) Fixed crew list occasionally not scrolling with the arrow buttons Joonas Rikkonen 2019-04-05 16:11:00 +03:00
  • 95698f5eb5 (42c79b8de) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-05 16:10:45 +03:00
  • 458143c84a (e86a06f54) Halve Mudraptor texture resolution and fix the ragdoll accordingly. Joonas Rikkonen 2019-04-05 16:10:31 +03:00
  • c68e353c55 (90fefeea4) Added missing vents to Dugong Joonas Rikkonen 2019-04-05 16:10:15 +03:00
  • 0589ecd9e2 (da4728791) Job preferences can be edited mid-round in the info menu. Closes #1237 Joonas Rikkonen 2019-04-04 11:43:52 +03:00
  • 6ac3ecd2b2 (86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-04 11:12:46 +03:00
  • 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). Joonas Rikkonen 2019-04-04 11:12:32 +03:00
  • 709d9e44ab (541e3ffbe) Check that the mask is equipped in the head before trying to unequip. Joonas Rikkonen 2019-04-04 11:12:18 +03:00
  • 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 Joonas Rikkonen 2019-04-04 11:12:05 +03:00
  • 4e45876a6c (502e453a9) Instead of placing the weapon to a slot 3, find the allowed hand slots. Joonas Rikkonen 2019-04-04 11:11:51 +03:00
  • a7899b4b08 (869f6c46e) Restore text changes that were lost due to a merge: Display the binded key alongside the required tool. Joonas Rikkonen 2019-04-04 11:11:38 +03:00
  • 7c4f8fcb88 (153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag. Joonas Rikkonen 2019-04-04 11:11:24 +03:00
  • 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). Joonas Rikkonen 2019-04-04 11:11:09 +03:00
  • 81239418f3 (218b21ab0) Set keybind textboxes to be equal height Joonas Rikkonen 2019-04-04 11:10:56 +03:00
  • 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 Joonas Rikkonen 2019-04-04 11:10:43 +03:00
  • cc122f2bbf (b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test Joonas Rikkonen 2019-04-04 11:10:29 +03:00
  • 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. Joonas Rikkonen 2019-04-04 11:10:14 +03:00
  • 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. Joonas Rikkonen 2019-04-04 11:09:58 +03:00
  • 41da4e24a9 (cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-04 11:09:45 +03:00
  • 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). Joonas Rikkonen 2019-04-04 11:09:32 +03:00
  • 66fa81bd3d (23a7169b0) Updated item assemblies to get the items in sync with the current prefabs (see #1363) Joonas Rikkonen 2019-04-04 11:09:17 +03:00
  • dce643e116 (a135020e9) Fixed item assembly names and descriptions not being fetched from the text xml Joonas Rikkonen 2019-04-04 11:09:03 +03:00
  • a3425a0432 (bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row Joonas Rikkonen 2019-04-04 11:08:49 +03:00
  • 7eb03ea6b3 (874c38a79) Show keybindings for use or shoot in the tooltips. Joonas Rikkonen 2019-04-04 11:08:33 +03:00
  • 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. Joonas Rikkonen 2019-04-04 11:08:18 +03:00
  • 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. Joonas Rikkonen 2019-04-04 11:08:02 +03:00
  • 79ea41e6c9 (4f4395b00) Reduced the size of the disallowed item interface area around the chatbox Joonas Rikkonen 2019-04-04 11:07:45 +03:00
  • 860e5204ab (cad2b1306) Fix the camera issue on turrets. Joonas Rikkonen 2019-04-04 11:07:29 +03:00
  • 2d52a8ddf4 (883c460d5) Don't require holding the aim key when using the periscope/controller. Move the RequireAimToUse from Controller component to Item. Change the use and shoot logic accordingly. TODO: fix the camera centering. Joonas Rikkonen 2019-04-04 11:07:14 +03:00
  • c8a7815ef8 (6ae5f1e59) Sync the new input with the server. Joonas Rikkonen 2019-04-04 11:06:59 +03:00
  • 3f05035c18 (c4338b107) Disable aiming when interacting with an item other than ladders. Joonas Rikkonen 2019-04-04 11:06:44 +03:00
  • 0cd81c6a99 (cdc68f306) Don't select items when aiming. Joonas Rikkonen 2019-04-04 11:06:28 +03:00
  • 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. Joonas Rikkonen 2019-04-04 11:06:12 +03:00
  • 2290645bc9 (caa04a08a) Added a search bar to fabricators, made the interface larger and item previews smaller to fit more items in the view, take chatbox into account when preventing item interface overlap. Closes #1305 + merge fix Joonas Rikkonen 2019-04-03 16:29:47 +03:00
  • 0fb6896f1c (b56c60044) Updated: Submarine descriptions Joonas Rikkonen 2019-04-03 16:29:34 +03:00
  • f3d1888c71 (fb4821343) Added descriptions for Dugong, Remora, Venture Joonas Rikkonen 2019-04-03 16:29:20 +03:00
  • 4e525633bf (575357b4b) Made settings and quit buttons larger Joonas Rikkonen 2019-04-03 16:29:06 +03:00
  • ea23ff94d2 (cb16eb160) Removed: Unused instruction Joonas Rikkonen 2019-04-03 16:28:53 +03:00
  • b4e0294b2d (52b28ec91) Removed: Unused objective Joonas Rikkonen 2019-04-03 16:28:38 +03:00
  • b787157dc7 (ded94593e) Updated: EnglishVanilla with terms regarded as new additions due to translation not starting until now Joonas Rikkonen 2019-04-03 16:28:24 +03:00
  • 6b38ba8434 (7749cbf6a) Server sends the current facing direction of a character to clients instead of the TargetDirection. Fixes monsters flipping around constantly client-side. + Don't allow clients to make characters flip in EnemyAIController (controlled by the server) Joonas Rikkonen 2019-04-03 16:28:10 +03:00
  • 311a34da80 (733c6d509) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-03 16:27:56 +03:00
  • 095a51f620 (98fa23c8d) Changed alien harpoon and alien shell to physicorium harpoon and shell Joonas Rikkonen 2019-04-03 16:27:42 +03:00
  • 1a8d4d5562 (98c4c2bac) Added custom colors to sub editor and keybind inputs, some minor tweaks to sub editor layout Joonas Rikkonen 2019-04-03 16:27:27 +03:00
  • 814aadeab0 (917efcc26) Modified stun baton and diving knife prices, added line to remove exploding harpoon after it explodes (used to be able to pick up and fire again) Joonas Rikkonen 2019-04-03 16:27:13 +03:00
  • a0724d3ab0 (33ddb995d) Added more spacing to keybind inputs in Controls settings tab, commodates smaller resolutions Joonas Rikkonen 2019-04-03 16:26:59 +03:00
  • 5fb983f48f (4082dd031) Implemented some more Steam achievements Joonas Rikkonen 2019-04-03 16:26:44 +03:00
  • df155079cc (2a51e42a4) Set PositionUpdateInterval to zero when an item is dropped to make sure clients receive some position updates and become aware of the new position of the item Joonas Rikkonen 2019-04-03 16:26:28 +03:00
  • 4537c9a8cd (6269da936) Fixed audio settings layout Joonas Rikkonen 2019-04-03 16:26:14 +03:00
  • d6fb2b4861 (64bd73a57) Changed sub editor entity list height in order to get the second row of items fully visible, helps scrolling the list. Joonas Rikkonen 2019-04-03 16:25:59 +03:00
  • 8e47a0d1b0 (d44357df6) Improved Sub Editor screen Joonas Rikkonen 2019-04-03 16:25:45 +03:00
  • 1f94e174ef (50a891840) Lazy deformable LevelObject sprite loading Joonas Rikkonen 2019-04-03 16:25:31 +03:00
  • 8bf3927d98 (61331126a) Game Settings layout consistency pass Joonas Rikkonen 2019-04-03 16:25:16 +03:00
  • 92713cf587 (d041dfb1b) Implemented lazy sprite loading (= the texture isn't loaded until it's accessed for the first time). Atm only used in LevelObjectPrefabs and location portraits. Joonas Rikkonen 2019-04-03 16:25:02 +03:00
  • 4685121eee (3ffde5103) Disabled alpha premultiplication on a bunch of non-transparent textures (-> minor loading time reduction) Joonas Rikkonen 2019-04-03 16:24:48 +03:00
  • fd0e394827 (04facf9b6) Gray out the text in disabled buttons if the button has no visible sprite (the buttons in the main menu for example looked the same when disabled) Joonas Rikkonen 2019-04-03 16:24:34 +03:00
  • 64bec6d3b9 (684bcee1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-03 16:24:20 +03:00
  • 516159fe43 (d404aba3e) Added background color to keybind inputs in the Controls settings layout, to help readability Joonas Rikkonen 2019-04-03 16:24:06 +03:00
  • c9ad39da08 (b35e82550) Added a longer delay to getting killed by pressure (5 seconds in max pressure), made the pressure-zoom-in effect appear as soon as the pressure in a room starts to rise (not after it's half-way to lethal pressure), added blood particle effects when under high pressure Joonas Rikkonen 2019-04-03 16:23:51 +03:00
  • abad70f0c1 (7e32870a0) Check that item has a non-zero mass before applying water forces (couldn't reproduce it, but had a debug assertion fail due to the mass of an alien artifact being 0), validate clamped force before attempting to apply it Joonas Rikkonen 2019-04-03 16:23:37 +03:00
  • 98cf26178f (3b3130a00) Added an option to disable mouselook, let camera zoom further when controlling a large monster Joonas Rikkonen 2019-04-03 16:23:23 +03:00
  • d66a49bb7c (929d3d0fd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-03 16:23:08 +03:00
  • 212b7074a8 (8bcb4dfd5) Refined cable holders, added variants for 1-3 cables (background still missing) Joonas Rikkonen 2019-04-03 16:22:54 +03:00
  • c751c58495 (c793f55af) Clamp velocities when pushing characters out of doorways, play only one damage sound when hit by a door (not once per each limb that's in the doorway), refactored the logic so to prevent creating new lists Joonas Rikkonen 2019-04-03 16:22:41 +03:00
  • f676e8c67e (914a15437) Fixed: Checking for jobs using name instead of the prefab identifier Joonas Rikkonen 2019-04-03 16:22:26 +03:00
  • 0ecfc426ff (45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-03 16:22:12 +03:00
  • 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 Joonas Rikkonen 2019-04-03 16:21:57 +03:00
  • 8de2eccff2 (7d0cf0d4f) Clamp forces in a bunch of more places where forces are applied to bodies Joonas Rikkonen 2019-04-03 16:21:38 +03:00
  • 0844f1eae4 (8e2e6e4da) Physics error prevention: - Use the ApplyForce/ApplyImpulse method overrides that clamp the resulting velocity to a value (in this case NetConfig.MaxPhysicsBodyVelocity, 64 m/s). Without this, explosions and attacks for example could apply arbitrarily large forces to bodies, causing physics errors in Ragdoll.CheckValidity. - Make sure angular velocity still has a sane value after applying an impulse to a specific point of a collider. Joonas Rikkonen 2019-04-03 16:21:22 +03:00
  • 5d7dba0f70 (cef39af84) Fixed server creating "attempted to create a network event for an item that hasn't been fully initialized yet" console errors when spawning LightComponents mid-round. + Simplified ragdoll collider null check Joonas Rikkonen 2019-04-03 16:21:06 +03:00
  • e4eb6c131c (c225b9831) Fixed crashing if none of the selected content packages contain location portraits suitable for the main menu. Joonas Rikkonen 2019-04-03 16:20:52 +03:00
  • 03f2444968 (7341d33ff) Fixed nullref exception if a fabricator finishes creating an item after the user has been removed. Joonas Rikkonen 2019-04-03 16:20:37 +03:00
  • b75db42253 (010c23458) Added a notification that tells the player where cargo spawns Joonas Rikkonen 2019-04-03 16:20:22 +03:00
  • 3eb11d9c5d (7c7004099) Fixed syringes being launched backwards from the syringe gun when firing to the right. Joonas Rikkonen 2019-04-02 12:42:14 +03:00
  • baadd60d8d (cd4cc584f) Fixed projectiles not applying status effects on impact if they have no attack defined. Closes #1382 Joonas Rikkonen 2019-04-02 12:42:00 +03:00
  • 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. Joonas Rikkonen 2019-04-02 12:41:46 +03:00
  • 5cf66d7343 (ecda2cb2a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-02 12:41:32 +03:00
  • e86d86c41f (9bd8db487) Allow to aim in ladders when not moving. Joonas Rikkonen 2019-04-02 12:41:18 +03:00
  • 7d8b489319 (683847e26) Test: disable camera movement completely when an item interface is open (not just when the cursor is on the interface) Joonas Rikkonen 2019-04-02 12:41:04 +03:00
  • 6de0fa4b73 (c5f9e6070) Fixed lighting artifacts cause by the LOS changes Joonas Rikkonen 2019-04-02 12:40:50 +03:00
  • b2c71e92c0 (f37be42bb) Fixed severed limbs occasionally noclipping into the submarine Joonas Rikkonen 2019-04-02 12:40:36 +03:00
  • 95fb792cd6 (06f76e063) Set preview image size a bit larger to commodate larger resolutions and to get a clear image Joonas Rikkonen 2019-04-02 12:40:22 +03:00
  • 1aad8b2038 (007519ad5) Higher-res submarine preview images Joonas Rikkonen 2019-04-02 12:40:08 +03:00
  • 28a8a5a2ed (99be2b970) Fixed submarine preview info text overlap Joonas Rikkonen 2019-04-02 12:39:55 +03:00
  • 34ee220bc9 (bb5ebaee3) Minor layout improvements to New Game and Game Settings Joonas Rikkonen 2019-04-02 12:39:42 +03:00
  • cae366e807 (4d924cc86) Fixes to New Game and Game Settings layouts Joonas Rikkonen 2019-04-01 22:53:55 +03:00
  • 22372dfffe (061c63299) Wall collider tuning Joonas Rikkonen 2019-04-01 22:53:41 +03:00
  • 43578f3bb2 (bb8a4525e) Progress on LOS effect improvements. Hiding the unnecessary shadows at spots where the ends of two walls meet works now, still got to do something about corner areas where a vertical wall meets a horizontal one. Joonas Rikkonen 2019-04-01 22:53:27 +03:00
  • 98e0504e1f (52748e937) Fixed nullref exception if a character eats another one when a gamesession has not been started Joonas Rikkonen 2019-04-01 22:53:12 +03:00
  • ae3dea40b0 (3c1d889c9) Fixed voice activity controls going outside the settings frame Joonas Rikkonen 2019-04-01 22:52:58 +03:00
  • ee18a1b508 (66b8e2955) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-04-01 22:52:44 +03:00
  • 6332a6e077 (c896c51fb) Display submarine preview in the "new game" menu, layout tweaks Joonas Rikkonen 2019-04-01 22:52:31 +03:00
  • ca9a516403 (8ea276c68) Fixed game settings panel input consistency Joonas Rikkonen 2019-04-01 22:52:17 +03:00
  • 26210da6a6 (7076afabd) Reimplemented the "new game" menu changes in b378675 using layout groups Joonas Rikkonen 2019-04-01 22:52:04 +03:00