Commit Graph

877 Commits

Author SHA1 Message Date
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 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 8a42bb3bbd (add7a8fe6) Fixed: Error in localization when importing npc conversations. Added: proofread englishvanilla 2019-04-15 12:09:22 +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
Joonas Rikkonen 66de47f041 (a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml 2019-04-15 12:06:58 +03:00
Joonas Rikkonen 3eba76bb0f (32e72b628) Fixed "dumpentitytexts" command outputting the lines in an incorrect format, added new lights and structures to EnglishVanilla.xml 2019-04-15 12:04:54 +03:00
Joonas Rikkonen 7cf82573d0 (12ed5d203) Disable background music & ambience in the character editor. Closes #1420 2019-04-15 12:04:26 +03:00
Joonas Rikkonen b705b1579c (c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 12:00:49 +03:00
Joonas Rikkonen b4ec36f5bb (2fc72545e) new texts regarding missions and beacons. 2019-04-15 12:00:35 +03:00
Joonas Rikkonen 455fbb013f (158a62970) Don't allow to replace an existing character. TODO: should make this possible later on, but requires additional logic. Fixes #1375. 2019-04-15 12:00:21 +03:00
Joonas Rikkonen 359b8280d3 (25fc82c5f) Fix collider params being written as floats instead of ints. 2019-04-15 12:00:07 +03:00
Joonas Rikkonen 629993f38d (4b2369616) Don't register hotkeys, character controls or other input when the character creation interface is open. 2019-04-15 11:59:53 +03:00
Joonas Rikkonen d6acb8bf09 (9e9c1672d) The wizard now creates box colliders by default. 2019-04-15 11:59:38 +03:00
Joonas Rikkonen a48064d392 (8b7236862) Reset the character editor on exit (if not switching between the game screen). Handle crash when no character file is found (e.g. when an invalid path is defined in the content package). 2019-04-15 11:59:23 +03:00
Joonas Rikkonen 11a7bf3600 (6ed01ab09) Add a todo note. 2019-04-15 11:59:09 +03:00
Joonas Rikkonen b2ec092461 (2f1a4259b) Increase the collider sizes when adjusting them automatically in the editor. 2019-04-15 11:58:54 +03:00
Joonas Rikkonen a7feb6f7e0 (a6a0c23a1) Close all message boxes when clicking the quit button in the pause menu. Fixes character wizard not closing if it's open when quitting to the main menu. 2019-04-15 11:58:38 +03:00
Joonas Rikkonen 2370ca91b6 (52202ffdf) Don't create walk and run animations if the character cannot enter a submarine. 2019-04-15 11:57:56 +03:00
Joonas Rikkonen c3a248e527 (6f8f26a84) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 11:57:43 +03:00
Joonas Rikkonen 4675f969f1 (73da2532a) Only repairable items are indestructible in outposts (oxygen tanks, ammo boxes, etc can still deteriorate normally). 2019-04-15 11:57:28 +03:00
Joonas Rikkonen d2756ed948 (d4c4937a6) Change the default path for new characters in the character wizard. Use "Mods" folder instead of "Content". 2019-04-15 11:56:59 +03:00
Joonas Rikkonen d59efcc2c0 (58da95a91) Add a todo note. 2019-04-15 11:56:31 +03:00
Joonas Rikkonen 04efb3d471 (6ccb9e6a7) Fix a compile error. 2019-04-15 11:56:04 +03:00
Joonas Rikkonen fcdfee6328 (333e0a646) Added automatic hull & item repair option to the campaign. TODO: adjust costs, now both options cost a fixed 500 credits. Closes #1314 2019-04-15 11:55:49 +03:00
Joonas Rikkonen d7e41d95af (bb287fabc) Decreased simple physics distance, sonar now displays characters that are in simple physics mode 2019-04-11 18:28:38 +03:00
Joonas Rikkonen ddfdb3f4bf (7f0d0fe11) Fixed specular maps going over characters, fixed levelobject draw order not working correctly in the level editor 2019-04-11 18:28:10 +03:00
Joonas Rikkonen 2f86991ce5 (fdf8cfbbe) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-11 18:27:41 +03:00
Joonas Rikkonen a3342ca96d (ffa3ddbca) Implemented changing mineral sprites when attached to a wall 2019-04-11 18:27:25 +03:00
Joonas Rikkonen 913b0f4526 (a5eaeca2c) Fix alternative layout not being used on linked items that were selected (only on the linked items that were displayed when another object is selected). 2019-04-11 18:27:10 +03:00
Joonas Rikkonen f4275de1ac (845cfe372) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-11 18:26:56 +03:00
Joonas Rikkonen a57b7184fb (f6c34b377) Fix crawlers not reacting to any targets if properly latched on walls. 2019-04-11 18:26:42 +03:00
Joonas Rikkonen 9b0e0ab278 (ec990ac7c) Save chatbox & crew menu toggle state between rounds 2019-04-11 18:26:26 +03:00
Joonas Rikkonen e7e858c05b (db7e4d6d5) Fix "crawler balling" caused by crawlers taking damage when targeting the sub and not yet latched on it. 2019-04-11 18:25:58 +03:00
Joonas Rikkonen 16cc5c8bc2 (7960f5b50) Fixed nullref exception when attempting to start a mission round with mission type set to None 2019-04-11 18:25:44 +03:00
Joonas Rikkonen 50317e3626 (1edd7c0b9) Created methods for getting lists of favourite servers and servers you've been to (history) from the GetServers method, changes might be needed 2019-04-11 18:25:15 +03:00
Joonas Rikkonen dd45af5a9f (20f37d9c7) Option to toggle structure drop shadows and edit the position of the shadow 2019-04-11 18:25:01 +03:00
Joonas Rikkonen b76aa1ff3a (03291eb8d) Use the sourcerect of a structure's default sprite for the background sprite if it doesn't define it's own sourcerect 2019-04-11 18:24:45 +03:00
Joonas Rikkonen 266d58ca08 (7b78900c1) Reset doors in vanilla subs 2019-04-11 18:24:31 +03:00
Joonas Rikkonen d59d547fff (0245c838b) Fixed "resetselected" only resetting the first selected entity 2019-04-11 18:24:15 +03:00
Joonas Rikkonen c9cdbcc7ed (aa49312e0) Fixed bots failing to do almost anything in multiplayer due to the submarine's team ID not matching theirs 2019-04-11 18:23:47 +03:00
Joonas Rikkonen 2af78d096e (8b3cd3de5) Fixed clients never removing network events the server has already received (!), don't create a new client event if there's already an identical event waiting to be sent 2019-04-11 18:23:17 +03:00
Joonas Rikkonen 2db312f71e (3d7994d75) Added a command that resets selected items and structures to prefab values 2019-04-11 18:22:49 +03:00
Joonas Rikkonen 5f4797bb1a (c6972d8ed) Fixed ServerInfo not fetching some of the texts from the text xml 2019-04-11 18:22:34 +03:00
Joonas Rikkonen 74c0b22b77 (c13450762) Added All tab to the sub editor screen entity list 2019-04-11 18:22:19 +03:00
Joonas Rikkonen bf953177b9 (7ef195de5) Added server preview to be cleared on server list refresh 2019-04-10 15:14:00 +03:00
Joonas Rikkonen 9f55da3677 (8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item). 2019-04-10 15:13:25 +03:00