 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
|
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
|
068089ae5c
|
(d622ac851) Fix double updates of current orders.
|
2019-05-16 05:47:36 +03:00 |
|
|
Joonas Rikkonen
|
ce1aa39a4b
|
(b1241e3dd) GUIMessageBoxes use relative sizes
|
2019-05-16 05:46:12 +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
|
7614642d93
|
(e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai
|
2019-05-16 05:30:39 +03:00 |
|
|
Joonas Rikkonen
|
54a0164f89
|
(98501b696) Reduce the max accepted distance for repair tool ai operate.
|
2019-05-16 05:30:23 +03:00 |
|
|
Joonas Rikkonen
|
ca3b5ae04b
|
(0976ef4d1) Fix repair hint text being displayed even when the item condition is not below the threshold. Move the GetHUDText method from shared to client project.
|
2019-05-16 05:29:50 +03:00 |
|
|
Joonas Rikkonen
|
b628abbf7d
|
(ec7e0c3d1) Take stuck and open doors into account when evaluating path access.
|
2019-05-16 05:28:07 +03:00 |
|
|
Joonas Rikkonen
|
3bce90251a
|
(133a5b1da) Merge branch 'dev' into human-ai
|
2019-05-16 05:27:51 +03:00 |
|
|
Joonas Rikkonen
|
bd4b3bd7f9
|
(479cebd45) Fix not being able to open partially broken doors with integrated buttons.
|
2019-05-16 05:25:35 +03:00 |
|
|
Joonas Rikkonen
|
039d07f693
|
(a2943d8b7) Merge branch 'dev' into human-ai
|
2019-05-16 05:04:10 +03:00 |
|
|
Joonas Rikkonen
|
60f52375e6
|
(7788ec72a) Test issuing orders automatically.
|
2019-05-16 05:03:49 +03:00 |
|
|
Joonas Rikkonen
|
b797d112b7
|
(db4f4a55b) HasRequiredItems method is used for different purposes. Thus we shouldn't return true if the door is damaged but not broken, because it would cause issues for example in steering. Similarly I don't think we should use the canBePicked here, because it could be possible that the door should be interactable but not pickable.
|
2019-05-06 11:22:20 +03:00 |
|
|
Joonas Rikkonen
|
c01eddbebb
|
(e3ae570b4) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-03 13:52:49 +03:00 |
|
|
Joonas Rikkonen
|
7545e8efec
|
(6fc1d03cd) Fixed humpback waypoints, removed extra door
|
2019-05-03 13:52:32 +03:00 |
|
|
Joonas Rikkonen
|
0a931f31e6
|
(e9cc325b5) Cherry pick from human-ai: Fix not being able to open partially broken doors with integrated buttons.
|
2019-05-03 13:52:15 +03:00 |
|
|
Joonas Rikkonen
|
6262b3ea54
|
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-16 17:12:09 +03:00 |
|
|
Joonas Rikkonen
|
bd07acf26d
|
(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0
|
2019-04-16 17:11:49 +03:00 |
|
|
Joonas Rikkonen
|
edb8c39c58
|
(7dc4f5c23) Fix the doors: - Don't allow to pick, if the doors has no requirments. In this case the door should be opened by using the [select] key. - Display "UNAUTHORIZED ACCESS" when the door has integrated buttons but the requirements are not met. Display the cannot open the door text when the door doesn't have integrated buttons and the player is trying to open the door with the [select] key.
|
2019-04-16 17:11:23 +03:00 |
|
|
Joonas Rikkonen
|
e94228d346
|
(b948206e8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-10 13:35:03 +03:00 |
|
|
Joonas Rikkonen
|
9a54b89bf3
|
(0eb0c36ec) Fixed door background sprites being drawn in front of characters (TODO: update sprite depths in the subs)
|
2019-04-10 13:30:25 +03:00 |
|
|
Joonas Rikkonen
|
06ac9a04ba
|
(84bc4cdae) Display another message when trying to directly open a door that doesn't have buttons on it (wired to remote buttons/controllers).
|
2019-04-10 13:29:50 +03:00 |
|
|
Joonas Rikkonen
|
2ca299af10
|
(ab07307c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-10 13:27:49 +03:00 |
|
|
Joonas Rikkonen
|
593d99ec38
|
(df9b1966f) Added an option to disable directional voice chat. Closes #1414
|
2019-04-10 13:27:30 +03:00 |
|
|
Joonas Rikkonen
|
74da38bd10
|
(3315662d5) Implement optional required items (lol) and fix the doors. It's a bit confusing, but should work.
|
2019-04-10 13:26:56 +03:00 |
|
|
Joonas Rikkonen
|
fa4d1caeed
|
(552a3719d) Don't open a door by clicking "select", if the door has any required items (in which case we want to force open it by clicking "use").
|
2019-04-10 13:24:36 +03:00 |
|
|
Joonas Rikkonen
|
0f4c7c302f
|
(41e8be463) Revert "Rewiring the door changes it's behavior. TODO: Might be better to implement as two separate type of doors?" (Now using two separate doors instead)
|
2019-04-10 13:23:31 +03:00 |
|
|
Joonas Rikkonen
|
5a7abc430c
|
(5d7e5eb93) Rewiring the door changes it's behavior. TODO: Might be better to implement as two separate type of doors?
|
2019-04-10 13:21:45 +03:00 |
|
|
Joonas Rikkonen
|
25453018fc
|
(3f015888d) Implement manual doors that can be opened simply by clicking on them. Add a test sub (not added in the project -> have to manually place in the local bin folder to test it).
|
2019-04-10 13:21:25 +03:00 |
|
|
Joonas Rikkonen
|
cc122f2bbf
|
(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test
|
2019-04-04 11:10:29 +03:00 |
|
|
Joonas Rikkonen
|
b08a31a68f
|
(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.
|
2019-04-04 11:10:14 +03:00 |
|
|
Joonas Rikkonen
|
a3425a0432
|
(bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row
|
2019-04-04 11:08:49 +03:00 |
|
|
Joonas Rikkonen
|
7eb03ea6b3
|
(874c38a79) Show keybindings for use or shoot in the tooltips.
|
2019-04-04 11:08:33 +03:00 |
|
|
Joonas Rikkonen
|
d4752bb6a0
|
(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.
|
2019-04-04 11:08:18 +03:00 |
|
|
Joonas Rikkonen
|
7491b06a5d
|
(bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults.
|
2019-04-04 11:08:02 +03:00 |
|
|
Joonas Rikkonen
|
79ea41e6c9
|
(4f4395b00) Reduced the size of the disallowed item interface area around the chatbox
|
2019-04-04 11:07:45 +03:00 |
|
|
Joonas Rikkonen
|
0cd81c6a99
|
(cdc68f306) Don't select items when aiming.
|
2019-04-04 11:06:28 +03:00 |
|
|
Joonas Rikkonen
|
5f05322fdb
|
(fdc038d5d) Keymapping and UX test: - Map use to "E" and Select to "Left Mouse". - Introduce a dedicated key for deselecting ("Right Mouse"). - Introduce a dedicated key for shooting ("Left Mouse"). - Define certain objects as shootables, which simply means that they use the "Shoot" key instead of using the "Use" key. This required the least amount of refactoring the existing code. - TODO: don't register the "Select" input when aiming or when an interface is open -> should prevent interacting through UI elements. - TODO: sync the new input types with the server.
|
2019-04-04 11:06:12 +03:00 |
|
|
Joonas Rikkonen
|
d66a49bb7c
|
(929d3d0fd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-03 16:23:08 +03:00 |
|
|
Joonas Rikkonen
|
212b7074a8
|
(8bcb4dfd5) Refined cable holders, added variants for 1-3 cables (background still missing)
|
2019-04-03 16:22:54 +03:00 |
|