Commit Graph

107 Commits

Author SHA1 Message Date
Joonas Rikkonen 108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen b02565796a (98f1dbf5e) Merge branch 'dev' into human-ai 2019-05-16 05:14:58 +03:00
Joonas Rikkonen 7f72f72ca7 (9c0250ef1) Merge branch 'dev' into human-ai 2019-05-16 05:14:40 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen 7c901d8d77 (8fd36f702) Add a separate value for run threshold. Increase the order priority from 50 to 70. 2019-05-16 05:09:15 +03:00
Joonas Rikkonen 3a3d55d780 (39b4d0859) Merge branch 'dev' into human-ai 2019-05-16 05:08:56 +03:00
Joonas Rikkonen 616efac2bf (19b26d13b) Merge branch 'dev' into human-ai 2019-05-16 05:08:39 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 4797f6b0d3 (307219669) Add some automatic orders. 2019-05-16 05:08:02 +03:00
Joonas Rikkonen b51fd32b88 (de7949704) Rewrite the leak priority calculations. Ensure that the damage priority is not negative. 2019-05-16 05:07:45 +03:00
Joonas Rikkonen 7f58f30829 (1c243b972) Fix steering related issues in the fix leaks objective. 2019-05-16 05:07:27 +03:00
Joonas Rikkonen 37555ed1a4 (9fc7c8e98) Only reset when the objective is an order. 2019-05-16 05:07:07 +03:00
Joonas Rikkonen 2a0e289a59 (40f4f67f8) Further changes to the calculations. 2019-05-16 05:06:49 +03:00
Joonas Rikkonen b7272e1c96 (2f379083c) Change how some of the priorities are clamped. 2019-05-16 05:06:30 +03:00
Joonas Rikkonen b5db30ec72 (c48cb7804) Change the operate item priority calculation so that it starts from 25 and increases with devotion and is multiplied by the priority modifier. Clamp the result. 2019-05-16 05:06:11 +03:00
Joonas Rikkonen ff5a819ad3 (62a89ce6a) Refactor and fix priority calculations. WIP, but should already improve things. 2019-05-16 05:05:53 +03:00
Joonas Rikkonen d0795791e7 (3bb9485ad) Add automatic orders as objectives instead of orders so that we can take advantage of the existing priority system. Turn the priority values defined in the xml into modifiers. 2019-05-16 05:04:53 +03:00
Joonas Rikkonen 5def53f7bd (2972c6da9) Add a missing text. 2019-05-16 05:04:29 +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 342a150855 (59b1edfd7) Added a button that opens the campaign disclaimer to the new game menu 2019-05-06 11:40:40 +03:00
Joonas Rikkonen 836acc0814 (82b78c472) Fixed inability to close the pause menu with Esc when an item interface is open 2019-05-06 11:39:49 +03:00
Joonas Rikkonen 029f5fccda (8df97f638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-06 11:35:46 +03:00
Joonas Rikkonen 26eaf244ed (b17b66c5f) updated remora and drone 2019-05-06 11:35:29 +03:00
Joonas Rikkonen 7559fc3d7c (3bb856c81) Open the pause menu when the window loses focus instead of just temporarily pausing the game 2019-05-06 11:35:12 +03:00
Joonas Rikkonen f42a7c1ec6 (69d450d58) Initialize SteamManager before creating the GameMain instance 2019-05-06 11:34:36 +03:00
Joonas Rikkonen f72fd0bf29 (80eb10d43) Option to automatically pause the game when the window loses focus (on by default) 2019-05-06 11:34:17 +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 4d1c3b1ed4 (43a58c2c3) Fixed content package hash calculation failing if the package is not enabled and contains new monster files. Was caused by Character.GetConfigFile failing to find the config file because it only searched from currently selected content packages. 2019-04-29 21:10:05 +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 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 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 ad028163a2 (332bdd387) Added: Content.RootDirectory modifying on macOS 2019-04-25 18:08:20 +03:00
Joonas Rikkonen e83dba2959 (42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev 2019-04-25 18:07:37 +03:00