Commit Graph

53 Commits

Author SHA1 Message Date
Joonas Rikkonen 61f5ccc71d (c93eaea48) Merge branch 'human-ai' into dev 2019-05-16 06:14:43 +03:00
Joonas Rikkonen 9c964b7843 (7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order. 2019-05-16 06:14:25 +03:00
Joonas Rikkonen 5f524ddd3f (457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor 2019-05-16 06:13:49 +03:00
Joonas Rikkonen ce7b9c4f52 (94ad97066) Refactor combat objective. The bots should now be able to reload and seek more ammunition. When they run out of ammunition, they first try to use another weapon and only if no other weapon is found, they seek more ammunition. Had to change the contain item and get item objectives a bit. Hopefully doesn't break things too much. 2019-05-16 06:13:15 +03:00
Joonas Rikkonen db4e3a6725 (d779d70f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:07:34 +03:00
Joonas Rikkonen b7ae35d942 (332837e80) Fixed: salvagenasonovartifactruin not having translations, using salvagenasonovartifactcave identifier instead 2019-05-16 06:07:17 +03:00
Joonas Rikkonen 5c90e26209 (ef5df81dc) Fixed personal slots not being visible in the sub editor 2019-05-16 06:06:24 +03:00
Joonas Rikkonen ca71fe5955 (a2700bdb3) Fixed crashing if there's an empty diving suit (or any other item with one empty inventory slot) in the personal slots while they're hidden 2019-05-16 06:05:50 +03:00
Joonas Rikkonen 108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +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 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 67a0636470 (b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:09:50 +03:00
Joonas Rikkonen 2554e17189 (621326f05) Don't flee when taking damage if part of a swarm. 2019-04-29 21:08:32 +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 788c51143b (55f425031) Tutorial outpost visual pass 2019-04-29 21:06:26 +03:00
Joonas Rikkonen 205f808f84 (5b377538a) Adjust crawler attacks a bit. 2019-04-29 21:05:53 +03:00
Joonas Rikkonen 33747a63b0 (3340f2f90) Don't do impact damage to structures in Structure.OnWallCollision. Impact damage was disabled when a character hits the sub from the outside (implemented in SubmarineBody), but should've been done here as well. 2019-04-29 21:05:21 +03:00
Joonas Rikkonen 69c4b9a74f (8e2e25260) Spawn multiple monsters using the same spatial and temporal spreading logic as in events. 2019-04-29 21:05:06 +03:00
Joonas Rikkonen dfb664e10f (d7ca2a2a8) Lock inventory when using a controller 2019-04-29 21:04:36 +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 d3687bc3ef (21015c117) Placeholder icon for the OuterClother slot (see #28) 2019-04-25 18:12:02 +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 dd371c29cc (6844335fb) Fixed incorrect text tag in submarine save dialog 2019-04-16 17:10:25 +03:00
Joonas Rikkonen 9e3d13b1c9 (3730c56ab) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:10:10 +03:00
Joonas Rikkonen 9ec8659c89 (410101a21) Add an extension method for replacing strings if a condition is met. 2019-04-16 17:09:41 +03:00
Joonas Rikkonen f2d0d3a56a (94d321ddf) Automatically open the personal slots if an item in the slots is running out of battery/fuel/etc 2019-04-16 17:09:26 +03:00
Joonas Rikkonen f667455659 (ba5343957) Button for hiding personal inventory slots 2019-04-16 17:08:58 +03:00
Joonas Rikkonen c1c869b944 (321793927) Always show the outer clothes slot. Reordered the slots so that the most frequently used ones are closer to the "main" inventory. 2019-04-10 13:24:21 +03:00
Joonas Rikkonen 2efcd200f5 (17490598f) Don't allow putting items into locked inventories by double-clicking (causes them to be dropped in multiplayer) 2019-04-08 13:36:30 +03:00
Joonas Rikkonen 044fd3344b 2f107db...5202af9 2019-03-18 21:42:26 +02:00
Joonas Rikkonen 6c0679c297 38f1ddb...178a853: v0.8.9.1, removed content folder 2019-03-18 20:39:27 +02:00
Joonas Rikkonen 07d3d69040 Equipped items can be swapped by double-clicking, fixed inventories getting messed up when swapping multi-slot items fails (e.g. drag a jumpsuit on an equipped diving suit). 2018-03-02 15:24:54 +02:00
Joonas Rikkonen 4d01aba0f1 Fixed subinventory staying visible if the slot containing the subinventory gets merged while it's highlighted (e.g. put a stun baton in either hand and swap it with a two-hand item) 2018-02-13 13:49:41 +02:00
Joonas Rikkonen dcb6de32c0 Some more hard-coded text removal 2018-01-31 19:01:48 +02:00
Joonas Rikkonen 43d48ceb13 Fixed subinventory becoming active in the controlled character's inventory when the slot with the same index is highlighted in a grabbed character's inventory (or vice versa), fixed CPR & grab buttons being drawn on top of subinventories 2018-01-25 09:36:58 +02:00
Joonas Rikkonen 7187c277e7 Merge branch 'master' into moStuff 2018-01-09 10:38:06 +02:00
Joonas Rikkonen c77c598cb6 Fixed items being dropped when attempting to place them in an itemcontainer slot that's on a normal inventory slot. Closes #200 2017-12-31 01:59:49 +02:00
Alex Noir 60329fb0d1 Fixed missing clientpermissions.xml preventing hosting
Fixed double-clicking items in corpses putting them in their hands instead of your inventory
Fixed game over/round end music not playing in multiplayer
Added Item Combinations for things like chemicals, etc. - this transfers condition from one item to another
Added game over text to multiplayer round summary
2017-12-23 16:59:08 +03:00
Alex Noir 760452170e Implement ID card slot and ID card description that states the owner and his job in preparation for identity system 2017-12-14 22:57:42 +03:00
Joonas Rikkonen 98b4b904d4 Inventory slots are highlighted if the cursor is within 5 pixels of the rect. The spacing between inventory slots is 10 px, so now items can't be accidentally dropped by releasing the cursor between slots. 2017-08-11 17:49:43 +03:00