Joonas Rikkonen cb83984e80 (4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00

..

Holdable.cs

(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00

LevelResource.cs

(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00

MeleeWeapon.cs

(a8f2f39bd) The ai now sorts the weapons by the combat priority value, which can be set in xml. Ranged weapons are favored. The required items are also taken into account.

2019-05-16 05:19:14 +03:00

Pickable.cs

(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00

Propulsion.cs

(7d0cf0d4f) Clamp forces in a bunch of more places where forces are applied to bodies

2019-04-03 16:21:38 +03:00

RangedWeapon.cs

(a8f2f39bd) The ai now sorts the weapons by the combat priority value, which can be set in xml. Ranged weapons are favored. The required items are also taken into account.

2019-05-16 05:19:14 +03:00

RepairTool.cs

(4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00

Throwable.cs

(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00