 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
|
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 |
|
|
Joonas Rikkonen
|
f02c7cdda9
|
(ee538829d) Added docking tutorial video, removed highlight from old docking button.
|
2019-05-16 05:51:45 +03:00 |
|
|
Joonas Rikkonen
|
57302f7bb8
|
(4ff749939) Added new environment assets for implementation
|
2019-05-16 05:51:28 +03:00 |
|
|
Joonas Rikkonen
|
049d3ba795
|
(e7bd8839d) Remove unused parameters.
|
2019-05-16 05:51:12 +03:00 |
|
|
Joonas Rikkonen
|
884360216f
|
(de60c0961) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:50:56 +03:00 |
|
|
Joonas Rikkonen
|
fd7dfebd3a
|
(50c25dbf6) Added a "back" button that closes the credits, minor credits tweaks
|
2019-05-16 05:50:39 +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
|
e367f900b8
|
(2a4bd39c2) Merge branch 'dev' into human-ai
|
2019-05-16 05:33:13 +03:00 |
|