Commit Graph

1008 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 42e541f3fa (5ee41d152) Fixed damaged item sprites not updating client-side after being repaired. 2019-04-29 21:04:51 +03:00
Joonas Rikkonen dfb664e10f (d7ca2a2a8) Lock inventory when using a controller 2019-04-29 21:04:36 +03:00
Joonas Rikkonen 46f5bd5b15 (99a5e8cf8) Fix bots not using the ladders when swimming on the water surface. + merge fix 2019-04-26 11:29:14 +03:00
Joonas Rikkonen 2aec2414be (12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:25:25 +03:00
Joonas Rikkonen 3eb883fbb3 (9253f5b70) Added libvlc.so to LinuxClient 2019-04-26 11:25:10 +03:00
Joonas Rikkonen 71d7d024e6 (029f124e6) Fixed ScalableFont.MeasureString giving incorrect results for texts with newlines 2019-04-26 11:20:00 +03:00
Joonas Rikkonen a3ba709e92 (befc20623) Fixed extremely small objective texts on lower resolutions, don't scale objective texts (not needed because we change font sizes according to the resolution now) 2019-04-26 11:19:46 +03:00
Joonas Rikkonen 79c31d1a83 (0185896f9) More fixes to messagebox & tutorial info box scaling 2019-04-26 11:19:32 +03:00
Joonas Rikkonen 010411d434 (66fc3d1f9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:18:31 +03:00
Joonas Rikkonen d425064a3b (28c455ff7) Improve the ai repair tool usage. 2019-04-26 11:18:14 +03:00
Joonas Rikkonen eb6c5ac1c5 (251e3f856) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:18:00 +03:00
Joonas Rikkonen efca3a49fc (ee33ee49f) reverted all doors back to original autodoors, reset prefabs for several doors to ensure correct repair messages, flipped stairs on humpback to ease AI steering issues. 2019-04-26 11:17:44 +03:00
Joonas Rikkonen cb9f33dc68 (4e4b8532a) Fixed buttons overlapping with the text in some GUIMessageBoxes on large resolutions (I think, needs to be tested on resolutions higher than 1080p). Using relative scale on the texts and the button container caused them to upscale when scaling the message box (for example when making room for the link buttons in the editor disclaimer). 2019-04-26 11:17:27 +03:00
Joonas Rikkonen 1ffb969522 (45158b939) Fixed item scale not being taken into account when drawing item assembly icons or when placing them 2019-04-26 11:17:11 +03:00
Joonas Rikkonen 0dba9947f3 (1d84e98c2) Forgot to revert some values back when fixing up the tutorial info windows 2019-04-26 11:16:41 +03:00
Joonas Rikkonen 8e15be3d42 (57e816cad) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:15:52 +03:00
Joonas Rikkonen fa25735e9f (3851196d8) Show the campaign disclaimer when entering the New Game or Tutorials tab for the first time. 2019-04-26 11:15:37 +03:00
Joonas Rikkonen e1924f517f (53ca31b28) Removed: Unused tutorialsub, unused enum from tutorials 2019-04-26 11:15:19 +03:00
Joonas Rikkonen ee1672408f (0bf65db0b) Removed: ContextualTutorial structure from tutorials.xml 2019-04-26 11:14:15 +03:00
Joonas Rikkonen a7f56ced21 (3cc40bf1d) Added prefabs for new autodoors. Replaced doors in Dugong and Bunyip 2019-04-26 11:13:43 +03:00
Joonas Rikkonen f3fbaedb42 (a0a15e2cb) Removed: ContextualTutorial related calls 2019-04-26 11:13:25 +03:00
Joonas Rikkonen 4f746b04ea (b8e5081e1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:14:20 +03:00
Joonas Rikkonen eb7ac2bfbe (8e98e6343) Add and implement new clown gear. 2019-04-25 18:13:47 +03:00
Joonas Rikkonen 07b937ca90 (ce70f0edf) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:13:28 +03:00
Joonas Rikkonen 03797df87b (224725392) fixed default state of a few emergency pumps. 2019-04-25 18:12:55 +03:00
Joonas Rikkonen df0f8c79ab (dbc56728c) Fixed item scale not being taken into account in light sprites 2019-04-25 18:12:19 +03:00
Joonas Rikkonen d3687bc3ef (21015c117) Placeholder icon for the OuterClother slot (see #28) 2019-04-25 18:12:02 +03:00
Joonas Rikkonen f365bdc92f (a66d0118e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:11:45 +03:00