Commit Graph

175 Commits

Author SHA1 Message Date
Joonas Rikkonen e367f900b8 (2a4bd39c2) Merge branch 'dev' into human-ai 2019-05-16 05:33:13 +03:00
Joonas Rikkonen 3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen 82d74f7481 (a1ebc2642) Use lazy loading to ensure that the list is assigned when it's needed. Fixes null reference exceptions when pumping water or charging batteries. 2019-05-16 05:15:34 +03:00
Joonas Rikkonen 108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +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 5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +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 f42a7c1ec6 (69d450d58) Initialize SteamManager before creating the GameMain instance 2019-05-06 11:34:36 +03:00
Joonas Rikkonen cffaef3c3c (4dba94638) Legacy save file support (= save files present in Data/Saves will still be usable) 2019-05-06 11:29:24 +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 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 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 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 d3ef770243 (9122340aa) Fixed inability to enable content packages if some of the files included in the package are already in the game folder (which may happen, for example, if enabling a content package fails) 2019-04-29 21:10:20 +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 501a26ef0b (e93fc83e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-25 17:44:24 +03:00
Joonas Rikkonen 16bebd57be (9d4f6093f) Standardize the console commands for switching to editors. Revisit the descriptions and add Level Editor, Sprite Editor, and Particle Editor in the debug console help. Reduce the variants for all the commands. 2019-04-25 17:44:05 +03:00
Joonas Rikkonen d1695238f7 (ec2443ae2) Updated: EnglishVanilla with the proofreading #2 2019-04-25 17:43:47 +03:00
Joonas Rikkonen f4f87b454d (8e4f5cb03) Add a disclaimer for switching from game to character editor. 2019-04-25 17:43:29 +03:00
Joonas Rikkonen 4e20fe871f (7f12d8742) More reliable firesource syncing: instead of just creating a network event when a firesource is created/removed and trusting that the fire behaves deterministically enough to stay in sync between the client and server, create events at 0.5 s intervals when there's fire in a hull. Closes #721 2019-04-25 17:43:13 +03:00
Joonas Rikkonen b5cc00810d (175e9b4e6) Show a message box notifying respawning traitors that they're no longer a traitor. Closes #1409 2019-04-23 11:19:27 +03:00
Joonas Rikkonen 8ad856ff1f (343ec9baa) Fixed servers not showing the correct "voicechatenabled" value in the server list 2019-04-23 11:18:50 +03:00
Joonas Rikkonen ea54fa24fe (0d11c0779) Select the vanilla content package if no core content packages are enabled on startup, or when disabling a core content package from the workshop menu. Closes #1424 2019-04-18 12:05:59 +03:00
Joonas Rikkonen 1a3184dbad (4c452f172) Force reactor IsActive=true when an AI character or a remote player operates it. Previously this was only done in UpdateHUD, so inactive reactors would not become enabled. 2019-04-18 12:04:56 +03:00
Joonas Rikkonen 8c8f03ae25 (a6f17618b) Allow canceling repairs in the campaign menu, fixed credits not being displayed in the repair tab 2019-04-17 12:43:11 +03:00
Joonas Rikkonen e0fe737c3b (60001519f) Fixed clients not being able to see other characters in spectator if they've died far away from the sub. + Increased position update interval for spectators. Closes #1421
+ Merge fix
2019-04-16 17:16:14 +03:00
Joonas Rikkonen 6262b3ea54 (ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:12:09 +03:00
Joonas Rikkonen bd07acf26d (052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0 2019-04-16 17:11:49 +03:00
Joonas Rikkonen 4c83e5a598 (98d8107fe) Fixed server failing to set items' treatment suitabilities because afflictions were loaded after the items 2019-04-16 17:10:54 +03:00
Joonas Rikkonen fcdfee6328 (333e0a646) Added automatic hull & item repair option to the campaign. TODO: adjust costs, now both options cost a fixed 500 credits. Closes #1314 2019-04-15 11:55:49 +03:00
Joonas Rikkonen 046a6d5abc (b899f62c0) Server emulates the ragdoll input when clients are stunned, unconscious or dead. Fixes disconnected players appearing in a weird half-crouching pose until they die, and might fix ragdolling in general doing the same (see #1297). The problem apparently appears when not playing locally, haven't tested yet. 2019-04-11 18:28:24 +03:00
Joonas Rikkonen f4275de1ac (845cfe372) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-11 18:26:56 +03:00
Joonas Rikkonen a57b7184fb (f6c34b377) Fix crawlers not reacting to any targets if properly latched on walls. 2019-04-11 18:26:42 +03:00
Joonas Rikkonen 9b0e0ab278 (ec990ac7c) Save chatbox & crew menu toggle state between rounds 2019-04-11 18:26:26 +03:00
Joonas Rikkonen e7e858c05b (db7e4d6d5) Fix "crawler balling" caused by crawlers taking damage when targeting the sub and not yet latched on it. 2019-04-11 18:25:58 +03:00
Joonas Rikkonen 16cc5c8bc2 (7960f5b50) Fixed nullref exception when attempting to start a mission round with mission type set to None 2019-04-11 18:25:44 +03:00
Joonas Rikkonen c9cdbcc7ed (aa49312e0) Fixed bots failing to do almost anything in multiplayer due to the submarine's team ID not matching theirs 2019-04-11 18:23:47 +03:00
Joonas Rikkonen 2af78d096e (8b3cd3de5) Fixed clients never removing network events the server has already received (!), don't create a new client event if there's already an identical event waiting to be sent 2019-04-11 18:23:17 +03:00
Joonas Rikkonen f278ff212c (370a5daac) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 13:35:02 +03:00
Joonas Rikkonen 8a227a4f2c (570318151) Cleanup. 2019-04-08 13:34:48 +03:00
Joonas Rikkonen 2fe8139ffd (b651e55f4) Don't quantize physicsbody velocities server-side. Caused subs to occasionally not move horizontally because the velocities got rounded down to zero if the sub wasn't accelerating fast enough. 2019-04-08 12:06:53 +03:00
Joonas Rikkonen cc122f2bbf (b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test 2019-04-04 11:10:29 +03:00
Joonas Rikkonen b08a31a68f (33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it. 2019-04-04 11:10:14 +03:00
Joonas Rikkonen 41da4e24a9 (cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:09:45 +03:00
Joonas Rikkonen 1966bcb4ab (c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes). 2019-04-04 11:09:32 +03:00