Merge branch 'master' of https://bitbucket.org/Regalis11/subsurface-private
Conflicts: Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs
This commit is contained in:
@@ -63,6 +63,7 @@
|
||||
<Compile Include="Source\Characters\AI\IndoorsSteeringManager.cs" />
|
||||
<Compile Include="Source\Characters\AI\Objectives\AIObjectiveCombat.cs" />
|
||||
<Compile Include="Source\Characters\AI\Objectives\AIObjectiveContainItem.cs" />
|
||||
<Compile Include="Source\Characters\AI\Objectives\AIObjectiveFixLeaks.cs" />
|
||||
<Compile Include="Source\Characters\AI\Order.cs" />
|
||||
<Compile Include="Source\Characters\AI\CrewCommander.cs" />
|
||||
<Compile Include="Source\Characters\AI\HumanAIController.cs" />
|
||||
|
||||
Reference in New Issue
Block a user