Commit Graph

297 Commits

Author SHA1 Message Date
Joonas Rikkonen adab8589da (f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-06-12 16:45:24 +03:00
Joonas Rikkonen dce98349ea (23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing 2019-06-12 16:45:02 +03:00
Joonas Rikkonen e3ca616fff (869ac975f) Merge branch 'master' into dev 2019-06-12 16:43:56 +03:00
Joonas Rikkonen eaf4f6afb8 (face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568 2019-06-12 16:43:34 +03:00
Joonas Rikkonen 783aadfcbc (c948ec781) Fixed command doors in berilia 2019-06-12 16:42:53 +03:00
Joonas Rikkonen ddd18987bd (770eff9a0) Fix the waypoint on Typhon, which was causing issues for the bots, because it was not linked to the gap. 2019-06-10 17:54:29 +03:00
Joonas Rikkonen e317a28b3d (86c05fec0) Fixed opening remora drone door from the inside of the sub while drone is undocked 2019-06-10 17:53:47 +03:00
Joonas Rikkonen 3b6f9a0b96 (c6b32f34d) Removed link between deconstructor and cabinet on humpback that caused confusion 2019-06-10 17:52:20 +03:00
Joonas Rikkonen dcdc8d806b (a6b43f39e) Added some more vents to subs. Made it so you can't undock remora drone when its doors are open. Added assistant spawn point to dugong. Moved cargo spawn point in humpback. 2019-06-10 17:51:37 +03:00
Joonas Rikkonen a127edca80 (292692029) Nerfed plasma cutters, reduced alien wall healths, modified oxygen generation levels to suit new exponential model 2019-06-04 16:50:40 +03:00
Joonas Rikkonen fd8fe59688 (7d2df62c0) fixed ID card tags 2019-06-04 16:41:39 +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 5208b922d8 (46e39d26c) v0.9.0.4 2019-06-04 16:12:45 +03:00
Joonas Rikkonen babc87903b (f9330e2e0) Modified: MacOS to use the same monokickstart when launching server 2019-06-04 16:03:35 +03:00
Joonas Rikkonen 79d4f17c0e (1e3d23ded) Added more battery cells to Remora 2019-06-04 16:03:18 +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 edccfe223d (9a7d83a40) Fullscreen bug workarounds 2019-06-04 16:00:38 +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 c6a94f6c3d (5bae788e3) Fixed coilgun bounds on remora drone, refreshed drone 2019-06-04 15:35:09 +03:00
Joonas Rikkonen 7c67b1f164 (57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2. 2019-05-20 21:00:11 +03:00
Joonas Rikkonen b71adc7589 (2e0e45e1f) Updated: Localization 2019-05-20 20:46:21 +03:00
Joonas Rikkonen 51c7c3c5e7 (829d1f980) changed repair requirement for fabricators to wrench. 2019-05-20 20:36:01 +03:00
Joonas Rikkonen 0965401773 (7379abcea) Minor fixes to Typhon's exterior walls (misaligned/overlapping pieces, draw order issues) 2019-05-20 20:35:10 +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 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 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 78b67de866 (e9f10995d) Merge branch 'bugreporterUI' into dev 2019-05-18 17:43:00 +03:00
Joonas Rikkonen 3a2310e547 (3ac5065f5) Fixed: Rendering order for Bugreporter window, OK button position 2019-05-18 17:42:41 +03:00
Joonas Rikkonen cb519b455d (e7e775e7b) Fixed non-translated "Toggle Battery Output" display text in Orca, increased the size of the docking labels in Bunyip to create more space for translated texts 2019-05-18 17:25:11 +03:00
Joonas Rikkonen 4874c07d5e (6056b4603) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:23:31 +03:00
Joonas Rikkonen 3cc0b65946 (b1fa1d68c) Fix stairs not being properly assigned due to a failing raycast. 2019-05-18 17:22:23 +03:00
Joonas Rikkonen fdb9161932 (05abb966f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:21:15 +03:00
Joonas Rikkonen fefa1a067b (fa5639a1d) Added: Space in the beginning of tutorial info frames to have indenting on all paragraphs 2019-05-18 17:20:59 +03:00
Joonas Rikkonen 72b570f533 (dd0578d36) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:20:42 +03:00
Joonas Rikkonen 09ddcc8436 (d9894f840) Round UI text positions to integers, rendering at a fractional position makes them look messy 2019-05-18 17:20:25 +03:00
Joonas Rikkonen 1e00493502 (39c5d4b78) automated the airlock pump 2019-05-18 17:20:08 +03:00
Joonas Rikkonen f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +03:00
Joonas Rikkonen 5438a65852 (f2c7469a6) Workarounds to missing label translations: use "High pressure" for the "WARNING: High pressure" label in the tutorial outpost, use "Warning" and "Reactor temp." for "Reactor temp caution". Also made the labels a little larger to accommodate longer words in some of the translations. 2019-05-16 07:04:47 +03:00
Joonas Rikkonen 42d4b5bfcd (5269b5857) tweaks 2019-05-16 06:58:09 +03:00
Joonas Rikkonen a4b0a9abc9 (4b2d4213d) tweaks and fixes, part 777 2019-05-16 06:56:53 +03:00
Joonas Rikkonen 112baf285d (291705dc5) updated drone 2019-05-16 06:56:19 +03:00