Merge pull request #9593 from huwpascoe/HealthTrait

Moved Health to OpenRA.Mods.Common
2015-10-20 20:59:04 +01:00
parent 03e47a9cb7 c95fc793e4
commit 983032205f
13 changed files with 63 additions and 47 deletions
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -171,7 +171,6 @@
    <Compile Include="TraitDictionary.cs" />
    <Compile Include="Traits\DrawLineToTarget.cs" />
    <Compile Include="Traits\EditorTilesetFilter.cs" />
-    <Compile Include="Traits\Health.cs" />
    <Compile Include="Traits\LintAttributes.cs" />
    <Compile Include="Traits\RejectsOrders.cs" />
    <Compile Include="Traits\Player\DeveloperMode.cs" />