Commit Graph

4640 Commits

Author SHA1 Message Date
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
Joonas Rikkonen
40ef1c018d (02594033c) Added campaign & editor disclaimers to EnglishVanilla 2019-04-15 12:07:13 +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
0f2e09b65e (62261c6e6) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 12:06:03 +03:00
Joonas Rikkonen
a9ad6d0504 (02db081a3) Fixed treatment suggestions not working correctly for some items because they were using incorrect affliction identifiers (there's no affliction with the identifier "damage"). Now the treatments can be defined using either the identifier or type of the affliction. 2019-04-15 12:05:34 +03:00
Joonas Rikkonen
921e4ef818 (aff19d6cd) Don't reset the hull timer if cannot complete the divinggearobjective, because it might cause performance issues. Reduce the timer instead so that new hull is searched once per sec at max. 2019-04-15 12:05:20 +03:00
Joonas Rikkonen
a3344fc23b (01ee2b7fd) More pronounced limping animation, don't restrict movement as much when legs are heavily damaged 2019-04-15 12:05:07 +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
29f902f0bb (18bb55660) Add unreachable targets on the unreachables list. Reset the list when a new combat objective begins. Don't immediately find a new hull target if the current hull is unsafe. Instead wait a sec at max. Fixes #1417. 2019-04-15 12:01:48 +03:00
Joonas Rikkonen
cc0e217e82 (e1476e522) Cleanup. 2019-04-15 12:01:32 +03:00
Joonas Rikkonen
cb2a0ff49e (65f7be0b6) Update: StructurePrefabs.xml, temp textures for fins, several new lamps, lightcomponent 90 degrees turned -option, icon atlas, 2019-04-15 12:01:18 +03:00
Joonas Rikkonen
e8c67f94c3 (a8e725a96) Optimized AIObjectiveFindSafety.FindBestHull. TODO: optimize further, causes huge lag spikes if the character can't find a path (see #1417) 2019-04-15 12:01:04 +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
e80906f020 (1091321b1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 11:57:13 +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
c5c6771102 (c908a1db4) disconnected coil from motion detector till there's time to work out why it constantly fires. 2019-04-15 11:56:46 +03:00
Joonas Rikkonen
d59efcc2c0 (58da95a91) Add a todo note. 2019-04-15 11:56:31 +03:00
Joonas Rikkonen
561a1a8995 (0880ae29f) Don't add ai targets to alien ruin walls. 2019-04-15 11:56:18 +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
57180df5dd (dc2a4682d) Adjustments to sub layout, lighting, textures, new spawnpoints, door settings, and deterioration 2019-04-15 11:55:34 +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
046a6d5abc (b899f62c0) Server emulates the ragdoll input when clients are stunned, unconscious or dead. Fixes disconnected players appearing in a weird half-crouching pose until they die, and might fix ragdolling in general doing the same (see #1297). The problem apparently appears when not playing locally, haven't tested yet. 2019-04-11 18:28:24 +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