Commit Graph

118 Commits

Author SHA1 Message Date
Joonas Rikkonen 3e68a63a9d (02937a371) Fixed server list height not being updated when filtering servers 2019-06-09 17:45:14 +03:00
Joonas Rikkonen c4584f7763 (d5505ed3d) Show the name of the server in the "connecting to..." popup instead of the IP address 2019-06-04 16:52:07 +03:00
Joonas Rikkonen bea7b58ff3 (a410fd46c) Trying to help the merge script through a jungle of merges 2019-06-04 16:37:31 +03:00
Joonas Rikkonen 8184f0e6f6 (6b3ca1aae) Fixed the "item in use by x" text not being visible in item interfaces 2019-06-04 16:03:00 +03:00
Joonas Rikkonen aaa945ded8 (0f1d327f0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-04 16:02:42 +03:00
Joonas Rikkonen 81dd2f3202 (0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)." 2019-06-04 16:02:25 +03:00
Joonas Rikkonen 12ad53297d (657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing? 2019-06-04 16:00:57 +03:00
Joonas Rikkonen edccfe223d (9a7d83a40) Fullscreen bug workarounds 2019-06-04 16:00:38 +03:00
Joonas Rikkonen 012b10d0dc (a487baf88) Fixed: Formatting 2019-06-04 15:39:07 +03:00
Joonas Rikkonen e592c49fa8 (221f9f2a6) Merge branch 'dev' into capitalizationfixes 2019-06-04 15:38:31 +03:00
Joonas Rikkonen f797235bfd (38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla 2019-06-04 15:38:12 +03:00
Joonas Rikkonen 88605bd060 (f95a5142b) Fixed: Game crashing when clicking on the 'No matchign servers found.' message in server list 2019-05-23 15:13:02 +03:00
Joonas Rikkonen eed0666879 (76909c3c7) Fixed "clowncostume" and "crewaway" achievements not unlocking in multiplayer, fixed being able to get the "killclown" achievement by committing suicide while wearing a clown costume. Closes #1478
+ merge fix
2019-05-18 18:24:03 +03:00
Joonas Rikkonen e17c8e5acb (1df765f1d) Set text displays inside outposts to be hidden in game 2019-05-18 18:22:06 +03:00
Joonas Rikkonen 0021a71d2d (4112b048e) Convert the name of the currently selected capture device to UTF8 in the settings menu, not just the available capture device names 2019-05-18 17:56:16 +03:00
Joonas Rikkonen 896dd9469c (b13f5d345) If the "mysteries lie ahead" text that pops up when clicking the location at the center of the map is not available in the selected language, show the campaign roadmap (which mentions the center location not being reachable) instead 2019-05-18 17:55:58 +03:00
Joonas Rikkonen d06870c82a (05888a162) Added missing display name to alien coil's "activate" connection 2019-05-18 17:55:40 +03:00
Joonas Rikkonen 305fa484ad (3e2eaf696) Fixed "mission failed" text still appearing in other languages due to TextManager automatically returning an English text if a text cannot be found in the selected language 2019-05-18 17:55:21 +03:00
Joonas Rikkonen 8fec6cae81 (bf3994d49) Fixed save time being displayed in UNIX time in the right-hand panel in the campaign setup UI 2019-05-18 17:55:03 +03:00
Joonas Rikkonen f0d8186c69 (fc5c8644d) Automatically enable user statistics if the "do you want to send statistics" prompt cannot be shown on the selected language 2019-05-18 17:54:46 +03:00
Joonas Rikkonen c44d64df1b (a08a47a7f) Readded: Interval based reporting after entering the sub 2019-05-18 17:54:28 +03:00
Joonas Rikkonen 1146ecf3f3 (73fb25a43) Fixed: AI medic reporting by faking the reports 2019-05-18 17:54:12 +03:00
Joonas Rikkonen c7efdbb0e3 (97afc6f16) Fixed: SubPatients list not cleared when restarting 2019-05-18 17:53:54 +03:00
Joonas Rikkonen d36669c607 (7f6b8d538) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-18 17:53:38 +03:00
Joonas Rikkonen b1326787f7 (32460d493) Fixed: Wait timers running in tutorials when pause menu is open 2019-05-18 17:53:18 +03:00
Joonas Rikkonen 419754ccf1 (6189d5b14) moved harpoon holder closer to the cabinet in security tutorial, removed more dangerous weapons from tutorial sub 2019-05-18 17:53:00 +03:00
Joonas Rikkonen e7db219943 (89d59c16f) Highlight screwdriver at repair junction box objective 2019-05-18 17:52:43 +03:00
Joonas Rikkonen a01729514b (deeaf479b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:52:26 +03:00
Joonas Rikkonen 3a0d8bbb8a (7125fc611) DIY translations for the last few missing connection texts. Pretty confident these are correct, hacked the lines together from existing texts and "verified" with Google Translate. 2019-05-18 17:52:10 +03:00
Joonas Rikkonen 31f74aca8d (e3fee50d9) Use roughly matching "fallback translations" for ConnectionPanel texts that haven't been translated yet (e.g. "signal_1" -> "signal_in_1", "trigger_out" -> "shoot"). Still missing the charge-related connection names in batteries, couldn't find any suitable replacements for them 2019-05-18 17:51:52 +03:00
Joonas Rikkonen eaf65d7522 (bfa504101) Manually tweak Typhon waypoints. 2019-05-18 17:51:33 +03:00
Joonas Rikkonen 5ff5d89a21 (55428e509) Manually tweak Selkie waypoints. 2019-05-18 17:51:13 +03:00
Joonas Rikkonen 81ed89772c (dffc018ae) Manually tweak RemoraDrone waypoints. 2019-05-18 17:50:43 +03:00
Joonas Rikkonen 301ed98db7 (2cd8983b2) Manually tweak Remora waypoints. 2019-05-18 17:50:03 +03:00
Joonas Rikkonen 48296a63d2 (a59dd90f0) Manually tweak Orca waypoints. 2019-05-18 17:49:45 +03:00
Joonas Rikkonen 8695b017ff (1dbf6708d) Manually tweak Humpback waypoints. 2019-05-18 17:49:26 +03:00
Joonas Rikkonen 033236964a (09aef3df9) Manually tweak Dugong waypoints. 2019-05-18 17:48:51 +03:00
Joonas Rikkonen 79282f5321 (f6436b630) Manually tweak Bunyip waypoints. 2019-05-18 17:48:28 +03:00
Joonas Rikkonen 1973a824bf (91366496d) Removed connection displayname attributes from ItemAssemblies (ended up there with liberal use of Find & Replace, but it's better to use values from the item prefab) 2019-05-18 17:48:06 +03:00
Joonas Rikkonen 90e1786f92 (6f6fc33e7) The bots having the follow order now also equip mask/diving suit if the follow target has one. Unequipping not yet implemented. 2019-05-18 17:47:48 +03:00
Joonas Rikkonen 21641c63ec (085c021c9) Renamed remora drone hull space to something other than 'airlock' to help AI make better life decisions. 2019-05-18 17:47:30 +03:00
Joonas Rikkonen fd1b9dfbef (e21f2bbff) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-18 17:47:11 +03:00
Joonas Rikkonen 32f7f1ade7 (59836c1e0) Updated: EnglishVanilla 2019-05-18 17:46:53 +03:00
Joonas Rikkonen 69b4b6bd63 (9ed4e003a) Replaced decals in the tutorial outpost 2019-05-18 17:46:36 +03:00
Joonas Rikkonen c7f557ade8 (47b735f1a) Fixed inconsistencies in number decal scales 2019-05-18 17:46:18 +03:00
Joonas Rikkonen f36e590854 (d071c9d60) Fixed Connections not reporting missing localizable display names during initialization, added missing displayname attributes to all connections 2019-05-18 17:45:59 +03:00
Joonas Rikkonen 4602bcd8bf (cee794dc6) More descriptive name for the "charge" connection 2019-05-18 17:45:42 +03:00
Joonas Rikkonen a3e83aa3c1 (ed1dd3a11) One more. This should be all! 2019-05-18 17:45:25 +03:00
Joonas Rikkonen 0b65f00c68 (f03824879) More connection names 2019-05-18 17:45:06 +03:00
Joonas Rikkonen 59ce30f5ff (bc3a19f61) One more missing connection name 2019-05-18 17:44:50 +03:00