Commit Graph

222 Commits

Author SHA1 Message Date
Joonas Rikkonen 8d3d103e17 (a2b4f82e7) Fixed Job.Save not saving the identifier of the job, preventing jobs from being loaded correctly if the language is changed after saving. 2019-04-29 21:13:03 +03:00
Joonas Rikkonen 8737a0e0dd (26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit. 2019-04-29 21:12:47 +03:00
Joonas Rikkonen e21b4e5efc (529c58f9a) Added a couple of missing texts to EnglishVanilla. Because it may take a while until these can be added, a hard-coded text is used if these lines can't be found. 2019-04-29 21:12:31 +03:00
Joonas Rikkonen 2c1a5be93e (19c8c7b56) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:12:15 +03:00
Joonas Rikkonen 0b1b39d70a (caf7e6a2e) Replaced Concentus NuGet package with csproj (ensures correct System.Runtime references) 2019-04-29 21:11:59 +03:00
Joonas Rikkonen f10adc2612 (08ad40cc0) Fixed items "vanishing" if they move directly from sub to another without going outside first. 2019-04-29 21:11:42 +03:00
Joonas Rikkonen 9930a3081c (e082ed22d) Fixed AllowRagdollButton settings not being synced with clients. Might be related to #1297 2019-04-29 21:11:24 +03:00
Joonas Rikkonen dd24c604d1 (d653e2340) Fixed workshop items switching order in the workshop menu when the preview thumbnails are received. 2019-04-29 21:11:07 +03:00
Joonas Rikkonen 2ffb8d922d (acf0cb343) Fixes to EnableWorkShopItem: - Don't allow enabling if the item is not compatible with the user's version of Barotrauma or if it's a core package that's missing some required files. - Don't allow enabling if the item external files referenced in the content package are not found (e.g. if a mod uses vanilla files but the vanilla files aren't found). 2019-04-29 21:10:51 +03:00
Joonas Rikkonen 6c4bf4ea44 (d8eff8346) Fix a null reference exception. 2019-04-29 21:10:35 +03:00
Joonas Rikkonen d3ef770243 (9122340aa) Fixed inability to enable content packages if some of the files included in the package are already in the game folder (which may happen, for example, if enabling a content package fails) 2019-04-29 21:10:20 +03:00
Joonas Rikkonen 4d1c3b1ed4 (43a58c2c3) Fixed content package hash calculation failing if the package is not enabled and contains new monster files. Was caused by Character.GetConfigFile failing to find the config file because it only searched from currently selected content packages. 2019-04-29 21:10:05 +03:00
Joonas Rikkonen 67a0636470 (b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:09:50 +03:00
Joonas Rikkonen 2554e17189 (621326f05) Don't flee when taking damage if part of a swarm. 2019-04-29 21:08:32 +03:00
Joonas Rikkonen c5452048d7 (d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:08:16 +03:00
Joonas Rikkonen b3b1d1851d (eda627512) Fixed MonoKickStart files needed by the dedicated server not being copied to the output directory in release builds 2019-04-29 21:08:00 +03:00
Joonas Rikkonen 1f3c6349ab (961d41b31) Ragdoll syncing improvements: - Don't ignore platforms when correcting a ragdoll's position using Ragdoll.SetPosition. Otherwise forcing the character above a platform may cause it to drop down again if the feet don't end up above the platform. - Correct ragdoll position to server position immediately if the error is very large. - Force collider to stay upright after fixed rotation is enabled. 2019-04-29 21:07:44 +03:00
Joonas Rikkonen 788c51143b (55f425031) Tutorial outpost visual pass 2019-04-29 21:06:26 +03:00
Joonas Rikkonen 205f808f84 (5b377538a) Adjust crawler attacks a bit. 2019-04-29 21:05:53 +03:00
Joonas Rikkonen 45e0d2f663 (99e6eb7c7) Fixed "attempted to access a potentially removed ragdoll" in SoundPlayer.Update, set Character.Controlled to null if the character is removed to prevent this from happening elsewhere 2019-04-29 21:05:37 +03:00
Joonas Rikkonen 33747a63b0 (3340f2f90) Don't do impact damage to structures in Structure.OnWallCollision. Impact damage was disabled when a character hits the sub from the outside (implemented in SubmarineBody), but should've been done here as well. 2019-04-29 21:05:21 +03:00
Joonas Rikkonen 69c4b9a74f (8e2e25260) Spawn multiple monsters using the same spatial and temporal spreading logic as in events. 2019-04-29 21:05:06 +03:00
Joonas Rikkonen dfb664e10f (d7ca2a2a8) Lock inventory when using a controller 2019-04-29 21:04:36 +03:00
Joonas Rikkonen e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +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 f4f87b454d (8e4f5cb03) Add a disclaimer for switching from game to character editor. 2019-04-25 17:43:29 +03:00
Joonas Rikkonen 4e20fe871f (7f12d8742) More reliable firesource syncing: instead of just creating a network event when a firesource is created/removed and trusting that the fire behaves deterministically enough to stay in sync between the client and server, create events at 0.5 s intervals when there's fire in a hull. Closes #721 2019-04-25 17:43:13 +03:00
Joonas Rikkonen 907df8fa09 (bb8bbd4d3) Don't mute footstep sounds in the character editor 2019-04-25 17:42:55 +03:00
Joonas Rikkonen c983e5fb36 (4ffec29f1) More reliable monster footstep sounds: instead of relying on the feet to hit the floor with enough force to trigger an impact sound, play the sounds manually at appropriate times in the walking cycle 2019-04-24 11:50:24 +03:00
Joonas Rikkonen ba6a4450eb (3f55858c9) Made the volume and range parameters of SoundPlayer.PlaySound optional: if they're omitted, the values defined in the sound xml are used. 2019-04-24 11:49:27 +03:00
Joonas Rikkonen c77c30fda7 (7cc515e57) SpriteDeformation optimization: don't update deformations on disabled or SimplePhysics characters, don't check if resolution has changed in the SpriteDeformation.Resolution getter because it's called very frequently 2019-04-18 12:05:27 +03:00
Joonas Rikkonen ade4ef48b6 (241123ab2) Some checks to prevent crashing if a limb has an invalid health index 2019-04-18 12:04:24 +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 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 578a36b29d (4d9a797c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:09:12 +03:00
Joonas Rikkonen f667455659 (ba5343957) Button for hiding personal inventory slots 2019-04-16 17:08:58 +03:00
Joonas Rikkonen c361edfb8b (6d8c1f21d) Whoops. 2019-04-16 17:08:44 +03:00
Joonas Rikkonen b8b61ebb02 (a405d1aed) Check volume validity in SoundPlayer.UpdateWaterAmbience (there was a report on GameAnalytics about the method setting the gain to an invalid value) + Merge fix 2019-04-15 14:12:14 +03:00
Joonas Rikkonen 53f9202909 (8f7813f79) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 13:43:50 +03:00
Joonas Rikkonen e839260a9d (a3d3d1671) Health interface layout tweaking, change "drop" to "use as treatment" when dragging an item to the health interface 2019-04-15 13:43:35 +03:00
Joonas Rikkonen 8f310256b5 (2bbea6767) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 13:43:07 +03:00
Joonas Rikkonen fe235eb37a (2fc766fe5) Add support for wearable item variants. Not used yet. Not synced (not sure if it should). 2019-04-15 13:42:37 +03:00
Joonas Rikkonen 918fac9e5e (6c6831abf) Some new sounds, fixed damage sounds not being played if no damage modifiers are applied 2019-04-15 13:42:08 +03:00
Joonas Rikkonen 3e0d4f5122 (16b390a10) Remove an empty line. 2019-04-15 13:41:55 +03:00
Joonas Rikkonen d3481c1dd6 (eaf02c38d) If the character has no mentionable afflictions, automatically select the limb with highest dmg on it (if none selected) to be displayed in the health interface. 2019-04-15 12:10:33 +03:00
Joonas Rikkonen 3877c18d0c (c15419d90) Changelog additions + merge fix 2019-04-08 19:20:05 +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 9a829206af (2c264b075) Improve readability (no functional changes). 2019-04-08 19:17:06 +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