Commit Graph

272 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 c0b8a26bfc (63010b9f0) Fixed incorrect keybinds being displayed in a couple of tutorial texts 2019-04-29 21:18:52 +03:00
Joonas Rikkonen 46f5bd5b15 (99a5e8cf8) Fix bots not using the ladders when swimming on the water surface. + merge fix 2019-04-26 11:29:14 +03:00
Joonas Rikkonen 2aec2414be (12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:25:25 +03:00
Joonas Rikkonen 3eb883fbb3 (9253f5b70) Added libvlc.so to LinuxClient 2019-04-26 11:25:10 +03:00
Joonas Rikkonen a3ba709e92 (befc20623) Fixed extremely small objective texts on lower resolutions, don't scale objective texts (not needed because we change font sizes according to the resolution now) 2019-04-26 11:19:46 +03:00
Joonas Rikkonen 79c31d1a83 (0185896f9) More fixes to messagebox & tutorial info box scaling 2019-04-26 11:19:32 +03:00
Joonas Rikkonen 010411d434 (66fc3d1f9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:18:31 +03:00
Joonas Rikkonen d425064a3b (28c455ff7) Improve the ai repair tool usage. 2019-04-26 11:18:14 +03:00
Joonas Rikkonen 0dba9947f3 (1d84e98c2) Forgot to revert some values back when fixing up the tutorial info windows 2019-04-26 11:16:41 +03:00
Joonas Rikkonen 8e15be3d42 (57e816cad) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:15:52 +03:00
Joonas Rikkonen fa25735e9f (3851196d8) Show the campaign disclaimer when entering the New Game or Tutorials tab for the first time. 2019-04-26 11:15:37 +03:00
Joonas Rikkonen e1924f517f (53ca31b28) Removed: Unused tutorialsub, unused enum from tutorials 2019-04-26 11:15:19 +03:00
Joonas Rikkonen ee1672408f (0bf65db0b) Removed: ContextualTutorial structure from tutorials.xml 2019-04-26 11:14:15 +03:00
Joonas Rikkonen a7f56ced21 (3cc40bf1d) Added prefabs for new autodoors. Replaced doors in Dugong and Bunyip 2019-04-26 11:13:43 +03:00
Joonas Rikkonen f3fbaedb42 (a0a15e2cb) Removed: ContextualTutorial related calls 2019-04-26 11:13:25 +03:00
Joonas Rikkonen 4f746b04ea (b8e5081e1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:14:20 +03:00
Joonas Rikkonen eb7ac2bfbe (8e98e6343) Add and implement new clown gear. 2019-04-25 18:13:47 +03:00
Joonas Rikkonen 07b937ca90 (ce70f0edf) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 18:13:28 +03:00