Commit Graph

4640 Commits

Author SHA1 Message Date
Joonas Rikkonen
bf359f58e9 (099a1ac6b) Updated Berilia docking button signals 2019-05-16 06:11:15 +03:00
Joonas Rikkonen
5709b505d6 (806a9ccd8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:10:58 +03:00
Joonas Rikkonen
35cea7ae25 (e25000a52) Added new bow and rear to be used with Typhon 2019-05-16 06:10:42 +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
4142815f52 (6915ddeae) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:09:15 +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
c1e66b325d (b80139866) updated decals 2019-05-16 06:08:39 +03:00
Joonas Rikkonen
71cde8862f (f35c3b912) new outpost 2019-05-16 06:08:22 +03:00
Joonas Rikkonen
0b92a93aed (51aebffa8) Changelog additions (WIP) 2019-05-16 06:08:07 +03:00
Joonas Rikkonen
8354c808d4 (73c1e1df5) Made legacy items translatable, added aliases to legacy items to prevent them from breaking when using a language other than English (legacy items are searched for based on name, so we need to have the English name as an alias) 2019-05-16 06:07:51 +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
4953a218d6 (a0bd05063) Fixed item assembly icons being drawn upside-down in the sub editor 2019-05-16 06:06:41 +03:00
Joonas Rikkonen
5c90e26209 (ef5df81dc) Fixed personal slots not being visible in the sub editor 2019-05-16 06:06:24 +03:00
Joonas Rikkonen
606e1f6560 (e761ae6fd) Implemented new diving suit locker 2019-05-16 06:06:07 +03:00
Joonas Rikkonen
ca71fe5955 (a2700bdb3) Fixed crashing if there's an empty diving suit (or any other item with one empty inventory slot) in the personal slots while they're hidden 2019-05-16 06:05:50 +03:00
Joonas Rikkonen
c1d1cf442f (9bec1c7ab) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:05:33 +03:00
Joonas Rikkonen
36ee088738 (3fbeb4c70) Option to make items use the name and description of another item 2019-05-16 06:05:16 +03:00
Joonas Rikkonen
92e4c824f4 (a4b11c610) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:04:57 +03:00
Joonas Rikkonen
24be77b15e (8d0d7ce53) Fixed: Some rooms not using translations 2019-05-16 06:04:40 +03:00
Joonas Rikkonen
4b9fbe596c (8ba0db51b) Load connection displaynames from the prefab xml if not present in a sub or itemassembly xml, use display names in the connection panel interface 2019-05-16 06:04:24 +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
392040c29c (54f876598) Fixed: Invalid identifier for the Terminate a Swarm mission 2019-05-16 06:03:34 +03:00
Joonas Rikkonen
a469dad251 (4b8a3151a) Replaced: Untranslated editor line 'FilterMapEntities' with the translated 'serverlog.filter' 2019-05-16 06:03:17 +03:00
Joonas Rikkonen
fda2d46877 (d243af062) hull sprite fix, part XXIV 2019-05-16 06:02:59 +03:00
Joonas Rikkonen
7f200e0716 (8b66f551f) Added new diving suit locker for implementation (rects: suit 0,0,99,338; empty 128,0,99,338) 2019-05-16 06:02:43 +03:00
Joonas Rikkonen
6ce11d9da9 (c36a1ec02) Fixed watchmen not saying the "EnterOutpost" lines in Outpost2 because the lines weren't triggered until a character enters the same hull 2019-05-16 06:02:27 +03:00
Joonas Rikkonen
6fc8b8b573 (2d7903da7) Replaced some horizontal light components with vertical ones in tutorial outpost 2019-05-16 06:02:10 +03:00
Joonas Rikkonen
d70c463f41 (3d327d975) Merge branch 'dev' into human-ai 2019-05-16 06:01:53 +03:00
Joonas Rikkonen
3dc82efdbd (a34001e8f) Fixed headers not being translated in the repair interface 2019-05-16 06:01:36 +03:00
Joonas Rikkonen
a70f4f315e (6aad031a6) Implemented new plant LevelObjects 2019-05-16 06:01:19 +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
7839fe4438 (d965fa654) Added: power & signal_[number] to englishvanilla 2019-05-16 05:59:57 +03:00
Joonas Rikkonen
79e38a0fa0 (345ac3e2d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 05:59:40 +03:00
Joonas Rikkonen
018f20e0f0 (5c867d67d) Added a couple of missing lines to EnglishVanilla 2019-05-16 05:59:21 +03:00
Joonas Rikkonen
9ae25de749 (8c8ce5249) Added description of oxygen tank and poison antidotes to englishvanilla 2019-05-16 05:59:05 +03:00
Joonas Rikkonen
cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +03:00
Joonas Rikkonen
0a67590572 (21a808335) Added: 4k fixes 2019-05-16 05:58:32 +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
18b6775457 (aee208587) Option to configure multiple sprite variants for a LevelObject, implemented new ice/rock sprites 2019-05-16 05:57:58 +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