 Joonas Rikkonen
|
3877c18d0c
|
(c15419d90) Changelog additions + merge fix
|
2019-04-08 19:20:05 +03:00 |
|
|
Joonas Rikkonen
|
71d546ff7f
|
(f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 19:17:50 +03:00 |
|
|
Joonas Rikkonen
|
5a9b681c13
|
(8c99939f6) Fix bots dropping from ladders if there is a non-ladder node in the path (Especially on Typhon). The distance check was incorrect, but after correcting it, I decided that it probably causes more issues than it solves. If there is one node in the path that is not in the current ladder, but the node after that is, we can just follow the path to the node that is on the ladders. Remove an unnecessary IgnorePlatforms assignment. It's handled in the HumanAIController.
|
2019-04-08 19:17:35 +03:00 |
|
|
Joonas Rikkonen
|
eb6e919c66
|
(f832e24f5) Prevent bots jumping from too high.
|
2019-04-08 19:17:20 +03:00 |
|
|
Joonas Rikkonen
|
9a829206af
|
(2c264b075) Improve readability (no functional changes).
|
2019-04-08 19:17:06 +03:00 |
|
|
Joonas Rikkonen
|
5876097da4
|
(4b07ea1ca) Removed unused method from HumanoidAnimController
|
2019-04-08 19:16:51 +03:00 |
|
|
Joonas Rikkonen
|
28f2c00255
|
(02bbfb6a3) Let the ai objectives handle waiting (after switching characters). Currently only idle objective uses wait timer, others ignore it. Reduce the wait time from 20 to 10 secs.
|
2019-04-08 15:59:36 +03:00 |
|
|
Joonas Rikkonen
|
1ffe3e4ec0
|
(6b95aa87e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 13:36:44 +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
|
10776572d2
|
(0eef99a8b) Don't change targets, wander or stay still in ladders. Don't stay still in water. Improve bot behavior in close spaces.
|
2019-04-08 13:36:16 +03:00 |
|
|
Joonas Rikkonen
|
9c07ebda53
|
(8311f9380) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 13:36:00 +03:00 |
|
|
Joonas Rikkonen
|
d28b04ed3b
|
(30308f7e4) Fixed players being able to overwrite vanilla content when the vanilla package is not selected
|
2019-04-08 13:35:46 +03:00 |
|
|
Joonas Rikkonen
|
8a227a4f2c
|
(570318151) Cleanup.
|
2019-04-08 13:34:48 +03:00 |
|
|
Joonas Rikkonen
|
935cd6bc65
|
(235745275) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 12:06:09 +03:00 |
|
|
Joonas Rikkonen
|
36d6cdcca4
|
(2f52a4bfd) Fix the raycast check in for the end nodes. Partial fix to #1343.
|
2019-04-08 12:02:30 +03:00 |
|
|
Joonas Rikkonen
|
47ee14227e
|
(551008fc1) Abandon FixLeakObjective when the goto subobjective cannot be completed. Reset AIObjectiveLoops when the objective is activated or added. Don't clear ignored targets periodically by default. Calculate AIObjectiveGoTo CloseEnough when the objective is created. Don't use arm length in CloseEnough, because it's not used in range checks. Partial fixes to #1343.
|
2019-04-08 12:01:54 +03:00 |
|
|
Joonas Rikkonen
|
55eecc49d8
|
(842e6af33) Human AI needs AITargets too (not much, but they are still useful). Therefor add Type property to AITargets, so that certain targets can be treated human only and others enemy only. Implement target filtering in the Enemy AI Controller.
|
2019-04-08 11:58:50 +03:00 |
|
|
Joonas Rikkonen
|
33b205b1c7
|
(3300d3915) When searching for a new room to move to, AIObjectiveIdle only attempts to find a path to one potential room per frame. Fixes lag spikes caused by idling NPCs (was particularly noticeable if the character was in a room with no way out). Closes #1397
|
2019-04-07 21:44:15 +03:00 |
|
|
Joonas Rikkonen
|
7ffcee3075
|
(df011a643) Fixed affliction source not being copied when creating a list of merged afflictions. Prevented affliction-based causes of death from getting the "killer" field assigned correctly, which prevented some afflictions from being unlocked.
|
2019-04-07 13:41:34 +03:00 |
|
|
Joonas Rikkonen
|
1297127ae2
|
(0be4bd31d) Todo note about idling characters killing the framerate (see #1397)
|
2019-04-07 13:41:07 +03:00 |
|
|
Joonas Rikkonen
|
d15a88c619
|
(3e8bdbb0a) v0.8.9.9 + merge fix
|
2019-04-06 17:54:39 +03:00 |
|
|
Joonas Rikkonen
|
14d0daf16d
|
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:49:31 +03:00 |
|
|
Joonas Rikkonen
|
45c1ed499a
|
(e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used
|
2019-04-06 17:49:18 +03:00 |
|
|
Joonas Rikkonen
|
0725e1c4b2
|
(1d7e76d1f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:46:55 +03:00 |
|
|
Joonas Rikkonen
|
f958f5fb44
|
(248ac43ed) Added inventory icons for Physicorium items armor, helmet, ammunition box and spear + normal and explosive spear (not yet implemented)
|
2019-04-06 17:46:42 +03:00 |
|
|
Joonas Rikkonen
|
6fed28e80b
|
(b00ce5ec2) Fixed character's feet levitating when standing at the base of a staircase without climbing it. Closes #1275
|
2019-04-05 16:21:41 +03:00 |
|
|
Joonas Rikkonen
|
a3ff707a31
|
(cf99ace8a) Fix bots entering the combat state if taking damage from falling etc.
|
2019-04-05 16:21:12 +03:00 |
|
|
Joonas Rikkonen
|
69c414dfc9
|
(34cca982f) Steering tweaks that should fix bots not being able to proceed on ladders when the next waypoint is not on the ladder but the one after that is.
|
2019-04-05 16:20:58 +03:00 |
|
|
Joonas Rikkonen
|
25768d8845
|
(4b54fb4bf) Refactor AIObjectiveCombat and the reactions to the damage. Fixes bots not reacting to any damage done with repair tools. Now they should flee (but not retaliate).
|
2019-04-05 16:20:11 +03:00 |
|
|
Joonas Rikkonen
|
501a114000
|
(4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:19:55 +03:00 |
|
|
Joonas Rikkonen
|
d7364171fb
|
(e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub
|
2019-04-05 16:19:40 +03:00 |
|
|
Joonas Rikkonen
|
161f725778
|
(2b36813ef) Added Back button to submarine editor
|
2019-04-05 16:19:07 +03:00 |
|
|
Joonas Rikkonen
|
8f42801c7a
|
(2d473d38a) Add RequireAimToUse checks for being logical and for future. Shouldn't have any functional implications in the current version, but we could have RepairTools or Weapons that don't require aiming.
|
2019-04-05 16:18:52 +03:00 |
|
|
Joonas Rikkonen
|
350e6d6036
|
(5c39920a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:18:37 +03:00 |
|
|
Joonas Rikkonen
|
aef3a96d60
|
(cb01ae2fe) Small adjustments to Sub Editor entity list
|
2019-04-05 16:18:23 +03:00 |
|
|
Joonas Rikkonen
|
f6bf7d9219
|
(dc09b0993) Fix bots not aiming with the welding tool when trying to repair, because of a dump error when checking the RequireAimToUse property.
|
2019-04-05 16:18:08 +03:00 |
|
|
Joonas Rikkonen
|
29e979d60a
|
(7840e7e91) Fixed characters selecting entities when dragging and dropping items into them when the Select input is bind to Mouse1.
|
2019-04-05 16:13:27 +03:00 |
|
|
Joonas Rikkonen
|
7007804063
|
(1c5ab9230) Enemies don't attack outposts or targets inside it anymore.
|
2019-04-05 16:11:44 +03:00 |
|
|
Joonas Rikkonen
|
e84203781e
|
(e1b4346f3) Fix enemies not being able to get into the sub via vertical hatches. Removed the velocity manipulation, because it only caused issues.
|
2019-04-05 16:11:30 +03:00 |
|
|
Joonas Rikkonen
|
709d9e44ab
|
(541e3ffbe) Check that the mask is equipped in the head before trying to unequip.
|
2019-04-04 11:12:18 +03:00 |
|
|
Joonas Rikkonen
|
7126a60b7a
|
(558e47075) -Reduced condition loss per use for plastiseal (-100 to -25), reduced the effect a bit (TODO: add more plastiseal to subs) -Reduced condition loss per use for antibiotic glue (-100 -> -50) -Implemented crafting recipes for antidotes -Made spacing more uniform in medical xml
|
2019-04-04 11:12:05 +03:00 |
|
|
Joonas Rikkonen
|
4e45876a6c
|
(502e453a9) Instead of placing the weapon to a slot 3, find the allowed hand slots.
|
2019-04-04 11:11:51 +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 |
|
|
Joonas Rikkonen
|
a3425a0432
|
(bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row
|
2019-04-04 11:08:49 +03:00 |
|
|
Joonas Rikkonen
|
7eb03ea6b3
|
(874c38a79) Show keybindings for use or shoot in the tooltips.
|
2019-04-04 11:08:33 +03:00 |
|
|
Joonas Rikkonen
|
d4752bb6a0
|
(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.
|
2019-04-04 11:08:18 +03:00 |
|
|
Joonas Rikkonen
|
7491b06a5d
|
(bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults.
|
2019-04-04 11:08:02 +03:00 |
|