Commit Graph

99 Commits

Author SHA1 Message Date
Joonas Rikkonen a4bb8efa79 (bfd04acda) Fixed compiler error on Mac (I think)? 2019-05-16 06:47:58 +03:00
Joonas Rikkonen 75b9ea6cce (cb3078117) Merged hulls to fix speech issue 2019-05-16 06:46:30 +03:00
Joonas Rikkonen 496ee1492c (1fe9abf75) Fix the GetAdjacentHulls method. 2019-05-16 06:45:36 +03:00
Joonas Rikkonen 49b0ee7c50 (de26bb46c) AutoScale CustomInterface texts to prevent overflows 2019-05-16 06:43:54 +03:00
Joonas Rikkonen 3153771cc7 (6f231d0fc) Add generic methods for getting linked map entities. TODO: memory-optimized overload for hulls. 2019-05-16 06:43:33 +03:00
Joonas Rikkonen 114fada396 (779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:42:08 +03:00
Joonas Rikkonen 42f287e254 (59629f0e1) Fixed: ContentPackage path not being valid on MacOS 2019-05-16 06:41:51 +03:00
Joonas Rikkonen f01747e822 (773ace2cd) Fixed RagdollParams/AnimationParams GetDefaultPath failing if there are multiple installed content packages that define characters with the same name. TODO: take custom ragdoll/anim paths into account when calculating content package hashes 2019-05-16 06:40:57 +03:00
Joonas Rikkonen 2b95c55070 (5f20d1b76) Remove custom steering logic for stairs, because most of the waypoints going over the stairs don't have stairs assigned to them. Bots shouldn't drop the diving suit if any of the nodes in the path has stairs. Doesn't work well, but it's a minor issue. Don't want to do raycasts here. 2019-05-16 06:40:39 +03:00
Joonas Rikkonen 5a4f50cfd2 (a6aea4ada) Fixed clients failing to spawn items when using a different language than the server 2019-05-16 06:39:31 +03:00
Joonas Rikkonen 1148498339 (78bfadc33) Another fix to legacy item loading (the aliases-attribute was case sensitive, and the case was not consistent in all of the legacy items) 2019-05-16 06:15:32 +03:00
Joonas Rikkonen 61f5ccc71d (c93eaea48) Merge branch 'human-ai' into dev 2019-05-16 06:14:43 +03:00
Joonas Rikkonen 9c964b7843 (7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order. 2019-05-16 06:14:25 +03:00
Joonas Rikkonen 5f524ddd3f (457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor 2019-05-16 06:13:49 +03:00
Joonas Rikkonen ce7b9c4f52 (94ad97066) Refactor combat objective. The bots should now be able to reload and seek more ammunition. When they run out of ammunition, they first try to use another weapon and only if no other weapon is found, they seek more ammunition. Had to change the contain item and get item objectives a bit. Hopefully doesn't break things too much. 2019-05-16 06:13:15 +03:00
Joonas Rikkonen 36ee088738 (3fbeb4c70) Option to make items use the name and description of another item 2019-05-16 06:05:16 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen 039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen 99344e4031 (b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix 2019-04-25 17:52:14 +03:00
Joonas Rikkonen d98c245183 (714944a46) - Item triggers can be used to define areas that cause the item to be highlighted, not just areas that the player has to be inside to interact with the item. - Triggers take item scale into account. - Added triggers around the integrated buttons in the new hatch/window variants (-> fixes hatches not being highlighted by putting the cursor on the button when there's a ladder next to the player). 2019-04-25 17:46:26 +03:00
Joonas Rikkonen c85cf63494 (99fb00391) Don't allow deconstructing items that don't give anything when deconstructed. Closes #690 2019-04-18 12:03:22 +03:00
Joonas Rikkonen e0fe737c3b (60001519f) Fixed clients not being able to see other characters in spectator if they've died far away from the sub. + Increased position update interval for spectators. Closes #1421
+ Merge fix
2019-04-16 17:16:14 +03:00
Joonas Rikkonen 707d9ed398 (9d7465a38) New alien item sounds 2019-04-16 17:12:27 +03:00
Joonas Rikkonen 6262b3ea54 (ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:12:09 +03:00
Joonas Rikkonen bd07acf26d (052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0 2019-04-16 17:11:49 +03:00
Joonas Rikkonen a9ad6d0504 (02db081a3) Fixed treatment suggestions not working correctly for some items because they were using incorrect affliction identifiers (there's no affliction with the identifier "damage"). Now the treatments can be defined using either the identifier or type of the affliction. 2019-04-15 12:05:34 +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 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 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 cae366e807 (4d924cc86) Fixes to New Game and Game Settings layouts
+ merge fix
2019-04-01 22:55:04 +03:00
Joonas Rikkonen 22372dfffe (061c63299) Wall collider tuning 2019-04-01 22:53:41 +03:00
Joonas Rikkonen 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. 2019-04-01 22:53:27 +03:00
Joonas Rikkonen 98e0504e1f (52748e937) Fixed nullref exception if a character eats another one when a gamesession has not been started 2019-04-01 22:53:12 +03:00
Joonas Rikkonen ae3dea40b0 (3c1d889c9) Fixed voice activity controls going outside the settings frame 2019-04-01 22:52:58 +03:00
Joonas Rikkonen ee18a1b508 (66b8e2955) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:52:44 +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 ca9a516403 (8ea276c68) Fixed game settings panel input consistency 2019-04-01 22:52:17 +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 8b12f85f48 (b6f451292) Moved crafting recipes from the fabricator xml to the xmls of the items. Makes it possible for modders to add new craftable items without having to modify the fabricators. Closes #1001 2019-04-01 22:51:37 +03:00
Joonas Rikkonen 508bd960be (b378675eb) Improved New Game panel 2019-04-01 22:51:21 +03:00
Joonas Rikkonen a46c195532 (2a183f60c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:51:07 +03:00
Joonas Rikkonen 8cb4702a5a (cda6af1ad) Increase the steering speed when going to eat. TODO: Adjusting the weight shouldn't have any effect on character speed. The steering vector should be normal until multiplied by the movement speed in the Update function. 2019-04-01 22:50:53 +03:00
Joonas Rikkonen 5d6cbb5898 (b522c4551) Don't assign the attackinglimb if we shouldn't be attacking. Fixes Hammerhead not falling back after hitting the sub. 2019-04-01 22:50:39 +03:00
Joonas Rikkonen e9a3577316 (b2df6e88c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-01 22:50:25 +03:00
Joonas Rikkonen d511ecd4e3 (5218c43a0) Server sends the IDs of both selected characters and selected items to the clients. Previously this wasn't needed, because it wasn't possible to have both a character and an item selected at the same time. Fixes characters floating mid-air client-side when dragging others up stairs, and probably some other undiscovered bugs as well. 2019-04-01 22:50:11 +03:00
Joonas Rikkonen ae6b797d73 (c2e1b24e2) Fixed remote characters sliding slowly to the left in multiplayer. Happened because linear velocity was written with an accuracy of 12 bits, causing the lowest possible value to be about 1.5 cm/s. Now extremely low velocity values are rounded down to zero. The server also now quantizes the LinearVelocity/AngularVelocity values, which should make position syncing a little more reliable because the server runs the physics using the same rounded values as the clients. 2019-04-01 22:49:58 +03:00