Commit Graph

175 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 c73fe6e132 (277003233) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:04:08 +03:00
Joonas Rikkonen f259748910 (aebb26541) Added localizable connection names to all items (TODO: display in the connection panel interface, load from prefab if the value is not present in a sub or ItemAssembly file) 2019-05-16 06:03:51 +03:00
Joonas Rikkonen fda2d46877 (d243af062) hull sprite fix, part XXIV 2019-05-16 06:02:59 +03:00
Joonas Rikkonen e56ff196d4 (3c957365d) tweaks and decals 2019-05-16 06:01:01 +03:00
Joonas Rikkonen e019b0e3d5 (b469a55e9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:00:45 +03:00
Joonas Rikkonen aad4b64014 (98bbe45fe) Added connection names to englishvanilla 2019-05-16 06:00:29 +03:00
Joonas Rikkonen b3ff4a52c5 (f13632535) Berilia pass: updated doors, added some duct blocks 2019-05-16 06:00:13 +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 7614642d93 (e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai 2019-05-16 05:30:39 +03:00
Joonas Rikkonen 54a0164f89 (98501b696) Reduce the max accepted distance for repair tool ai operate. 2019-05-16 05:30:23 +03:00
Joonas Rikkonen 3bce90251a (133a5b1da) Merge branch 'dev' into human-ai 2019-05-16 05:27:51 +03:00
Joonas Rikkonen 8621d9927e (a21f15055) Merge branch 'dev' into human-ai 2019-05-16 05:27:17 +03:00
Joonas Rikkonen 3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen 108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen b02565796a (98f1dbf5e) Merge branch 'dev' into human-ai 2019-05-16 05:14:58 +03:00
Joonas Rikkonen 7f72f72ca7 (9c0250ef1) Merge branch 'dev' into human-ai 2019-05-16 05:14:40 +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 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 e57e553cba (b51399688) Added localization to most of Humpback's texts 2019-05-07 13:22:28 +03:00
Joonas Rikkonen ba5b856a68 (38de4e68e) Added localized texts 2019-05-07 13:19:45 +03:00