Commit Graph

202 Commits

Author SHA1 Message Date
Joonas Rikkonen 3877c18d0c (c15419d90) Changelog additions + merge fix 2019-04-08 19:20:05 +03:00
Joonas Rikkonen 4811ec796f (50447ac17) Inventory syncing fixes. Could be related to #768. - When moving an item from an inventory to another, create the event for the target inventory first, then for the inventory the item is being removed from. Otherwise clients would first drop the item, and then put it in the container with the next event, which works most of the time, but if the second event is delayed enough that the item is not within the character's reach by the time it arrives, the client will be unable to put it in the container and the item will just be dropped. - Fixed item velocities not being reset when they're dropped from a character's inventory. I'm not exactly sure why, but sometimes they had very high downwards velocities (even though the body was previously inactive), which caused them to launch through floors and made the previous inventory syncing issue much worse (because a delay of just a couple of frames was enough to move the item out of the character's reach). 2019-04-08 19:18:04 +03:00
Joonas Rikkonen 71d546ff7f (f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 19:17:50 +03:00
Joonas Rikkonen 5a9b681c13 (8c99939f6) Fix bots dropping from ladders if there is a non-ladder node in the path (Especially on Typhon). The distance check was incorrect, but after correcting it, I decided that it probably causes more issues than it solves. If there is one node in the path that is not in the current ladder, but the node after that is, we can just follow the path to the node that is on the ladders. Remove an unnecessary IgnorePlatforms assignment. It's handled in the HumanAIController. 2019-04-08 19:17:35 +03:00
Joonas Rikkonen eb6e919c66 (f832e24f5) Prevent bots jumping from too high. 2019-04-08 19:17:20 +03:00
Joonas Rikkonen 9a829206af (2c264b075) Improve readability (no functional changes). 2019-04-08 19:17:06 +03:00
Joonas Rikkonen 5876097da4 (4b07ea1ca) Removed unused method from HumanoidAnimController 2019-04-08 19:16:51 +03:00
Joonas Rikkonen 63971c90a9 (a9fbb0120) Disable controls when the pause menu or settings menu is open. Closes #1391 2019-04-08 19:16:37 +03:00
Joonas Rikkonen e19bf22112 (9c93ed664) Fixed fabricators and deconstructors deteriorating when they're powered (not just when fabricating/deconstructing) something 2019-04-08 19:16:23 +03:00
Joonas Rikkonen d482e6554d (276e03242) Reset Use and Select inputs when releasing the Shoot input to prevent accidentally selecting/using items 2019-04-08 19:16:09 +03:00
Joonas Rikkonen 5d5979c58b (a69e7b9c1) Moved delete button to the top of submarine list in submarine editor load window, to minimize accidental clicks 2019-04-08 19:15:54 +03:00
Joonas Rikkonen d8b194d249 (91c5faef2) Item deterioration fixes 2019-04-08 19:15:41 +03:00
Joonas Rikkonen 35ee8dc883 (e1516fabb) Don't allow selecting railgun shell or depthcharge ItemContainers (can only be accessed when the item is in the inventory). Fixes characters getting locked to looking towards the shell/charge they're holding. 2019-04-08 16:00:08 +03:00
Joonas Rikkonen 4902de606b (5d9bdaea4) Deterioration values (timer, deterioration rate, whether the timer is currently running, item condition) are visible in debugdraw, fixed items that should only deteriorate for X seconds after being used deteriorating continuously 2019-04-08 15:59:53 +03:00
Joonas Rikkonen 28f2c00255 (02bbfb6a3) Let the ai objectives handle waiting (after switching characters). Currently only idle objective uses wait timer, others ignore it. Reduce the wait time from 20 to 10 secs. 2019-04-08 15:59:36 +03:00
Joonas Rikkonen ae07c3174a (05de9c4) Added Linux launch scripts to the project 2019-04-07 21:49:05 +03:00
Joonas Rikkonen d16c470df6 (de584e63e) Improved MP campaign setup UI 2019-04-07 21:44:28 +03:00
Joonas Rikkonen d15a88c619 (3e8bdbb0a) v0.8.9.9 + merge fix 2019-04-06 17:54:39 +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 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 4359de7b7e (f6b392c84) Fixed TextureLoader.FromStream always premultiplying the alpha channel regardless of the value of the preMultiplyAlpha argument 2019-04-06 17:49:59 +03:00
Joonas Rikkonen 8cb5576955 (abdc60f9d) Resaved vanilla subs with higher-res preview images 2019-04-06 17:49:46 +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 ea463acc60 (e7176c489) Tweaks to the workshop screen 2019-04-06 17:49:05 +03:00
Joonas Rikkonen 3f42d889a2 (166d035d7) New powerOn sounds 2019-04-06 17:48:52 +03:00
Joonas Rikkonen 110a63b88b (5bd37e693) Removed PAX.sub 2019-04-06 17:48:38 +03:00
Joonas Rikkonen d1d0a083b4 (2986c8359) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:48:26 +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 8e56174d28 (6a236c1f3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:47:58 +03:00
Joonas Rikkonen ebb62d2fd2 (a432c283e) Fixed popping texture when fixing reactor 2019-04-06 17:47:45 +03:00
Joonas Rikkonen 4238676548 (80a1a0003) Made electrical engineers responsible for operating the reactor. 2019-04-06 17:47:32 +03:00
Joonas Rikkonen 8713b0ba8e (9a1210d72) Fixed not being able to zoom out fully with turrets 2019-04-06 17:47:20 +03:00
Joonas Rikkonen 7e49140920 (9a23cb0c4) New decoy sprite 2019-04-06 17:47:07 +03:00
Joonas Rikkonen 0725e1c4b2 (1d7e76d1f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:46:55 +03:00
Joonas Rikkonen f958f5fb44 (248ac43ed) Added inventory icons for Physicorium items armor, helmet, ammunition box and spear + normal and explosive spear (not yet implemented) 2019-04-06 17:46:42 +03:00
Joonas Rikkonen 6fed28e80b (b00ce5ec2) Fixed character's feet levitating when standing at the base of a staircase without climbing it. Closes #1275 2019-04-05 16:21:41 +03:00
Joonas Rikkonen 6199f68999 (3fde2a20d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:21:26 +03:00
Joonas Rikkonen a3ff707a31 (cf99ace8a) Fix bots entering the combat state if taking damage from falling etc. 2019-04-05 16:21:12 +03:00
Joonas Rikkonen 69c414dfc9 (34cca982f) Steering tweaks that should fix bots not being able to proceed on ladders when the next waypoint is not on the ladder but the one after that is. 2019-04-05 16:20:58 +03:00
Joonas Rikkonen 11a77e3694 (83dad7f87) Fixed crashing when attempting to use the turrets in character mode in the sub editor 2019-04-05 16:20:42 +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 501a114000 (4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:19:55 +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 592683afa8 (4cdc7cef2) Changed Pause Menu quit button to say "Main Menu" as you aren't closing the game when pressing it 2019-04-05 16:19:22 +03:00