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 |
|
Joonas Rikkonen
|
18a58a313b
|
(995d492cc) Revert 3a64fa8f
|
2019-05-16 05:57:06 +03:00 |
|
Joonas Rikkonen
|
1ae482a84d
|
(8c8a15639) Implemented new wall textures
|
2019-05-16 05:56:49 +03:00 |
|
Joonas Rikkonen
|
6b1500aa8d
|
(203af66e8) Allow to attack other enemies too.
|
2019-05-16 05:56:32 +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
|
2de6c7e47d
|
(d752a1b58) Fixed lightsprite scale being wrong until the LightComponent is updated for the first time (caused fluorescent lights to look wrong in the sub editor)
|
2019-05-16 05:55:59 +03:00 |
|
Joonas Rikkonen
|
9dc33984a9
|
(e0b208744) Removed wall edge textures from the code project and added them to the content project
|
2019-05-16 05:55:40 +03:00 |
|
Joonas Rikkonen
|
b096d1cec8
|
(2d53d6196) Added missing item names and descriptions to localization (looks like these got removed in add7a8f)
|
2019-05-16 05:55:24 +03:00 |
|
Joonas Rikkonen
|
093f4ce8a6
|
(66e6d897c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:55:07 +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
|
a2e40ed3eb
|
(0c9b47aa6) New main menu graphics
|
2019-05-16 05:54:16 +03:00 |
|
Joonas Rikkonen
|
38240162cf
|
(841d7d297) Enable mechanic and watchman variants. Remove watchman variant 2 and rename variant 3 as variant 2.
|
2019-05-16 05:53:58 +03:00 |
|
Joonas Rikkonen
|
5d53c9e250
|
(339649ad9) Fix the sprite of a newly created level object not being visible or editable until the next time the object is loaded.
|
2019-05-16 05:53:41 +03:00 |
|
Joonas Rikkonen
|
b9c6c15da4
|
(5e60cfcac) Fix edit texture button not working in the level editor.
|
2019-05-16 05:53:25 +03:00 |
|
Joonas Rikkonen
|
1face40d92
|
(45ce701fa) Fixed accidental white borders on new environment assets
|
2019-05-16 05:53:10 +03:00 |
|
Joonas Rikkonen
|
8bfd104f82
|
(ff188f1b7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:52:54 +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
|
71685ef28c
|
(3ebdb2066) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:52:21 +03:00 |
|
Joonas Rikkonen
|
f8a0d54449
|
(d54773ab0) Fix the project references.
|
2019-05-16 05:52:02 +03:00 |
|