 Joonas Rikkonen
|
80c563e7b0
|
(86280d29b) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-05-16 06:31:49 +03:00 |
|
|
Joonas Rikkonen
|
fc22eb5088
|
(fc5e081d3) Fixed: Hull names not saving properly in submarineditor
|
2019-05-16 06:31:32 +03:00 |
|
|
Joonas Rikkonen
|
36898958b2
|
(0a8612032) Graphics add, mostly structure stuff
|
2019-05-16 06:26:06 +03:00 |
|
|
Joonas Rikkonen
|
2f0bd98f8f
|
(43fff031a) Remove the placeholder female engineer variant. Only male engineers now have two variants.
|
2019-05-16 06:17:28 +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
|
af07862995
|
(fff074e42) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 06:14:05 +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
|
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
|
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
|
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
|
71cde8862f
|
(f35c3b912) new outpost
|
2019-05-16 06:08:22 +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
|
606e1f6560
|
(e761ae6fd) Implemented new diving suit locker
|
2019-05-16 06:06:07 +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
|
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
|
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
|
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
|
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
|
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
|
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
|
fd7dfebd3a
|
(50c25dbf6) Added a "back" button that closes the credits, minor credits tweaks
|
2019-05-16 05:50:39 +03:00 |
|
|
Joonas Rikkonen
|
068089ae5c
|
(d622ac851) Fix double updates of current orders.
|
2019-05-16 05:47:36 +03:00 |
|
|
Joonas Rikkonen
|
bb6bffe88a
|
(b597640aa) Implemented the new splash videos (each can be skipped separately), language selection on first startup works now
|
2019-05-16 05:47:02 +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 |
|