Commit Graph

64 Commits

Author SHA1 Message Date
Joonas Rikkonen db4e3a6725 (d779d70f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:07:34 +03:00
Joonas Rikkonen b7ae35d942 (332837e80) Fixed: salvagenasonovartifactruin not having translations, using salvagenasonovartifactcave identifier instead 2019-05-16 06:07:17 +03:00
Joonas Rikkonen 1289eb4975 (d63652688) Updated diving suit lockers in vanilla subs 2019-05-16 06:06:59 +03:00
Joonas Rikkonen e56ff196d4 (3c957365d) tweaks and decals 2019-05-16 06:01:01 +03:00
Joonas Rikkonen cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +03:00
Joonas Rikkonen 257889b9cc (42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool. 2019-05-16 05:58:15 +03:00
Joonas Rikkonen 412d46169e (1621785a9) Size variants of labels, also reverts 995d492 2019-05-16 05:57:39 +03:00
Joonas Rikkonen f8ca1444fd (7765c6989) Only show a bunch of pathfinder errors and warnings in debug builds. 2019-05-16 05:57:22 +03:00
Joonas Rikkonen 1ae482a84d (8c8a15639) Implemented new wall textures 2019-05-16 05:56:49 +03:00
Joonas Rikkonen fe5f386358 (61f67c194) Fix the raycast and angle checks. use the weapon position instead of the character position. 2019-05-16 05:56:16 +03:00
Joonas Rikkonen 0bb541bce8 (2c8e14bca) Added edge variants for new environment base textures 2019-05-16 05:54:50 +03:00
Joonas Rikkonen e9664d3639 (084340338) Add an aim timer before the weapon can be used. Fix a null reference exception. 2019-05-16 05:54:33 +03:00
Joonas Rikkonen 64f147ea6c (cb1c8745f) Changed oxygen generator values in Dugong and Remora, recommended crew in Humpback 2019-05-16 05:52:38 +03:00
Joonas Rikkonen 68ced76e1b (cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai 2019-05-16 05:45:37 +03:00
Joonas Rikkonen f8090d470e (5670a7c58) Don't get stuck if cannot use the button. 2019-05-16 05:44:48 +03:00
Joonas Rikkonen 5ec107bf83 (0d96091e5) Adjusted layout spacing on Reactor to make the warning labels slightly more readable on Brazilian Portugese 2019-05-16 05:43:40 +03:00
Joonas Rikkonen de2246fe57 (e0d673b0d) Test: Don't calculate the distance to the buttons when seeking path. Instead, check the distance when checking the doors. Allows the bots to access the Remora ballast through the door where the button is a bit farther from the door than usually. 2019-05-16 05:42:51 +03:00
Joonas Rikkonen 828150e0ae (9d8f050b8) Added text wrapping to ItemInventory titles and changed pump GUI In/Out text to use a smaller font 2019-05-16 05:42:34 +03:00
Joonas Rikkonen 1d5de494cd (a185ec0cd) Don't report on broken items that have condition above the threshold. Optimize and fix. 2019-05-16 05:41:25 +03:00
Joonas Rikkonen 79d01822d2 (8015dd67d) Show a language selection prompt when launching the game for the first time (WIP) 2019-05-16 05:41:09 +03:00
Joonas Rikkonen ddd84a4f9e (c45394988) Refactor and fix button interaction and access checks in the indoors steering manager. 2019-05-16 05:40:00 +03:00
Joonas Rikkonen 3575c8df52 (03ab09991) Load chinese fonts dynamically, removed unnecessary duplicate block from DynamicRenderAtlas 2019-05-16 05:39:25 +03:00
Joonas Rikkonen 8280ed9c1a (3b137aa1a) Merge remote-tracking branch 'origin/dev' into human-ai 2019-05-16 05:36:05 +03:00
Joonas Rikkonen e367f900b8 (2a4bd39c2) Merge branch 'dev' into human-ai 2019-05-16 05:33:13 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +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 cc46d452fa (92c1061d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:22:40 +03:00
Joonas Rikkonen 6c196186b3 (3f6e326ca) Modified: Separator, Added nowhitespace=true to chinese language files 2019-05-07 16:22:24 +03:00
Joonas Rikkonen e93456e2a2 (655930562) Added more localized strings to subs and shuttles 2019-05-07 16:21:51 +03:00
Joonas Rikkonen 3b6383b057 (c63c19e43) Let's try replacing preview pics again 2019-05-07 13:22:44 +03:00
Joonas Rikkonen ba5b856a68 (38de4e68e) Added localized texts 2019-05-07 13:19:45 +03:00
Joonas Rikkonen 4ee5bf1e08 (cbcc94ae1) Higher res preview pics for subs 2019-05-06 14:13:55 +03:00
Joonas Rikkonen 84054b75bb (016cc3e0f) Updated Remora cable holders 2019-05-06 11:40:24 +03:00
Joonas Rikkonen 397b99a2ad (6e1c0e7da) removed RDX from railgun shells!!! 2019-05-06 11:39:31 +03:00
Joonas Rikkonen 26eaf244ed (b17b66c5f) updated remora and drone 2019-05-06 11:35:29 +03:00
Joonas Rikkonen 1dd2a83a54 (577a78502) Updated remora, WIP. 2019-05-06 11:33:09 +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 266d58ca08 (7b78900c1) Reset doors in vanilla subs 2019-04-11 18:24:31 +03:00
Joonas Rikkonen 153b08065b (12487d533) Added Berilia submarine, 95% complete 2019-04-08 12:06:38 +03:00
Joonas Rikkonen 935cd6bc65 (235745275) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 12:06:09 +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 8cb5576955 (abdc60f9d) Resaved vanilla subs with higher-res preview images 2019-04-06 17:49:46 +03:00
Joonas Rikkonen cc122f2bbf (b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test 2019-04-04 11:10:29 +03:00
Joonas Rikkonen b08a31a68f (33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it. 2019-04-04 11:10:14 +03:00
Joonas Rikkonen 41da4e24a9 (cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:09:45 +03:00
Joonas Rikkonen 1966bcb4ab (c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes). 2019-04-04 11:09:32 +03:00
Joonas Rikkonen a3425a0432 (bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row 2019-04-04 11:08:49 +03:00
Joonas Rikkonen 7eb03ea6b3 (874c38a79) Show keybindings for use or shoot in the tooltips. 2019-04-04 11:08:33 +03:00