Commit Graph

62 Commits

Author SHA1 Message Date
Joonas Rikkonen 2ca299af10 (ab07307c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-10 13:27:49 +03:00
Joonas Rikkonen 593d99ec38 (df9b1966f) Added an option to disable directional voice chat. Closes #1414 2019-04-10 13:27:30 +03:00
Joonas Rikkonen f941a21ada (0bb76a38c) made doors repairable with wrench 2019-04-10 13:26:39 +03:00
Joonas Rikkonen f01dd9f4c6 (8fa3d4cb0) New deterioration values (may I never have to do this again), fixed autodoors (way less doors and hatches closing on player) 2019-04-10 13:26:04 +03:00
Joonas Rikkonen b86059e223 (2ca7e50c9) Rextured some backwalls for better readability, relit whole sub, new deterioration values (may I never have to do this again) 2019-04-10 13:25:45 +03:00
Joonas Rikkonen d6f2f0885d (6419950d6) Relit sub, new deterioration values (may I never have to do this ever again), retextured some walls for easier readability. 2019-04-10 13:25:28 +03:00
Joonas Rikkonen e19cf09b71 (d4ff992c6) Updated doors in Berilia_ManualDoorTest 2019-04-10 13:23:14 +03:00
Joonas Rikkonen 25453018fc (3f015888d) Implement manual doors that can be opened simply by clicking on them. Add a test sub (not added in the project -> have to manually place in the local bin folder to test it). 2019-04-10 13:21:25 +03:00
Joonas Rikkonen e124c593c7 (c9cd4d8f0) Fixed ducts in Berilia, added description 2019-04-08 15:59:05 +03:00
Joonas Rikkonen 153b08065b (12487d533) Added Berilia submarine, 95% complete 2019-04-08 12:06:38 +03:00
Joonas Rikkonen 935cd6bc65 (235745275) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 12:06:09 +03:00
Joonas Rikkonen f043ac26f4 (5754c8b91) Fixed incorrectly placed gap in Typhon's cargo room 2019-04-06 17:52:36 +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 8cb5576955 (abdc60f9d) Resaved vanilla subs with higher-res preview images 2019-04-06 17:49:46 +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 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 f3d1888c71 (fb4821343) Added descriptions for Dugong, Remora, Venture 2019-04-03 16:29:20 +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 e09740d31e (371088346) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-03-28 12:34:18 +02:00
Joonas Rikkonen ef7b0f0ccf (edc1704a5) Added: A checkmark and small delay before removal for completed objectives 2019-03-28 12:34:04 +02:00
Joonas Rikkonen aee0290202 (74f1d04ea) Added interact texts to all items (Interact [E], Pick Up [E], etc), reset messages in all subs. TODO: Saving the subs causes the messages to be converted from text tags ("ItemMsgPressSelect" etc) into the actual texts, preventing the messages from being translated. We could probably just make the property non-editable and use the prefab values, or at least prevent the values from changing in sub files. 2019-03-28 12:33:49 +02:00
Joonas Rikkonen 4cb3469c4f (8f9250974) Fix spritesheet orientation offestting the joint widgets in the wrong direction, which made it a bit difficult to use. 2019-03-27 20:54:00 +02:00
Joonas Rikkonen 080ac78ded (5c35a640e) Update tutorial-rework with dev 2019-03-27 20:52:47 +02:00
Joonas Rikkonen 3f82c9a2cb (f417b026f) Fetched: Changes for playing video tutorial from local branch 2019-03-27 20:45:14 +02:00
Joonas Rikkonen b3a4efdd6f (c368a04c8) Added a longer version of Muikku, renamed to Selkie 2019-03-27 13:52:53 +02:00
Joonas Rikkonen c94064c5f6 (ef9221ae5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-26 14:10:47 +02:00
Joonas Rikkonen f4b85b32d0 (482b2c640) Fixes relay component logic: previously the load was clamped to zero when traversing out from the power_in connection of a relay to check how much power is coming in (devices connected to power_in don't increase the load), but now the same is also done for the incoming power when traversing out from power_out. Fixes #329, #805 and #1350 2019-03-26 14:07:37 +02:00
Joonas Rikkonen fe10fdeeeb (621dbfdd2) Humpback: Modified bilge to make it easier for ai to fix. Added ballast space to make use of extra space. Dugong: Added ballast space to make use of extra space. 2019-03-26 14:07:24 +02:00
Joonas Rikkonen 26594e2c6c (4b33eda28) Merge branch 'dev' into enemy-ai 2019-03-25 19:49:34 +02:00
Joonas Rikkonen 5ec6a7fba9 (325184804) Fix distance based attacks not registering if they hit a submarine. 2019-03-25 19:49:05 +02:00
Joonas Rikkonen c2e8263927 f9e8100...ccacceb
commit ccacceb16a184f00ecd384eede64ca9c4fab08a0
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 14:05:59 2019 +0200

    NetEntityEventManager checks the length of the event data (and logs an error if it's too long) before checking if there's still room to keep writing events in the packet. Checking the available room first could lead to situations where an excessively large event can't fit to any packet, "soft-locking" the EventManager without any error messages.

commit 5ac8259372aa900adc724aa4da1fd81af41ca195
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:41:52 2019 +0200

    Don't display disabled limbs on sonar (i.e. severed limbs that have "faded out")

commit 5f84df73ad86be96f3678c450351b3905e7317a4
Merge: b981f1635 dc429d6c4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:41:16 2019 +0200

    Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

commit b981f163575b2bfc9a83b9925c94eca19b9d4554
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:36:19 2019 +0200

    Multiplayer campaign fixes:
    - Server uses a different temp folder to decompress save/sub files into than the clients. Should fix files occasionally getting corrupted and exceptions when trying to read the files when hosting a server from the main executable.
    - Some additional debug logging.
    - Use the base names of the adjacent locations as level seeds (i.e. "Vorta" instead of "Vorta Outpost"). The levels should not change when the type (and full name) of the location changes.

commit 42c5d18df77fc7acd5873d8e25f20bdd31b1ed76
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:31:06 2019 +0200

    Don't transfer files through the network when sending them to the owner of the server (i.e. a client hosting directly from the main executable), but simply tell the client where the file is located.

commit dc429d6c450f4893fe29c51d3c830527e587a871
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date:   Mon Mar 25 13:30:26 2019 +0200

    Added labels next to periscopes in Humpback and Dugong

commit 789f02a87a2917dd2ae378f136cbe8dd3236c60d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:29:29 2019 +0200

    If loading a submarine fails, wait a bit and retry up to 4 times. Fixes loading occasionally failing when running multiple instances of the game from the same directory.

commit be9ea3a58832992b6226917117247e1bf1efeff9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 11:03:36 2019 +0200

    Fixed a bunch of disconnection messages being in an incorrect format & DisconnectUnauthClient not getting the messages from the xml

commit c6f744b4d6b3520720010f5cd4f22a25b42bfc8b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 10:43:10 2019 +0200

    Log entity event errors into server logs when verbose logging is enabled
2019-03-25 14:30:00 +02:00
Joonas Rikkonen 81fafaf3f5 633e54b...7cc231b
commit 7cc231bc51890e7fde50bbac3413328dd7bc5189
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Wed Mar 20 14:23:06 2019 +0200

    Fixed server creating network events in Item.Load due to CreateServerEvent calls in some of the ItemComponent properties (e.g. LightComponent.IsOn). Caused syncing problems because the entity spawn events aren't created until the item has been loaded, leading to situations where clients fail to read events because the entity doesn't exist at their end yet (see #1293). TODO: get rid of console errors when attempting to create events during component initialization in the Item constructor.

commit ac1bf32edf125d95d56775e1e8ce54ac7671328c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 20 13:49:55 2019 +0200

    Fix Hammerhead attack causing warping. Adjust the targeting priorities.

commit e3e032d7c3a753397269bb4236c1494ab0809004
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 20 13:48:47 2019 +0200

    Enemy AI fixes:
    - Fix enemies "fleeing" after they have been shot. There was a steering issue when they targeted characters that were inside the sub when they were outside of it
    - Fix the previous target resetting too often
    - Fix the wall target resetting too often
    - Use world positions instead of sim positions where possible, because the sub positions are then taken into account

commit 847cf5ffd9212a542000dbf12332b2c08756579a
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date:   Wed Mar 20 12:00:15 2019 +0200

    Remora: added power connection between sub and drone, removed non-scaling hull parts

commit a9c2e8cc124713e90dd44a9adf2fcbb3204b2c4d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Wed Mar 20 11:24:37 2019 +0200

    Server sets clients' last received campaign save/update IDs to one before the current up-to-date IDs (instead of zero) when a campaign changes. Zero would get interpreted as a more up-to-date ID if the IDs of the current campaign are close to ushort.MaxValue where the IDs wrap around.

commit 07d82b64e6990eacaf8905aed1a5d7c61224e47d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 19 18:24:01 2019 +0200

    Log level inequality error messages & client error reports handled by the server to GameAnalytics
2019-03-20 14:25:03 +02:00
Joonas Rikkonen 63eb4d64e5 f8b0295...0671290 2019-03-18 23:30:58 +02:00
Joonas Rikkonen 23687fbf2f aeafa16...4d3cf73 2019-03-18 22:57:05 +02:00
Joonas Rikkonen 3301bed442 409d4d9...aeafa16 (merge human-ai) 2019-03-18 22:52:17 +02:00
Joonas Rikkonen eac98b22fa bdbcef4...18b4bac
commit 18b4bacd5bb645f36f62e77587af971cb789d37c
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date:   Fri Mar 8 13:04:51 2019 +0200

    Added a beginner level sub

commit eef09f7d07cde64d1f2f6971eda733505339a0c0
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 19:05:14 2019 +0200

    Remove the old sprite when recreating the sprite.

commit a6c3ce00782882bc14f200f95abab0fa4d5d9a2d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 19:04:51 2019 +0200

    Fix gender specific wearables not refreshing when we change the gender.

commit f606b801dac9e4cbb4238506ff4d73981709a2f8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 18:42:14 2019 +0200

    Move some console commands from the shared project to the client. These should not be debug only, because they might be useful for modders too.

commit 154251c183eacf37e92fa7b27bb6d57bb15797d8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 14:42:22 2019 +0200

    Disable latchonto ai for now.
2019-03-18 22:31:34 +02:00
Joonas Rikkonen 97f31d0c94 5202af9...3ea33fb 2019-03-18 22:24:07 +02:00
Joonas Rikkonen 044fd3344b 2f107db...5202af9 2019-03-18 21:42:26 +02:00