Commit Graph

140 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 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 482f3c1f3c (975eacb57) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:23:16 +03:00
Joonas Rikkonen bb6067df31 (1e5573bea) new outpost 2019-05-07 16:22:58 +03:00
Joonas Rikkonen cc46d452fa (92c1061d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:22:40 +03:00
Joonas Rikkonen 6c196186b3 (3f6e326ca) Modified: Separator, Added nowhitespace=true to chinese language files 2019-05-07 16:22:24 +03:00
Joonas Rikkonen e93456e2a2 (655930562) Added more localized strings to subs and shuttles 2019-05-07 16:21:51 +03:00
Joonas Rikkonen 3b6383b057 (c63c19e43) Let's try replacing preview pics again 2019-05-07 13:22:44 +03:00
Joonas Rikkonen e57e553cba (b51399688) Added localization to most of Humpback's texts 2019-05-07 13:22:28 +03:00
Joonas Rikkonen ba5b856a68 (38de4e68e) Added localized texts 2019-05-07 13:19:45 +03:00
Joonas Rikkonen 7d825b051c (bcdbb4a59) For Bunyip too 2019-05-06 14:14:13 +03:00
Joonas Rikkonen 4ee5bf1e08 (cbcc94ae1) Higher res preview pics for subs 2019-05-06 14:13:55 +03:00
Joonas Rikkonen 84054b75bb (016cc3e0f) Updated Remora cable holders 2019-05-06 11:40:24 +03:00
Joonas Rikkonen 397b99a2ad (6e1c0e7da) removed RDX from railgun shells!!! 2019-05-06 11:39:31 +03:00
Joonas Rikkonen 26eaf244ed (b17b66c5f) updated remora and drone 2019-05-06 11:35:29 +03:00
Joonas Rikkonen 1dd2a83a54 (577a78502) Updated remora, WIP. 2019-05-06 11:33:09 +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 5999a66681 (ac4fc6f29) Fixed EventInput crashing in 32-bit windows builds 2019-05-06 11:28:13 +03:00
Joonas Rikkonen 44001459c0 (ef6edf745) Fixed remote characters frequently getting stuck to the ragdoll state in multiplayer. Happened because the characters are forced to stay in ragdoll mode if they're moving more than 1 m/s, and if the character stops being ragdolled server-side and starts moving, the movement will prevent it from going back to normal state client-side. Now the client will simply determine the ragdoll state based on the ragdoll input from the server. 2019-05-06 11:24:37 +03:00
Joonas Rikkonen 2f0e7605c8 (b39fb8cf6) 32-bit freetype6.dll 2019-05-06 11:24:00 +03:00
Joonas Rikkonen 534422abd8 (a28b86781) fixed hull sprites 2019-05-06 11:23:43 +03:00
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 063065d415 (4dd3574b6) Replaced Typhon cable holders 2019-05-03 13:57:07 +03:00
Joonas Rikkonen 8174d21468 (b3c0963ae) Replace cable holders in Humpback 2019-05-03 13:56:47 +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 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 c6b36682a8 (135f758ec) Switched all subs and shuttles to dynamic docking model. 2019-05-03 13:53:57 +03:00
Joonas Rikkonen 7545e8efec (6fc1d03cd) Fixed humpback waypoints, removed extra door 2019-05-03 13:52:32 +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 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 fbb7daed00 (0c3442136) Merge branch 'dev' into docking-interface 2019-05-03 13:41:23 +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 97c4e3019d (e268fbb97) Simplify Humpback front. Increase the front hull health from 200 to 400 for both front pieces. Update the fronts also for Orca and Dugong. 2019-04-29 21:09:33 +03:00
Joonas Rikkonen c5452048d7 (d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:08:16 +03:00
Joonas Rikkonen b3b1d1851d (eda627512) Fixed MonoKickStart files needed by the dedicated server not being copied to the output directory in release builds 2019-04-29 21:08:00 +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