Commit Graph

3330 Commits

Author SHA1 Message Date
Joonas Rikkonen
bd659383b4 (1aa050263) Cherry pick from human-ai: Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons. 2019-05-03 13:48:48 +03:00
Joonas Rikkonen
3701f0e957 (7e3aa6097) Merge remote-tracking branch 'origin/docking-interface' into dev 2019-05-03 13:48:31 +03:00
Joonas Rikkonen
8d3a48584b (92fc1380e) Allow interacting with items inside outposts (only prevent deattaching items from walls) 2019-05-03 13:48:15 +03:00
Joonas Rikkonen
088f7e5485 (d3c10117b) Fixed nullref exception if there are no texts defined for a location type change 2019-05-03 13:47:58 +03:00
Joonas Rikkonen
5031432e77 (513733e88) Check that the character is inside the same room as the target before repairing/operating an item. 2019-05-03 13:47:39 +03:00
Joonas Rikkonen
1ff1584be5 (53f9210d1) Check the line of sight before fixing leaks or extinguishing fires. 2019-05-03 13:47:22 +03:00
Joonas Rikkonen
d1dd0c6043 (d3791496e) FireSource implements ISpatialEntity. 2019-05-03 13:47:05 +03:00
Joonas Rikkonen
3d5e402d22 (a98f03ffb) Fix target blocking itself when it's structure. Take doors into account. 2019-05-03 13:46:48 +03:00
Joonas Rikkonen
0e96e18a24 (d9833de39) Added bug report texts to EnglishVanilla 2019-05-03 13:46:32 +03:00
Joonas Rikkonen
3371e7dca4 (17183b3e8) Add a reference in the project. 2019-05-03 13:46:15 +03:00
Joonas Rikkonen
e0732e6d57 (2eca8483c) Refactor CanSeeCharacter method and implement CanSeeTarget method. If we check whether or not we can see a character, it should now check if any of the limbs can be seen instead of always checking the head/torso etc. Not tested. 2019-05-03 13:45:58 +03:00
Joonas Rikkonen
953b5690ec (2a7829fab) Add ISpatialEntity as a common interface for everything that has a position in the game world. Would have used IMapEntity, but there's already MapEntity, which inherits Entity, so that would be confusing. Declare the inheritance only in the shared class (Character). 2019-05-03 13:45:41 +03:00
Joonas Rikkonen
4daa149f29 (15c28d37a) fixed outpost 2019-05-03 13:45:26 +03:00
Joonas Rikkonen
904cad71a5 (3be596a23) Don't allow using invalid filename characters in a save name. Fixes crashing when attempting to use symbols such as <, > or | in the name. 2019-05-03 13:45:10 +03:00
Joonas Rikkonen
a640439617 (3a64fa8f4) Fixes to wall textures bleeding into adjacent sprites, incorrect dimensions & misaligned colliders 2019-05-03 13:44:53 +03:00
Joonas Rikkonen
16e49d10d9 (a8b3957c6) Fixed nullref exception when selecting categories in the sub editor 2019-05-03 13:44:38 +03:00
Joonas Rikkonen
c988016b6f (90245034a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-03 13:44:21 +03:00
Joonas Rikkonen
35f4657ea1 (d85d68721) Fixed character's feet getting stuck to platforms when climbing ladders while holding A/D 2019-05-03 13:44:04 +03:00
Joonas Rikkonen
fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen
aef95740d3 (768877381) Test: change the docking indicator to a pulsating crosshair when ready to dock (more noticeable than just changing the color of the centerline) 2019-05-03 13:43:26 +03:00
Joonas Rikkonen
7d7950e70b (c3c244ef4) Nicer looking docking interface buttons (actual arrows instead of U, D, <, >) 2019-05-03 13:43:09 +03:00
Joonas Rikkonen
9b9735e2e7 (6aff06511) Fixed GUIComponent.SpriteEffects not having an effect on GUIImages 2019-05-03 13:42:53 +03:00
Joonas Rikkonen
bc5f571903 (29d8edbb9) Use a sprite to draw the lines on the sonar display (looks better than GUI.DrawLine) 2019-05-03 13:42:36 +03:00
Joonas Rikkonen
1d7faa8d1d (b778c4641) Docking button works now in the docking interface, change button text depending on whether we're docking/undocking, some placeholder UI graphics for the nav terminal 2019-05-03 13:42:19 +03:00
Joonas Rikkonen
2f60af4365 (0947e0f05) Item.GetConnectedComponentsRecursive can traverse through relays and logic components 2019-05-03 13:42:00 +03:00
Joonas Rikkonen
32a8b97ad4 (01452b66f) Fixed "maintain position" indicators & inputs being relative to the center of the screen, not the center of the sub. Flash the docking button when ready to dock. 2019-05-03 13:41:42 +03:00
Joonas Rikkonen
fbb7daed00 (0c3442136) Merge branch 'dev' into docking-interface 2019-05-03 13:41:23 +03:00
Joonas Rikkonen
45ba589d96 (12412e6fd) Determine the steering vector relative to the center of the sub, not the center of the display when clicking on the display 2019-05-03 13:41:06 +03:00
Joonas Rikkonen
5d4a3f18c6 (021a3d977) Draw the steering indicator at the center of the sub, not at the center of the display. Change the color of the docking indicators when ready to dock 2019-05-03 13:40:49 +03:00
Joonas Rikkonen
a2c2f72357 (2edf7845f) Progress on docking interface (nudge controls), focus sonar on the center of the submarine instead of the nav terminal 2019-05-03 13:40:31 +03:00
Joonas Rikkonen
2199a0f97f (276dcf6d2) Docking indicator changes color when the docking port is within the sector 2019-05-03 13:40:12 +03:00
Joonas Rikkonen
b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen
7eb0972d16 (df7ca4c53) updated doors + merge fix 2019-04-29 23:03:58 +03:00
Joonas Rikkonen
9e8a5046fb (ec7043278) Set correct location change rules, removed ruins from the world until we know what to do with them. 2019-04-29 21:19:24 +03:00
Joonas Rikkonen
cb96e4667f (d7d1a1027) First pass rebalance of the distribution of missions in the campaign. 2019-04-29 21:19:08 +03:00
Joonas Rikkonen
c0b8a26bfc (63010b9f0) Fixed incorrect keybinds being displayed in a couple of tutorial texts 2019-04-29 21:18:52 +03:00
Joonas Rikkonen
285ca8f78b (5cf4ab11c) Don't draw order indicators (the icons pointing towards the target item) when far away and not inside the same sub as the target. Prevents exploiting the indicators in locating the sub. Closes #1444 2019-04-29 21:18:36 +03:00
Joonas Rikkonen
4f0f5b309b (94b673f74) Monsters stop dragging targets if there's a collider between the characters. Closes #1441 2019-04-29 21:18:20 +03:00
Joonas Rikkonen
482b3dacfd (392954b0e) Swap the order of the starting location & destination in nav terminals when playing in a mirrored sub. 2019-04-29 21:18:04 +03:00
Joonas Rikkonen
aa48f19801 (902225da6) More automatic text scaling in places where texts are likely to overflow 2019-04-29 21:13:51 +03:00
Joonas Rikkonen
ce7d36d9e2 (78888f7fb) Changes to reactor interface to make it adapt better to different text lengths 2019-04-29 21:13:36 +03:00
Joonas Rikkonen
ad298c69c2 (118683d11) Fixed crashing when generating levels in the level editor. 2019-04-29 21:13:20 +03:00
Joonas Rikkonen
8d3d103e17 (a2b4f82e7) Fixed Job.Save not saving the identifier of the job, preventing jobs from being loaded correctly if the language is changed after saving. 2019-04-29 21:13:03 +03:00
Joonas Rikkonen
8737a0e0dd (26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit. 2019-04-29 21:12:47 +03:00
Joonas Rikkonen
e21b4e5efc (529c58f9a) Added a couple of missing texts to EnglishVanilla. Because it may take a while until these can be added, a hard-coded text is used if these lines can't be found. 2019-04-29 21:12:31 +03:00
Joonas Rikkonen
2c1a5be93e (19c8c7b56) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:12:15 +03:00
Joonas Rikkonen
0b1b39d70a (caf7e6a2e) Replaced Concentus NuGet package with csproj (ensures correct System.Runtime references) 2019-04-29 21:11:59 +03:00
Joonas Rikkonen
f10adc2612 (08ad40cc0) Fixed items "vanishing" if they move directly from sub to another without going outside first. 2019-04-29 21:11:42 +03:00
Joonas Rikkonen
9930a3081c (e082ed22d) Fixed AllowRagdollButton settings not being synced with clients. Might be related to #1297 2019-04-29 21:11:24 +03:00
Joonas Rikkonen
dd24c604d1 (d653e2340) Fixed workshop items switching order in the workshop menu when the preview thumbnails are received. 2019-04-29 21:11:07 +03:00