Commit Graph

121 Commits

Author SHA1 Message Date
Joonas Rikkonen 3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen 96a5875b9a (a01a93af6) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:24:58 +03:00
Joonas Rikkonen cc22268f0e (ae2d4614b) Added: NPCConversation translations 2019-05-07 16:24:41 +03:00
Joonas Rikkonen ed23155de7 (a79419041) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:24:06 +03:00
Joonas Rikkonen bc55ab10b8 (d81130005) added new outpost to project 2019-05-07 16:23:50 +03:00
Joonas Rikkonen 92f300128e (f6783d0df) Workarounds to missing texts (use a "fallback tag" if the correct tag can't be found, now used for "shuttle" and "savesubdialogdescription"), minor layout tweaks to fix overlapping texts in Pt-Br 2019-05-07 16:23:32 +03:00
Joonas Rikkonen 482f3c1f3c (975eacb57) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:23:16 +03:00
Joonas Rikkonen bb6067df31 (1e5573bea) new outpost 2019-05-07 16:22:58 +03:00
Joonas Rikkonen dd120a8153 (8851c8702) Fixed submarines occasionally being rendered at an incorrect position when viewing them in the sub editor after they've been used in-game 2019-05-07 13:20:17 +03:00
Joonas Rikkonen 5619323cee (4c272e568) Fixed crashing when loading the same sub twice in the sub editor 2019-05-07 13:18:41 +03:00
Joonas Rikkonen 5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +03:00
Joonas Rikkonen 6e152c4575 (c57beb621) Autoscale text in a bunch of places where it's likely to overflow 2019-05-06 14:13:38 +03:00
Joonas Rikkonen b797d112b7 (db4f4a55b) HasRequiredItems method is used for different purposes. Thus we shouldn't return true if the door is damaged but not broken, because it would cause issues for example in steering. Similarly I don't think we should use the canBePicked here, because it could be possible that the door should be interactable but not pickable. 2019-05-06 11:22:20 +03:00
Joonas Rikkonen e4adc47dad (1036993d3) Adjusted motion detector in autodoors 2019-05-06 11:22:02 +03:00
Joonas Rikkonen 30620ed059 (61cc49902) Don't create ai for the dummy character. Creates issues. 2019-05-06 11:21:45 +03:00
Joonas Rikkonen e3a485edd3 (cb8c9ec1b) Fixed subs not being rendered when switching from the game screen to the sub editor immediately after the round starts 2019-05-03 13:51:05 +03:00
Joonas Rikkonen 16e49d10d9 (a8b3957c6) Fixed nullref exception when selecting categories in the sub editor 2019-05-03 13:44:38 +03:00
Joonas Rikkonen fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen aa48f19801 (902225da6) More automatic text scaling in places where texts are likely to overflow 2019-04-29 21:13:51 +03:00
Joonas Rikkonen 52991e1ded (41a4cf029) Merge 2019-04-25 17:50:53 +03:00
Joonas Rikkonen 8be51d71bd (444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead 2019-04-25 17:50:35 +03:00
Joonas Rikkonen ae33907727 (5bcbaf382) Improved campaign UI store search bar layout 2019-04-25 17:48:28 +03:00
Joonas Rikkonen c69ebd8408 (35da84ff7) Fixed sub editor sub list filter area flickering on/off 2019-04-25 17:47:54 +03:00
Joonas Rikkonen 00586d26ce (195c368ea) Fixed search bar layout and position for sub list and sub editor 2019-04-25 17:47:35 +03:00
Joonas Rikkonen 544cc7ec08 (bad1f3738) Added search bars to sub lists in campaign setup UI and sub editor. Closes #1415 2019-04-23 15:37:48 +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 3ce6551cb2 (4965a76d6) Methods for showing the campaign/editor disclaimers 2019-04-23 11:16:43 +03:00
Joonas Rikkonen 786c37811f (ed3701e5d) Fixed submarine editor previously used list overlapping with entity list when scrollbar is visible 2019-04-18 12:02:50 +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 dd371c29cc (6844335fb) Fixed incorrect text tag in submarine save dialog 2019-04-16 17:10:25 +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 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 5d5979c58b (a69e7b9c1) Moved delete button to the top of submarine list in submarine editor load window, to minimize accidental clicks 2019-04-08 19:15:54 +03:00
Joonas Rikkonen 9594ea67a7 (bf037f9b0) Don't allow deleting vanilla subs or subs that are a part of some content package 2019-04-08 13:36:58 +03:00
Joonas Rikkonen d15a88c619 (3e8bdbb0a) v0.8.9.9 + merge fix 2019-04-06 17:54:39 +03:00
Joonas Rikkonen f043ac26f4 (5754c8b91) Fixed incorrectly placed gap in Typhon's cargo room 2019-04-06 17:52:36 +03:00
Joonas Rikkonen dc8b49b5b6 (e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512) 2019-04-06 17:52:23 +03:00
Joonas Rikkonen f80e9a29a7 (301f0a344) Option to set a custom preview image for subs 2019-04-06 17:50:53 +03:00
Joonas Rikkonen 7b3ccde624 (46f58eedd) Set submarine preview image resolution back to 256x128. For some reason, higher resolutions seem to cause hangs for when loading the image. I suspected it was because of encoding the image as a Base64 string into the xml, but that doesn't seem to case: I tried saving the image as a separate file instead, and it still causes the same problem (see #19 in the private repo). 2019-04-06 17:50:27 +03:00
Joonas Rikkonen 8d8478432f (00783cc63) Don't premultiply submarine preview image alpha, fixed background texture not covering the whole preview image when using an image resolution larger than the size of the texture 2019-04-06 17:50:13 +03:00
Joonas Rikkonen 14d0daf16d (ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:49:31 +03:00
Joonas Rikkonen 45c1ed499a (e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used 2019-04-06 17:49:18 +03:00