Commit Graph

3358 Commits

Author SHA1 Message Date
Joonas Rikkonen 8174d21468 (b3c0963ae) Replace cable holders in Humpback 2019-05-03 13:56:47 +03:00
Joonas Rikkonen 69917e42e2 (6ccf5bda4) Add the missing texts related to the ai orders and dialog. 2019-05-03 13:56:31 +03:00
Joonas Rikkonen 925329956a (3221c2861) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-03 13:56:13 +03:00
Joonas Rikkonen b0947d4bf8 (493361a05) Add a todo note. 2019-05-03 13:55:57 +03:00
Joonas Rikkonen 036e3423e6 (289fc0ad0) Fixed some hull, door and waypoint issues in Dugong 2019-05-03 13:55:40 +03:00
Joonas Rikkonen bcfd8d6da8 (d837f5034) Fixed wall damage not being visible due to e695ea7 2019-05-03 13:55:23 +03:00
Joonas Rikkonen 2c3d33e3d5 (245fdaa7e) Fixed invisible reactor on/off lever 2019-05-03 13:55:06 +03:00
Joonas Rikkonen 34d46823c3 (ecffdc74c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-03 13:54:48 +03:00
Joonas Rikkonen cf97ce3174 (c691f403f) Adjusted one of the sloped wall colliders 2019-05-03 13:54:31 +03:00
Joonas Rikkonen 3ea53f6c39 (5bee63547) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-03 13:54:14 +03:00
Joonas Rikkonen c6b36682a8 (135f758ec) Switched all subs and shuttles to dynamic docking model. 2019-05-03 13:53:57 +03:00
Joonas Rikkonen 56a1bbc4e7 (7ed054aad) Removed unused "halo" attribute from location types. 2019-05-03 13:53:40 +03:00
Joonas Rikkonen f6f97d580f (c6222f711) Don't allow selecting crate ItemContainers (= the inventory can only be accessed by picking up the item) 2019-05-03 13:53:22 +03:00
Joonas Rikkonen 9bd0706c43 (00eb16887) Workaround to missing location change texts: use texts that are meant for a different location type change but still fit (e.g. use "ruins.changeto.military" when an outpost becomes a military outpost, because the actual text is just "a military outpost has been established in x") 2019-05-03 13:53:05 +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 da3810b0d4 (df2c04949) Changed all subs' docking toggles to use the new button. Changed custom outputs to use localized text. 2019-05-03 13:51:41 +03:00
Joonas Rikkonen 809fa5adb0 (ef2bdb136) Fixed "biome "none" not found" console error when loading level generation params 2019-05-03 13:51:22 +03:00
Joonas Rikkonen e3a485edd3 (cb8c9ec1b) Fixed subs not being rendered when switching from the game screen to the sub editor immediately after the round starts 2019-05-03 13:51:05 +03:00
Joonas Rikkonen 8c678e3977 (9f9b86b9b) Fixed tutorial level generation params being used in normal levels. 2019-05-03 13:50:49 +03:00
Joonas Rikkonen c7a71d5627 (52c4b3002) Fixed CustomInterface labels & signals not being saved correctly 2019-05-03 13:50:32 +03:00
Joonas Rikkonen 5d9c61598b (e695ea73c) Changes to draw order logic. Fixes background lights bleeding through background walls that can only be resized on one axis. 2019-05-03 13:50:14 +03:00
Joonas Rikkonen dedc9b5083 (9a7f4893d) Don't select the chatbox when pressing R/T while another textbox is selected. 2019-05-03 13:49:57 +03:00
Joonas Rikkonen a445911665 (9cc662ae2) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-03 13:49:41 +03:00
Joonas Rikkonen a11e7db190 (78f064b46) Revert "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:49:23 +03:00
Joonas Rikkonen eb4f8b8a4d (eaa8e3d55) "Fight intruders" order icon 2019-05-03 13:49:06 +03:00
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