Commit Graph

203 Commits

Author SHA1 Message Date
Joonas Rikkonen 4fa3d8e41a (3582f590f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:30:59 +03:00
Joonas Rikkonen 4d3e3ca0a2 (d08b879a0) Moved remora's aux engine back so the turbine is outside 2019-05-16 06:30:39 +03:00
Joonas Rikkonen e50baabea0 (36cf727ca) fixes and sub folder cleanup 2019-05-16 06:30:22 +03:00
Joonas Rikkonen 531a1235af (e2fcec3e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:30:06 +03:00
Joonas Rikkonen e074a5bf73 (7da87677c) tweaks and fixes 2019-05-16 06:29:49 +03:00
Joonas Rikkonen 2ac3f597ca (de83e894f) Fixed remora tail hull problem, moved ballast ladder platform to correct position 2019-05-16 06:29:32 +03:00
Joonas Rikkonen 04124fe56b (2f11bb197) tweaks 2019-05-16 06:29:14 +03:00
Joonas Rikkonen 07055ada82 (2c6f87623) Made autodoor motion sensor area bigger on most doors 2019-05-16 06:28:55 +03:00
Joonas Rikkonen d9ab57e2ae (8a177f8bd) Fixed remora airlocks and refreshed drone. Added higher res preview pics to remora, typhon and bunyip 2019-05-16 06:28:39 +03:00
Joonas Rikkonen 1cdd62360f (986bfff2b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:27:16 +03:00
Joonas Rikkonen a6b592a625 (93733c170) Fix a null reference exception. 2019-05-16 06:26:57 +03:00
Joonas Rikkonen cdc2ede035 (741810595) adjustments to art pass 2019-05-16 06:26:39 +03:00
Joonas Rikkonen f23e4c67db (534c88165) Remora, remora drone & Typhon updated 2019-05-16 06:26:22 +03:00
Joonas Rikkonen 02c5a35331 (fc70e8aa6) updated searchlight 2019-05-16 06:16:06 +03:00
Joonas Rikkonen 61f5ccc71d (c93eaea48) Merge branch 'human-ai' into dev 2019-05-16 06:14:43 +03:00
Joonas Rikkonen 9c964b7843 (7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order. 2019-05-16 06:14:25 +03:00
Joonas Rikkonen 5f524ddd3f (457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor 2019-05-16 06:13:49 +03:00
Joonas Rikkonen ce7b9c4f52 (94ad97066) Refactor combat objective. The bots should now be able to reload and seek more ammunition. When they run out of ammunition, they first try to use another weapon and only if no other weapon is found, they seek more ammunition. Had to change the contain item and get item objectives a bit. Hopefully doesn't break things too much. 2019-05-16 06:13:15 +03:00
Joonas Rikkonen 4d3cea1aa2 (bede44974) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:12:40 +03:00
Joonas Rikkonen c3021b65ad (20e9d0ccb) Added the new bow and rear items into the project 2019-05-16 06:12:22 +03:00
Joonas Rikkonen 68b3e2eb07 (07016aa31) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:11:48 +03:00
Joonas Rikkonen e66501d96a (14c9225be) Added: Missing word from itemmsgoxygenrefill 2019-05-16 06:11:31 +03:00
Joonas Rikkonen bf359f58e9 (099a1ac6b) Updated Berilia docking button signals 2019-05-16 06:11:15 +03:00
Joonas Rikkonen 1eb58ddf55 (eb91d3390) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:10:23 +03:00
Joonas Rikkonen 5cedf373d6 (0b1ddcc13) Added: Missing ItemMsgOxygenRefill message that was not fetched via TextManager 2019-05-16 06:10:06 +03:00
Joonas Rikkonen f777ffa49e (f59486e5c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:09:49 +03:00
Joonas Rikkonen 3db16eb886 (09a8a1f69) additions to changelog 2019-05-16 06:09:32 +03:00
Joonas Rikkonen fbe0832b1e (58e405f96) Berilia pass: reduced device power requirements, wired some unwired periscopes 2019-05-16 06:08:58 +03:00
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