epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6906 from reaperrr/common-10

Browse Source 
Moved LoadScreens and some Warheads to Mods.Common
This commit is contained in:
obrakmann
2014-11-08 22:23:44 +01:00
parent 01708b60a7 52bb0e8c6b
commit 11a5a658e2
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/DefaultLoadScreen.cs → OpenRA.Mods.Common/DefaultLoadScreen.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class DefaultLoadScreen : ILoadScreen
{

2
OpenRA.Mods.RA/LoadWidgetAtGameStart.cs → OpenRA.Mods.Common/LoadWidgetAtGameStart.cs
View File

@@ -12,7 +12,7 @@ using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class LoadWidgetAtGameStartInfo : ITraitInfo
{

2
OpenRA.Mods.RA/NullLoadScreen.cs → OpenRA.Mods.Common/NullLoadScreen.cs
View File

@@ -11,7 +11,7 @@
using System.Collections.Generic;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class NullLoadScreen : ILoadScreen
{

6
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -49,6 +49,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CommonTraitsInterfaces.cs" />
<Compile Include="DefaultLoadScreen.cs" />
<Compile Include="Effects\Beacon.cs" />
<Compile Include="Effects\Bullet.cs" />
<Compile Include="Effects\Contrail.cs" />
@@ -75,10 +76,12 @@
<Compile Include="Graphics\TextRenderable.cs" />
<Compile Include="Graphics\VoxelActorPreview.cs" />
<Compile Include="Graphics\VoxelRenderable.cs" />
<Compile Include="LoadWidgetAtGameStart.cs" />
<Compile Include="ModChooserLoadScreen.cs" />
<Compile Include="Modifiers\DisabledOverlay.cs" />
<Compile Include="Modifiers\HiddenUnderFog.cs" />
<Compile Include="Modifiers\UpgradeOverlay.cs" />
<Compile Include="NullLoadScreen.cs" />
<Compile Include="Orders\DeployOrderTargeter.cs" />
<Compile Include="Orders\EnterAlliedActorTargeter.cs" />
<Compile Include="Orders\UnitOrderTargeter.cs" />
@@ -118,7 +121,10 @@
<Compile Include="UtilityCommands\UpgradeMapCommand.cs" />
<Compile Include="UtilityCommands\UpgradeModCommand.cs" />
<Compile Include="UtilityCommands\UpgradeRules.cs" />
<Compile Include="Warheads\CreateEffectWarhead.cs" />
<Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
<Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
<Compile Include="Warheads\SpreadDamageWarhead.cs" />
<Compile Include="Widgets\ConfirmationDialogs.cs" />
<Compile Include="Widgets\HueSliderWidget.cs" />
<Compile Include="Widgets\LabelWithTooltipWidget.cs" />

2
OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs → OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.GameRules;
using OpenRA.Traits;
using OpenRA.Mods.Common.Effects;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class CreateEffectWarhead : Warhead
{

2
OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs → OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class HealthPercentageDamageWarhead : DamageWarhead
{

2
OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs → OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class SpreadDamageWarhead : DamageWarhead
{

10
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -236,8 +236,6 @@
<Compile Include="Move\PathFinder.cs" />
<Compile Include="Move\PathSearch.cs" />
<Compile Include="NukePaletteEffect.cs" />
<Compile Include="NullLoadScreen.cs" />
<Compile Include="LoadWidgetAtGameStart.cs" />
<Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
<Compile Include="Orders\PowerDownOrderGenerator.cs" />
<Compile Include="Orders\RepairOrderGenerator.cs" />
@@ -258,9 +256,6 @@
<Compile Include="PortableChrono.cs" />
<Compile Include="Scripting\Properties\GuardProperties.cs" />
<Compile Include="Scripting\Properties\PlayerProperties.cs" />
<Compile Include="Warheads\DestroyResourceWarhead.cs" />
<Compile Include="Warheads\CreateEffectWarhead.cs" />
<Compile Include="Warheads\CreateResourceWarhead.cs" />
<Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
<Compile Include="Player\TechTree.cs" />
<Compile Include="PrimaryBuilding.cs" />
@@ -268,7 +263,6 @@
<Compile Include="ProductionBar.cs" />
<Compile Include="ProximityCaptor.cs" />
<Compile Include="ProximityCapturable.cs" />
<Compile Include="DefaultLoadScreen.cs" />
<Compile Include="RadarColorFromTerrain.cs" />
<Compile Include="Reloads.cs" />
<Compile Include="RenderDetectionCircle.cs" />
@@ -477,9 +471,9 @@
<Compile Include="Player\GlobalUpgradeManager.cs" />
<Compile Include="GainsStatUpgrades.cs" />
<Compile Include="Player\Extensions.cs" />
<Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
<Compile Include="Warheads\CreateResourceWarhead.cs" />
<Compile Include="Warheads\DestroyResourceWarhead.cs" />
<Compile Include="Warheads\PerCellDamageWarhead.cs" />
<Compile Include="Warheads\SpreadDamageWarhead.cs" />
<Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
<Compile Include="Scripting\Global\DateTimeGlobal.cs" />
<Compile Include="Scripting\Properties\HarvesterProperties.cs" />