Commit Graph

348 Commits

Author SHA1 Message Date
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 67a0636470 (b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:09:50 +03:00
Joonas Rikkonen e583f570ff (c29165793) Increase the gap seeking distance, because some walls are thicker than 200 pixels. 2019-04-29 21:09:03 +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 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 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 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 e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +03:00
Joonas Rikkonen 501a26ef0b (e93fc83e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 17:44:24 +03:00
Joonas Rikkonen 16bebd57be (9d4f6093f) Standardize the console commands for switching to editors. Revisit the descriptions and add Level Editor, Sprite Editor, and Particle Editor in the debug console help. Reduce the variants for all the commands. 2019-04-25 17:44:05 +03:00
Joonas Rikkonen d1695238f7 (ec2443ae2) Updated: EnglishVanilla with the proofreading #2 2019-04-25 17:43:47 +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 f774694154 (4246de267) Fixed saving a submarine with a new name causing the previous sub file to disappear from sub lists until saved subs are refreshed, fixed new subs appearing at the end of the list (instead of being sorted alphabetically) 2019-04-23 11:17:20 +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 2b11c79a4c (ac9d10462) Take entity scale and flipping into account when dragging 2019-04-16 17:13:34 +03:00
Joonas Rikkonen 9dc29965f6 (602bf4ba6) Implemented structure scaling. TODO: draw with correct scale when dragging 2019-04-16 17:13:18 +03:00
Joonas Rikkonen 3c147c1653 (cb10c219e) Allow to set the vitality for a character without afflicting damage. Make a bunch of properties of Attack class publicly accessible. 2019-04-16 17:13:01 +03:00
Joonas Rikkonen 0c42ad1572 (22ec3a281) Add a boolean that controls whether or not the enemy attacks outposts and the characters inside it. 2019-04-16 17:12:43 +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 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 4fae57916a (0ac981d7a) Fixed wrong sprites on weapons and ballast icon labels 2019-04-15 13:43:21 +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 ffa6192377 (655499f68) Add new variants for some classes (wip). The female textures are placeholders. Rename a bunch of files to support the variants and to organize the files a bit better. Also moved the item definitions around and created dedicated xmls for all the classes. 2019-04-15 13:42:51 +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 70a92425d0 (77c7a4df9) Small fix to mudraptor sprite sourcerect (adjacent limb was bleeding into the sprite) 2019-04-15 13:42:22 +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 bf78825f6d (ff913f363) Renamed labels for consistency 2019-04-15 12:10:46 +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 3b38c7e69e (5616e8c9d) Added image Icons for different sections of the submarine aswell as letters and numbers as decals. NOTE: some of the image icons still needs to be iterated to make them our own 2019-04-15 12:10:19 +03:00
Joonas Rikkonen 8290c577d8 (1dd58d3ff) CustomInterface editor shows each label/signal as a separate textbox (w/ text picker option) 2019-04-15 12:10:05 +03:00
Joonas Rikkonen f20e82832f (04b477ff8) Added: ContextualTutorial texts to EnglishVanilla until replaced with the new tutorial 2019-04-15 12:09:50 +03:00
Joonas Rikkonen 373554ddfb (461eade89) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-04-15 12:09:36 +03:00
Joonas Rikkonen 8a42bb3bbd (add7a8fe6) Fixed: Error in localization when importing npc conversations. Added: proofread englishvanilla 2019-04-15 12:09:22 +03:00
Joonas Rikkonen 6943ff8586 (05b7a65ce) Further nerfed bleeding damage for raptors, increased internal damage to compensate. 2019-04-15 12:09:08 +03:00
Joonas Rikkonen 470b46a603 (6807c0fa1) Reverted detector sprite sourcerect changes in 65f7be0. (Need a new texture first) 2019-04-15 12:08:53 +03:00
Joonas Rikkonen 45be409a84 (84bcafc68) Added "text picker menu" to ItemMsgs, replace """ with a quotation mark in texts 2019-04-15 12:08:39 +03:00
Joonas Rikkonen 21a1b05ae7 (aa2fcf7ca) Gave an id card to watchmen to make it possible for them to leave their room (e.g. when running from a hostile player) 2019-04-15 12:08:25 +03:00
Joonas Rikkonen c4c49dfb10 (5f6bab490) Fixed AI characters being unable to open doors w/ the built-in buttons 2019-04-15 12:08:11 +03:00
Joonas Rikkonen 754bcd9bf2 (97b5e76f9) Made mudraptor bit attack slightly less deadly. You will still die horribly, but less quickly now. 2019-04-15 12:07:56 +03:00
Joonas Rikkonen 649eeb5a27 (d9f7d6f5e) Created a new texture for wall damage 2019-04-15 12:07:42 +03:00
Joonas Rikkonen ed38e60d13 (32ba1d322) When editing an item label or a room name, the text is colored gray/green according to whether the text can be translated (= if a matching text tag is found in the language files). There's also now a "text picker menu" that can be used to pick the text from a list of translatable texts. TODO: use this in ItemComponent.Msg and CustomInterface button/tickbox labels. 2019-04-15 12:07:27 +03:00