Commit Graph

454 Commits

Author SHA1 Message Date
Joonas Rikkonen 65d627d57c (2c9775b8e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-06 11:22:36 +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 e4adc47dad (1036993d3) Adjusted motion detector in autodoors 2019-05-06 11:22:02 +03:00
Joonas Rikkonen 30620ed059 (61cc49902) Don't create ai for the dummy character. Creates issues. 2019-05-06 11:21:45 +03:00
Joonas Rikkonen ad2b6159c0 (64db8799d) Removed editable DynamicDockingIndicator property 2019-05-03 13:57:58 +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 1218ebb719 (d1070d74c) Fixed CustomInterface labels displaying the text tag instead of the actual text when using translatable texts 2019-05-03 13:51:58 +03:00
Joonas Rikkonen c7a71d5627 (52c4b3002) Fixed CustomInterface labels & signals not being saved correctly 2019-05-03 13:50:32 +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 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 fbb7daed00 (0c3442136) Merge branch 'dev' into docking-interface 2019-05-03 13:41:23 +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 b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +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 d425064a3b (28c455ff7) Improve the ai repair tool usage. 2019-04-26 11:18:14 +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
Joonas Rikkonen 03797df87b (224725392) fixed default state of a few emergency pumps. 2019-04-25 18:12:55 +03:00
Joonas Rikkonen df0f8c79ab (dbc56728c) Fixed item scale not being taken into account in light sprites 2019-04-25 18:12:19 +03:00
Joonas Rikkonen f31114ea01 (9f6737ced) Fixed: Old text tag in sonar.cs 2019-04-25 18:10:37 +03:00
Joonas Rikkonen e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +03:00
Joonas Rikkonen 99344e4031 (b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix 2019-04-25 17:52:14 +03:00
Joonas Rikkonen 52991e1ded (41a4cf029) Merge 2019-04-25 17:50:53 +03:00
Joonas Rikkonen 8be51d71bd (444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead 2019-04-25 17:50:35 +03:00
Joonas Rikkonen e4ac5434d7 (f1791560b) Switched back to old fonts (requested by art) 2019-04-25 17:50:17 +03:00
Joonas Rikkonen 457000c8dd (9e2b50b03) Removed unused duplicate texture 2019-04-25 17:49:59 +03:00
Joonas Rikkonen 3a83ac42c9 (dd2b3452f) Social center png added (was missing) 2019-04-25 17:49:41 +03:00
Joonas Rikkonen 47ef561a03 (ade7449ec) increase stun baton damage slightly, should take 6 or so hits to kill a crawler instead of 12. 2019-04-25 17:49:23 +03:00