Commit Graph

290 Commits

Author SHA1 Message Date
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 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 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 af1970e8a4 (3e7222290) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:11:59 +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 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 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 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 1f94e174ef (50a891840) Lazy deformable LevelObject sprite loading 2019-04-03 16:25:31 +03:00
Joonas Rikkonen 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. 2019-04-03 16:25:02 +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 8de2eccff2 (7d0cf0d4f) Clamp forces in a bunch of more places where forces are applied to bodies 2019-04-03 16:21:38 +03:00
Joonas Rikkonen 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. 2019-04-03 16:21:22 +03:00
Joonas Rikkonen 7cb70fa344 (73193fb71) Updated a couple of sound effects 2019-04-01 22:47:36 +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 1d766ef349 (b6b2972ea) Fixed linked subs not getting docked correctly when loading a saved game. Closes #1381 2019-03-31 20:22:33 +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 8668647049 (866621cd8) Display a warning on the status monitor when docked to an outpost ("Docked to X, undock before attempting to maneuver the submarine"). 2019-03-31 19:12:13 +03:00
Joonas Rikkonen d4d6a2ad30 (f16622a9d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:26:26 +02:00
Joonas Rikkonen a64096b5aa (24cde6cae) Add a static sight range. Considerably increase the hull sight ranges. 2019-03-29 17:25:58 +02:00
Joonas Rikkonen c1ac2bb5a9 (aa5cc0abe) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:25:14 +02:00
Joonas Rikkonen ce8501adf3 (b05f3e3d1) Fixed: Flood check logic 2019-03-29 17:25:00 +02:00
Joonas Rikkonen b375cd3be1 (db658d442) Keep oxygen percentage at the same level when resizing hulls in the sub editor (otherwise scaling up a hull will cause it to have less oxygen and vice versa) 2019-03-29 17:24:31 +02:00
Joonas Rikkonen ddfd7274e9 (d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:24:17 +02:00
Joonas Rikkonen ca08b803dc (891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions 2019-03-29 17:24:02 +02:00
Joonas Rikkonen 296ec8bab8 (d95fc9893) Fixed crashing when dragging waypoints in the sub editor due to waypoints not being assigned a prefab 2019-03-29 17:23:47 +02:00
Joonas Rikkonen d974a5d72f (3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:21:37 +02:00
Joonas Rikkonen c0cf060526 (7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature). 2019-03-29 17:20:54 +02:00
Joonas Rikkonen c76fb32e15 (5bab406f1) Fixed "allowInsideFixture" raycasts not working correctly - checking if the ray is inside the AABB is not enough, we also need to take the shape and rotation of the fixture into account. 2019-03-28 18:12:23 +02:00
Joonas Rikkonen e6c3d6d537 (6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 21:00:33 +02:00