Joonas Rikkonen cb83984e80 (4ca668169) Fixed: Conflict

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

..

Controller.cs

(8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item).

2019-04-10 15:13:25 +03:00

Deconstructor.cs

(af16ecdfa) Merge branch 'dev' into human-ai

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

Engine.cs

(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00

Fabricator.cs

(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00

MiniMap.cs

(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00

Pump.cs

(4ca668169) Fixed: Conflict

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

Reactor.cs

(4ca668169) Fixed: Conflict

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

Sonar.cs

(e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai

2019-05-16 05:30:39 +03:00

Steering.cs

(d74fee449) Revert "Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons."

2019-05-16 05:25:20 +03:00