diff --git a/Barotrauma/Barotrauma.csproj b/BarotraumaClient/BarotraumaClient.csproj similarity index 83% rename from Barotrauma/Barotrauma.csproj rename to BarotraumaClient/BarotraumaClient.csproj index 0c0d2c2fe..2e5256448 100644 --- a/Barotrauma/Barotrauma.csproj +++ b/BarotraumaClient/BarotraumaClient.csproj @@ -35,7 +35,7 @@ full false bin\Windows\Debug\ - DEBUG;TRACE;WINDOWS + TRACE;DEBUG;WINDOWS;CLIENT prompt 4 false @@ -45,7 +45,7 @@ pdbonly true bin\Windows\Release\ - TRACE;WINDOWS + TRACE;WINDOWS;CLIENT + \ No newline at end of file diff --git a/BarotraumaServer/Properties/AssemblyInfo.cs b/BarotraumaServer/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..86c1989f6 --- /dev/null +++ b/BarotraumaServer/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Barotrauma Dedicated Server")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("Copyright © Undertow Games 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("85232b20-074d-4723-b0c6-91495391e448")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.6.0.1000")] +[assembly: AssemblyFileVersion("0.6.0.1000")] diff --git a/BarotraumaShared/BarotraumaShared.projitems b/BarotraumaShared/BarotraumaShared.projitems new file mode 100644 index 000000000..986e54c9d --- /dev/null +++ b/BarotraumaShared/BarotraumaShared.projitems @@ -0,0 +1,222 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 561357c2-db28-4e01-b275-6bf545f70491 + + + BarotraumaShared + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BarotraumaShared/BarotraumaShared.shproj b/BarotraumaShared/BarotraumaShared.shproj new file mode 100644 index 000000000..25d6e31ed --- /dev/null +++ b/BarotraumaShared/BarotraumaShared.shproj @@ -0,0 +1,13 @@ + + + + 561357c2-db28-4e01-b275-6bf545f70491 + 14.0 + + + + + + + + diff --git a/Barotrauma/Source/Characters/AI/AIController.cs b/BarotraumaShared/Source/Characters/AI/AIController.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/AIController.cs rename to BarotraumaShared/Source/Characters/AI/AIController.cs diff --git a/Barotrauma/Source/Characters/AI/AITarget.cs b/BarotraumaShared/Source/Characters/AI/AITarget.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/AITarget.cs rename to BarotraumaShared/Source/Characters/AI/AITarget.cs diff --git a/Barotrauma/Source/Characters/AI/CrewCommander.cs b/BarotraumaShared/Source/Characters/AI/CrewCommander.cs similarity index 99% rename from Barotrauma/Source/Characters/AI/CrewCommander.cs rename to BarotraumaShared/Source/Characters/AI/CrewCommander.cs index 90eaf2da9..71f7a3b44 100644 --- a/Barotrauma/Source/Characters/AI/CrewCommander.cs +++ b/BarotraumaShared/Source/Characters/AI/CrewCommander.cs @@ -1,4 +1,5 @@ -using Microsoft.Xna.Framework; +#if CLIENT +using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using System; using System.Linq; @@ -311,3 +312,4 @@ namespace Barotrauma } } } +#endif diff --git a/Barotrauma/Source/Characters/AI/EnemyAIController.cs b/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/EnemyAIController.cs rename to BarotraumaShared/Source/Characters/AI/EnemyAIController.cs diff --git a/Barotrauma/Source/Characters/AI/HumanAIController.cs b/BarotraumaShared/Source/Characters/AI/HumanAIController.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/HumanAIController.cs rename to BarotraumaShared/Source/Characters/AI/HumanAIController.cs diff --git a/Barotrauma/Source/Characters/AI/ISteerable.cs b/BarotraumaShared/Source/Characters/AI/ISteerable.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/ISteerable.cs rename to BarotraumaShared/Source/Characters/AI/ISteerable.cs diff --git a/Barotrauma/Source/Characters/AI/IndoorsSteeringManager.cs b/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/IndoorsSteeringManager.cs rename to BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjective.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjective.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveCombat.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveCombat.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveIdle.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveIdle.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveManager.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveManager.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveRescue.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveRescue.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs diff --git a/Barotrauma/Source/Characters/AI/Objectives/AIObjectiveRescureAll.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescureAll.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Objectives/AIObjectiveRescureAll.cs rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescureAll.cs diff --git a/Barotrauma/Source/Characters/AI/Order.cs b/BarotraumaShared/Source/Characters/AI/Order.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/Order.cs rename to BarotraumaShared/Source/Characters/AI/Order.cs diff --git a/Barotrauma/Source/Characters/AI/PathFinder.cs b/BarotraumaShared/Source/Characters/AI/PathFinder.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/PathFinder.cs rename to BarotraumaShared/Source/Characters/AI/PathFinder.cs diff --git a/Barotrauma/Source/Characters/AI/SteeringManager.cs b/BarotraumaShared/Source/Characters/AI/SteeringManager.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/SteeringManager.cs rename to BarotraumaShared/Source/Characters/AI/SteeringManager.cs diff --git a/Barotrauma/Source/Characters/AI/SteeringPath.cs b/BarotraumaShared/Source/Characters/AI/SteeringPath.cs similarity index 100% rename from Barotrauma/Source/Characters/AI/SteeringPath.cs rename to BarotraumaShared/Source/Characters/AI/SteeringPath.cs diff --git a/Barotrauma/Source/Characters/AICharacter.cs b/BarotraumaShared/Source/Characters/AICharacter.cs similarity index 100% rename from Barotrauma/Source/Characters/AICharacter.cs rename to BarotraumaShared/Source/Characters/AICharacter.cs diff --git a/Barotrauma/Source/Characters/Animation/AnimController.cs b/BarotraumaShared/Source/Characters/Animation/AnimController.cs similarity index 100% rename from Barotrauma/Source/Characters/Animation/AnimController.cs rename to BarotraumaShared/Source/Characters/Animation/AnimController.cs diff --git a/Barotrauma/Source/Characters/Animation/FishAnimController.cs b/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs similarity index 100% rename from Barotrauma/Source/Characters/Animation/FishAnimController.cs rename to BarotraumaShared/Source/Characters/Animation/FishAnimController.cs diff --git a/Barotrauma/Source/Characters/Animation/HumanoidAnimController.cs b/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs similarity index 100% rename from Barotrauma/Source/Characters/Animation/HumanoidAnimController.cs rename to BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs diff --git a/Barotrauma/Source/Characters/Animation/Ragdoll.cs b/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs similarity index 100% rename from Barotrauma/Source/Characters/Animation/Ragdoll.cs rename to BarotraumaShared/Source/Characters/Animation/Ragdoll.cs diff --git a/Barotrauma/Source/Characters/Attack.cs b/BarotraumaShared/Source/Characters/Attack.cs similarity index 100% rename from Barotrauma/Source/Characters/Attack.cs rename to BarotraumaShared/Source/Characters/Attack.cs diff --git a/Barotrauma/Source/Characters/BackgroundSprite/BackgroundCreature.cs b/BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundCreature.cs similarity index 100% rename from Barotrauma/Source/Characters/BackgroundSprite/BackgroundCreature.cs rename to BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundCreature.cs diff --git a/Barotrauma/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs b/BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs similarity index 100% rename from Barotrauma/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs rename to BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs diff --git a/Barotrauma/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs b/BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs similarity index 100% rename from Barotrauma/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs rename to BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs diff --git a/Barotrauma/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs b/BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs similarity index 100% rename from Barotrauma/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs rename to BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs diff --git a/Barotrauma/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs b/BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs similarity index 100% rename from Barotrauma/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs rename to BarotraumaShared/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs diff --git a/Barotrauma/Source/Characters/Character.cs b/BarotraumaShared/Source/Characters/Character.cs similarity index 100% rename from Barotrauma/Source/Characters/Character.cs rename to BarotraumaShared/Source/Characters/Character.cs diff --git a/Barotrauma/Source/Characters/CharacterHUD.cs b/BarotraumaShared/Source/Characters/CharacterHUD.cs similarity index 100% rename from Barotrauma/Source/Characters/CharacterHUD.cs rename to BarotraumaShared/Source/Characters/CharacterHUD.cs diff --git a/Barotrauma/Source/Characters/CharacterInfo.cs b/BarotraumaShared/Source/Characters/CharacterInfo.cs similarity index 100% rename from Barotrauma/Source/Characters/CharacterInfo.cs rename to BarotraumaShared/Source/Characters/CharacterInfo.cs diff --git a/Barotrauma/Source/Characters/CharacterNetworking.cs b/BarotraumaShared/Source/Characters/CharacterNetworking.cs similarity index 100% rename from Barotrauma/Source/Characters/CharacterNetworking.cs rename to BarotraumaShared/Source/Characters/CharacterNetworking.cs diff --git a/Barotrauma/Source/Characters/CharacterSound.cs b/BarotraumaShared/Source/Characters/CharacterSound.cs similarity index 100% rename from Barotrauma/Source/Characters/CharacterSound.cs rename to BarotraumaShared/Source/Characters/CharacterSound.cs diff --git a/Barotrauma/Source/Characters/DelayedEffect.cs b/BarotraumaShared/Source/Characters/DelayedEffect.cs similarity index 100% rename from Barotrauma/Source/Characters/DelayedEffect.cs rename to BarotraumaShared/Source/Characters/DelayedEffect.cs diff --git a/Barotrauma/Source/Characters/HUDProgressBar.cs b/BarotraumaShared/Source/Characters/HUDProgressBar.cs similarity index 100% rename from Barotrauma/Source/Characters/HUDProgressBar.cs rename to BarotraumaShared/Source/Characters/HUDProgressBar.cs diff --git a/Barotrauma/Source/Characters/HuskInfection.cs b/BarotraumaShared/Source/Characters/HuskInfection.cs similarity index 100% rename from Barotrauma/Source/Characters/HuskInfection.cs rename to BarotraumaShared/Source/Characters/HuskInfection.cs diff --git a/Barotrauma/Source/Characters/Jobs/Job.cs b/BarotraumaShared/Source/Characters/Jobs/Job.cs similarity index 100% rename from Barotrauma/Source/Characters/Jobs/Job.cs rename to BarotraumaShared/Source/Characters/Jobs/Job.cs diff --git a/Barotrauma/Source/Characters/Jobs/JobPrefab.cs b/BarotraumaShared/Source/Characters/Jobs/JobPrefab.cs similarity index 100% rename from Barotrauma/Source/Characters/Jobs/JobPrefab.cs rename to BarotraumaShared/Source/Characters/Jobs/JobPrefab.cs diff --git a/Barotrauma/Source/Characters/Jobs/Skill.cs b/BarotraumaShared/Source/Characters/Jobs/Skill.cs similarity index 100% rename from Barotrauma/Source/Characters/Jobs/Skill.cs rename to BarotraumaShared/Source/Characters/Jobs/Skill.cs diff --git a/Barotrauma/Source/Characters/Jobs/SkillPrefab.cs b/BarotraumaShared/Source/Characters/Jobs/SkillPrefab.cs similarity index 100% rename from Barotrauma/Source/Characters/Jobs/SkillPrefab.cs rename to BarotraumaShared/Source/Characters/Jobs/SkillPrefab.cs diff --git a/Barotrauma/Source/Characters/Limb.cs b/BarotraumaShared/Source/Characters/Limb.cs similarity index 100% rename from Barotrauma/Source/Characters/Limb.cs rename to BarotraumaShared/Source/Characters/Limb.cs diff --git a/Barotrauma/Source/Characters/StatusEffect.cs b/BarotraumaShared/Source/Characters/StatusEffect.cs similarity index 100% rename from Barotrauma/Source/Characters/StatusEffect.cs rename to BarotraumaShared/Source/Characters/StatusEffect.cs diff --git a/Barotrauma/Source/ContentPackage.cs b/BarotraumaShared/Source/ContentPackage.cs similarity index 100% rename from Barotrauma/Source/ContentPackage.cs rename to BarotraumaShared/Source/ContentPackage.cs diff --git a/Barotrauma/Source/CoroutineManager.cs b/BarotraumaShared/Source/CoroutineManager.cs similarity index 100% rename from Barotrauma/Source/CoroutineManager.cs rename to BarotraumaShared/Source/CoroutineManager.cs diff --git a/Barotrauma/Source/DebugConsole.cs b/BarotraumaShared/Source/DebugConsole.cs similarity index 100% rename from Barotrauma/Source/DebugConsole.cs rename to BarotraumaShared/Source/DebugConsole.cs diff --git a/Barotrauma/Source/Events/ArtifactEvent.cs b/BarotraumaShared/Source/Events/ArtifactEvent.cs similarity index 100% rename from Barotrauma/Source/Events/ArtifactEvent.cs rename to BarotraumaShared/Source/Events/ArtifactEvent.cs diff --git a/Barotrauma/Source/Events/Missions/CargoMission.cs b/BarotraumaShared/Source/Events/Missions/CargoMission.cs similarity index 100% rename from Barotrauma/Source/Events/Missions/CargoMission.cs rename to BarotraumaShared/Source/Events/Missions/CargoMission.cs diff --git a/Barotrauma/Source/Events/Missions/CombatMission.cs b/BarotraumaShared/Source/Events/Missions/CombatMission.cs similarity index 100% rename from Barotrauma/Source/Events/Missions/CombatMission.cs rename to BarotraumaShared/Source/Events/Missions/CombatMission.cs diff --git a/Barotrauma/Source/Events/Missions/Mission.cs b/BarotraumaShared/Source/Events/Missions/Mission.cs similarity index 100% rename from Barotrauma/Source/Events/Missions/Mission.cs rename to BarotraumaShared/Source/Events/Missions/Mission.cs diff --git a/Barotrauma/Source/Events/Missions/MonsterMission.cs b/BarotraumaShared/Source/Events/Missions/MonsterMission.cs similarity index 100% rename from Barotrauma/Source/Events/Missions/MonsterMission.cs rename to BarotraumaShared/Source/Events/Missions/MonsterMission.cs diff --git a/Barotrauma/Source/Events/Missions/SalvageMission.cs b/BarotraumaShared/Source/Events/Missions/SalvageMission.cs similarity index 100% rename from Barotrauma/Source/Events/Missions/SalvageMission.cs rename to BarotraumaShared/Source/Events/Missions/SalvageMission.cs diff --git a/Barotrauma/Source/Events/MonsterEvent.cs b/BarotraumaShared/Source/Events/MonsterEvent.cs similarity index 100% rename from Barotrauma/Source/Events/MonsterEvent.cs rename to BarotraumaShared/Source/Events/MonsterEvent.cs diff --git a/Barotrauma/Source/Events/PropertyTask.cs b/BarotraumaShared/Source/Events/PropertyTask.cs similarity index 100% rename from Barotrauma/Source/Events/PropertyTask.cs rename to BarotraumaShared/Source/Events/PropertyTask.cs diff --git a/Barotrauma/Source/Events/RepairTask.cs b/BarotraumaShared/Source/Events/RepairTask.cs similarity index 100% rename from Barotrauma/Source/Events/RepairTask.cs rename to BarotraumaShared/Source/Events/RepairTask.cs diff --git a/Barotrauma/Source/Events/ScriptedEvent.cs b/BarotraumaShared/Source/Events/ScriptedEvent.cs similarity index 100% rename from Barotrauma/Source/Events/ScriptedEvent.cs rename to BarotraumaShared/Source/Events/ScriptedEvent.cs diff --git a/Barotrauma/Source/Events/ScriptedTask.cs b/BarotraumaShared/Source/Events/ScriptedTask.cs similarity index 100% rename from Barotrauma/Source/Events/ScriptedTask.cs rename to BarotraumaShared/Source/Events/ScriptedTask.cs diff --git a/Barotrauma/Source/Events/Task.cs b/BarotraumaShared/Source/Events/Task.cs similarity index 100% rename from Barotrauma/Source/Events/Task.cs rename to BarotraumaShared/Source/Events/Task.cs diff --git a/Barotrauma/Source/Events/TaskManager.cs b/BarotraumaShared/Source/Events/TaskManager.cs similarity index 100% rename from Barotrauma/Source/Events/TaskManager.cs rename to BarotraumaShared/Source/Events/TaskManager.cs diff --git a/Barotrauma/Source/FrameCounter.cs b/BarotraumaShared/Source/FrameCounter.cs similarity index 100% rename from Barotrauma/Source/FrameCounter.cs rename to BarotraumaShared/Source/FrameCounter.cs diff --git a/Barotrauma/Source/GameMain.cs b/BarotraumaShared/Source/GameMain.cs similarity index 99% rename from Barotrauma/Source/GameMain.cs rename to BarotraumaShared/Source/GameMain.cs index 9b3759882..e89728181 100644 --- a/Barotrauma/Source/GameMain.cs +++ b/BarotraumaShared/Source/GameMain.cs @@ -3,15 +3,16 @@ using System.Diagnostics; using System.Reflection; using FarseerPhysics; using FarseerPhysics.Dynamics; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; using Barotrauma.Networking; using Barotrauma.Particles; using System.Collections.Generic; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; namespace Barotrauma { +#if CLIENT class GameMain : Game { public static bool DebugDraw; @@ -415,4 +416,5 @@ namespace Barotrauma } } -} \ No newline at end of file +#endif +} diff --git a/Barotrauma/Source/GameSession/CargoManager.cs b/BarotraumaShared/Source/GameSession/CargoManager.cs similarity index 100% rename from Barotrauma/Source/GameSession/CargoManager.cs rename to BarotraumaShared/Source/GameSession/CargoManager.cs diff --git a/Barotrauma/Source/GameSession/CrewManager.cs b/BarotraumaShared/Source/GameSession/CrewManager.cs similarity index 100% rename from Barotrauma/Source/GameSession/CrewManager.cs rename to BarotraumaShared/Source/GameSession/CrewManager.cs diff --git a/Barotrauma/Source/GameSession/GameModes/GameMode.cs b/BarotraumaShared/Source/GameSession/GameModes/GameMode.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/GameMode.cs rename to BarotraumaShared/Source/GameSession/GameModes/GameMode.cs diff --git a/Barotrauma/Source/GameSession/GameModes/GameModePreset.cs b/BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/GameModePreset.cs rename to BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs diff --git a/Barotrauma/Source/GameSession/GameModes/MissionMode.cs b/BarotraumaShared/Source/GameSession/GameModes/MissionMode.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/MissionMode.cs rename to BarotraumaShared/Source/GameSession/GameModes/MissionMode.cs diff --git a/Barotrauma/Source/GameSession/GameModes/SinglePlayerMode.cs b/BarotraumaShared/Source/GameSession/GameModes/SinglePlayerMode.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/SinglePlayerMode.cs rename to BarotraumaShared/Source/GameSession/GameModes/SinglePlayerMode.cs diff --git a/Barotrauma/Source/GameSession/GameModes/TraitorManager.cs b/BarotraumaShared/Source/GameSession/GameModes/TraitorManager.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/TraitorManager.cs rename to BarotraumaShared/Source/GameSession/GameModes/TraitorManager.cs diff --git a/Barotrauma/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs b/BarotraumaShared/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs rename to BarotraumaShared/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs diff --git a/Barotrauma/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs b/BarotraumaShared/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs rename to BarotraumaShared/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs diff --git a/Barotrauma/Source/GameSession/GameModes/Tutorials/TutorialMode.cs b/BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialMode.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/Tutorials/TutorialMode.cs rename to BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialMode.cs diff --git a/Barotrauma/Source/GameSession/GameModes/Tutorials/TutorialType.cs b/BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialType.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameModes/Tutorials/TutorialType.cs rename to BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialType.cs diff --git a/Barotrauma/Source/GameSession/GameSession.cs b/BarotraumaShared/Source/GameSession/GameSession.cs similarity index 100% rename from Barotrauma/Source/GameSession/GameSession.cs rename to BarotraumaShared/Source/GameSession/GameSession.cs diff --git a/Barotrauma/Source/GameSession/HireManager.cs b/BarotraumaShared/Source/GameSession/HireManager.cs similarity index 100% rename from Barotrauma/Source/GameSession/HireManager.cs rename to BarotraumaShared/Source/GameSession/HireManager.cs diff --git a/Barotrauma/Source/GameSession/InfoTextManager.cs b/BarotraumaShared/Source/GameSession/InfoTextManager.cs similarity index 100% rename from Barotrauma/Source/GameSession/InfoTextManager.cs rename to BarotraumaShared/Source/GameSession/InfoTextManager.cs diff --git a/Barotrauma/Source/GameSession/ShiftSummary.cs b/BarotraumaShared/Source/GameSession/ShiftSummary.cs similarity index 100% rename from Barotrauma/Source/GameSession/ShiftSummary.cs rename to BarotraumaShared/Source/GameSession/ShiftSummary.cs diff --git a/Barotrauma/Source/GameSettings.cs b/BarotraumaShared/Source/GameSettings.cs similarity index 100% rename from Barotrauma/Source/GameSettings.cs rename to BarotraumaShared/Source/GameSettings.cs diff --git a/Barotrauma/Source/IPropertyObject.cs b/BarotraumaShared/Source/IPropertyObject.cs similarity index 100% rename from Barotrauma/Source/IPropertyObject.cs rename to BarotraumaShared/Source/IPropertyObject.cs diff --git a/Barotrauma/Source/Items/CharacterInventory.cs b/BarotraumaShared/Source/Items/CharacterInventory.cs similarity index 100% rename from Barotrauma/Source/Items/CharacterInventory.cs rename to BarotraumaShared/Source/Items/CharacterInventory.cs diff --git a/Barotrauma/Source/Items/Components/DockingPort.cs b/BarotraumaShared/Source/Items/Components/DockingPort.cs similarity index 100% rename from Barotrauma/Source/Items/Components/DockingPort.cs rename to BarotraumaShared/Source/Items/Components/DockingPort.cs diff --git a/Barotrauma/Source/Items/Components/Door.cs b/BarotraumaShared/Source/Items/Components/Door.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Door.cs rename to BarotraumaShared/Source/Items/Components/Door.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/Holdable.cs b/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/Holdable.cs rename to BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/MeleeWeapon.cs b/BarotraumaShared/Source/Items/Components/Holdable/MeleeWeapon.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/MeleeWeapon.cs rename to BarotraumaShared/Source/Items/Components/Holdable/MeleeWeapon.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/Pickable.cs b/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/Pickable.cs rename to BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/Propulsion.cs b/BarotraumaShared/Source/Items/Components/Holdable/Propulsion.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/Propulsion.cs rename to BarotraumaShared/Source/Items/Components/Holdable/Propulsion.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/RangedWeapon.cs b/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/RangedWeapon.cs rename to BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/RepairTool.cs b/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/RepairTool.cs rename to BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs diff --git a/Barotrauma/Source/Items/Components/Holdable/Throwable.cs b/BarotraumaShared/Source/Items/Components/Holdable/Throwable.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Holdable/Throwable.cs rename to BarotraumaShared/Source/Items/Components/Holdable/Throwable.cs diff --git a/Barotrauma/Source/Items/Components/ItemComponent.cs b/BarotraumaShared/Source/Items/Components/ItemComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/ItemComponent.cs rename to BarotraumaShared/Source/Items/Components/ItemComponent.cs diff --git a/Barotrauma/Source/Items/Components/ItemContainer.cs b/BarotraumaShared/Source/Items/Components/ItemContainer.cs similarity index 100% rename from Barotrauma/Source/Items/Components/ItemContainer.cs rename to BarotraumaShared/Source/Items/Components/ItemContainer.cs diff --git a/Barotrauma/Source/Items/Components/ItemLabel.cs b/BarotraumaShared/Source/Items/Components/ItemLabel.cs similarity index 100% rename from Barotrauma/Source/Items/Components/ItemLabel.cs rename to BarotraumaShared/Source/Items/Components/ItemLabel.cs diff --git a/Barotrauma/Source/Items/Components/Ladder.cs b/BarotraumaShared/Source/Items/Components/Ladder.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Ladder.cs rename to BarotraumaShared/Source/Items/Components/Ladder.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Controller.cs b/BarotraumaShared/Source/Items/Components/Machines/Controller.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Controller.cs rename to BarotraumaShared/Source/Items/Components/Machines/Controller.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Deconstructor.cs b/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Deconstructor.cs rename to BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Engine.cs b/BarotraumaShared/Source/Items/Components/Machines/Engine.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Engine.cs rename to BarotraumaShared/Source/Items/Components/Machines/Engine.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Fabricator.cs b/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Fabricator.cs rename to BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs diff --git a/Barotrauma/Source/Items/Components/Machines/MiniMap.cs b/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/MiniMap.cs rename to BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs diff --git a/Barotrauma/Source/Items/Components/Machines/OxygenGenerator.cs b/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/OxygenGenerator.cs rename to BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Pump.cs b/BarotraumaShared/Source/Items/Components/Machines/Pump.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Pump.cs rename to BarotraumaShared/Source/Items/Components/Machines/Pump.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Radar.cs b/BarotraumaShared/Source/Items/Components/Machines/Radar.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Radar.cs rename to BarotraumaShared/Source/Items/Components/Machines/Radar.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Reactor.cs b/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Reactor.cs rename to BarotraumaShared/Source/Items/Components/Machines/Reactor.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Steering.cs b/BarotraumaShared/Source/Items/Components/Machines/Steering.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Steering.cs rename to BarotraumaShared/Source/Items/Components/Machines/Steering.cs diff --git a/Barotrauma/Source/Items/Components/Machines/Vent.cs b/BarotraumaShared/Source/Items/Components/Machines/Vent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Machines/Vent.cs rename to BarotraumaShared/Source/Items/Components/Machines/Vent.cs diff --git a/Barotrauma/Source/Items/Components/Power/PowerContainer.cs b/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Power/PowerContainer.cs rename to BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs diff --git a/Barotrauma/Source/Items/Components/Power/PowerTransfer.cs b/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Power/PowerTransfer.cs rename to BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs diff --git a/Barotrauma/Source/Items/Components/Power/Powered.cs b/BarotraumaShared/Source/Items/Components/Power/Powered.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Power/Powered.cs rename to BarotraumaShared/Source/Items/Components/Power/Powered.cs diff --git a/Barotrauma/Source/Items/Components/Projectile.cs b/BarotraumaShared/Source/Items/Components/Projectile.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Projectile.cs rename to BarotraumaShared/Source/Items/Components/Projectile.cs diff --git a/Barotrauma/Source/Items/Components/Rope.cs b/BarotraumaShared/Source/Items/Components/Rope.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Rope.cs rename to BarotraumaShared/Source/Items/Components/Rope.cs diff --git a/Barotrauma/Source/Items/Components/Signal/AndComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/AndComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/AndComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/AndComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/Connection.cs b/BarotraumaShared/Source/Items/Components/Signal/Connection.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/Connection.cs rename to BarotraumaShared/Source/Items/Components/Signal/Connection.cs diff --git a/Barotrauma/Source/Items/Components/Signal/ConnectionPanel.cs b/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/ConnectionPanel.cs rename to BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs diff --git a/Barotrauma/Source/Items/Components/Signal/DelayComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/DelayComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/DelayComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/DelayComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/LightComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/LightComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/MotionSensor.cs b/BarotraumaShared/Source/Items/Components/Signal/MotionSensor.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/MotionSensor.cs rename to BarotraumaShared/Source/Items/Components/Signal/MotionSensor.cs diff --git a/Barotrauma/Source/Items/Components/Signal/NotComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/NotComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/NotComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/NotComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/OrComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/OrComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/OrComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/OrComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/OxygenDetector.cs b/BarotraumaShared/Source/Items/Components/Signal/OxygenDetector.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/OxygenDetector.cs rename to BarotraumaShared/Source/Items/Components/Signal/OxygenDetector.cs diff --git a/Barotrauma/Source/Items/Components/Signal/RegExFindComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/RegExFindComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/RelayComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/RelayComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/RelayComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/RelayComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/SignalCheckComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/SignalCheckComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/SignalCheckComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/SignalCheckComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/WaterDetector.cs b/BarotraumaShared/Source/Items/Components/Signal/WaterDetector.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/WaterDetector.cs rename to BarotraumaShared/Source/Items/Components/Signal/WaterDetector.cs diff --git a/Barotrauma/Source/Items/Components/Signal/WifiComponent.cs b/BarotraumaShared/Source/Items/Components/Signal/WifiComponent.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/WifiComponent.cs rename to BarotraumaShared/Source/Items/Components/Signal/WifiComponent.cs diff --git a/Barotrauma/Source/Items/Components/Signal/Wire.cs b/BarotraumaShared/Source/Items/Components/Signal/Wire.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Signal/Wire.cs rename to BarotraumaShared/Source/Items/Components/Signal/Wire.cs diff --git a/Barotrauma/Source/Items/Components/StatusHUD.cs b/BarotraumaShared/Source/Items/Components/StatusHUD.cs similarity index 100% rename from Barotrauma/Source/Items/Components/StatusHUD.cs rename to BarotraumaShared/Source/Items/Components/StatusHUD.cs diff --git a/Barotrauma/Source/Items/Components/Turret.cs b/BarotraumaShared/Source/Items/Components/Turret.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Turret.cs rename to BarotraumaShared/Source/Items/Components/Turret.cs diff --git a/Barotrauma/Source/Items/Components/Wearable.cs b/BarotraumaShared/Source/Items/Components/Wearable.cs similarity index 100% rename from Barotrauma/Source/Items/Components/Wearable.cs rename to BarotraumaShared/Source/Items/Components/Wearable.cs diff --git a/Barotrauma/Source/Items/FixRequirement.cs b/BarotraumaShared/Source/Items/FixRequirement.cs similarity index 100% rename from Barotrauma/Source/Items/FixRequirement.cs rename to BarotraumaShared/Source/Items/FixRequirement.cs diff --git a/Barotrauma/Source/Items/Inventory.cs b/BarotraumaShared/Source/Items/Inventory.cs similarity index 100% rename from Barotrauma/Source/Items/Inventory.cs rename to BarotraumaShared/Source/Items/Inventory.cs diff --git a/Barotrauma/Source/Items/Item.cs b/BarotraumaShared/Source/Items/Item.cs similarity index 100% rename from Barotrauma/Source/Items/Item.cs rename to BarotraumaShared/Source/Items/Item.cs diff --git a/Barotrauma/Source/Items/ItemInventory.cs b/BarotraumaShared/Source/Items/ItemInventory.cs similarity index 100% rename from Barotrauma/Source/Items/ItemInventory.cs rename to BarotraumaShared/Source/Items/ItemInventory.cs diff --git a/Barotrauma/Source/Items/ItemPrefab.cs b/BarotraumaShared/Source/Items/ItemPrefab.cs similarity index 100% rename from Barotrauma/Source/Items/ItemPrefab.cs rename to BarotraumaShared/Source/Items/ItemPrefab.cs diff --git a/Barotrauma/Source/Items/RelatedItem.cs b/BarotraumaShared/Source/Items/RelatedItem.cs similarity index 100% rename from Barotrauma/Source/Items/RelatedItem.cs rename to BarotraumaShared/Source/Items/RelatedItem.cs diff --git a/Barotrauma/Source/Map/Entity.cs b/BarotraumaShared/Source/Map/Entity.cs similarity index 100% rename from Barotrauma/Source/Map/Entity.cs rename to BarotraumaShared/Source/Map/Entity.cs diff --git a/Barotrauma/Source/Map/EntityGrid.cs b/BarotraumaShared/Source/Map/EntityGrid.cs similarity index 100% rename from Barotrauma/Source/Map/EntityGrid.cs rename to BarotraumaShared/Source/Map/EntityGrid.cs diff --git a/Barotrauma/Source/Map/Explosion.cs b/BarotraumaShared/Source/Map/Explosion.cs similarity index 100% rename from Barotrauma/Source/Map/Explosion.cs rename to BarotraumaShared/Source/Map/Explosion.cs diff --git a/Barotrauma/Source/Map/FireSource.cs b/BarotraumaShared/Source/Map/FireSource.cs similarity index 100% rename from Barotrauma/Source/Map/FireSource.cs rename to BarotraumaShared/Source/Map/FireSource.cs diff --git a/Barotrauma/Source/Map/Gap.cs b/BarotraumaShared/Source/Map/Gap.cs similarity index 100% rename from Barotrauma/Source/Map/Gap.cs rename to BarotraumaShared/Source/Map/Gap.cs diff --git a/Barotrauma/Source/Map/Hull.cs b/BarotraumaShared/Source/Map/Hull.cs similarity index 100% rename from Barotrauma/Source/Map/Hull.cs rename to BarotraumaShared/Source/Map/Hull.cs diff --git a/Barotrauma/Source/Map/IDamageable.cs b/BarotraumaShared/Source/Map/IDamageable.cs similarity index 100% rename from Barotrauma/Source/Map/IDamageable.cs rename to BarotraumaShared/Source/Map/IDamageable.cs diff --git a/Barotrauma/Source/Map/Levels/CaveGenerator.cs b/BarotraumaShared/Source/Map/Levels/CaveGenerator.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/CaveGenerator.cs rename to BarotraumaShared/Source/Map/Levels/CaveGenerator.cs diff --git a/Barotrauma/Source/Map/Levels/Level.cs b/BarotraumaShared/Source/Map/Levels/Level.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/Level.cs rename to BarotraumaShared/Source/Map/Levels/Level.cs diff --git a/Barotrauma/Source/Map/Levels/LevelGenerationParams.cs b/BarotraumaShared/Source/Map/Levels/LevelGenerationParams.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/LevelGenerationParams.cs rename to BarotraumaShared/Source/Map/Levels/LevelGenerationParams.cs diff --git a/Barotrauma/Source/Map/Levels/LevelRenderer.cs b/BarotraumaShared/Source/Map/Levels/LevelRenderer.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/LevelRenderer.cs rename to BarotraumaShared/Source/Map/Levels/LevelRenderer.cs diff --git a/Barotrauma/Source/Map/Levels/Ruins/BTRoom.cs b/BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/Ruins/BTRoom.cs rename to BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs diff --git a/Barotrauma/Source/Map/Levels/Ruins/Corridor.cs b/BarotraumaShared/Source/Map/Levels/Ruins/Corridor.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/Ruins/Corridor.cs rename to BarotraumaShared/Source/Map/Levels/Ruins/Corridor.cs diff --git a/Barotrauma/Source/Map/Levels/Ruins/RuinGenerator.cs b/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/Ruins/RuinGenerator.cs rename to BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs diff --git a/Barotrauma/Source/Map/Levels/Ruins/RuinStructure.cs b/BarotraumaShared/Source/Map/Levels/Ruins/RuinStructure.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/Ruins/RuinStructure.cs rename to BarotraumaShared/Source/Map/Levels/Ruins/RuinStructure.cs diff --git a/Barotrauma/Source/Map/Levels/Voronoi.cs b/BarotraumaShared/Source/Map/Levels/Voronoi.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/Voronoi.cs rename to BarotraumaShared/Source/Map/Levels/Voronoi.cs diff --git a/Barotrauma/Source/Map/Levels/VoronoiElements.cs b/BarotraumaShared/Source/Map/Levels/VoronoiElements.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/VoronoiElements.cs rename to BarotraumaShared/Source/Map/Levels/VoronoiElements.cs diff --git a/Barotrauma/Source/Map/Levels/WaterRenderer.cs b/BarotraumaShared/Source/Map/Levels/WaterRenderer.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/WaterRenderer.cs rename to BarotraumaShared/Source/Map/Levels/WaterRenderer.cs diff --git a/Barotrauma/Source/Map/Levels/WrappingWall.cs b/BarotraumaShared/Source/Map/Levels/WrappingWall.cs similarity index 100% rename from Barotrauma/Source/Map/Levels/WrappingWall.cs rename to BarotraumaShared/Source/Map/Levels/WrappingWall.cs diff --git a/Barotrauma/Source/Map/Lights/ConvexHull.cs b/BarotraumaShared/Source/Map/Lights/ConvexHull.cs similarity index 100% rename from Barotrauma/Source/Map/Lights/ConvexHull.cs rename to BarotraumaShared/Source/Map/Lights/ConvexHull.cs diff --git a/Barotrauma/Source/Map/Lights/LightManager.cs b/BarotraumaShared/Source/Map/Lights/LightManager.cs similarity index 100% rename from Barotrauma/Source/Map/Lights/LightManager.cs rename to BarotraumaShared/Source/Map/Lights/LightManager.cs diff --git a/Barotrauma/Source/Map/Lights/LightSource.cs b/BarotraumaShared/Source/Map/Lights/LightSource.cs similarity index 100% rename from Barotrauma/Source/Map/Lights/LightSource.cs rename to BarotraumaShared/Source/Map/Lights/LightSource.cs diff --git a/Barotrauma/Source/Map/LinkedSubmarine.cs b/BarotraumaShared/Source/Map/LinkedSubmarine.cs similarity index 100% rename from Barotrauma/Source/Map/LinkedSubmarine.cs rename to BarotraumaShared/Source/Map/LinkedSubmarine.cs diff --git a/Barotrauma/Source/Map/Map/Location.cs b/BarotraumaShared/Source/Map/Map/Location.cs similarity index 100% rename from Barotrauma/Source/Map/Map/Location.cs rename to BarotraumaShared/Source/Map/Map/Location.cs diff --git a/Barotrauma/Source/Map/Map/LocationType.cs b/BarotraumaShared/Source/Map/Map/LocationType.cs similarity index 100% rename from Barotrauma/Source/Map/Map/LocationType.cs rename to BarotraumaShared/Source/Map/Map/LocationType.cs diff --git a/Barotrauma/Source/Map/Map/Map.cs b/BarotraumaShared/Source/Map/Map/Map.cs similarity index 100% rename from Barotrauma/Source/Map/Map/Map.cs rename to BarotraumaShared/Source/Map/Map/Map.cs diff --git a/Barotrauma/Source/Map/MapEntity.cs b/BarotraumaShared/Source/Map/MapEntity.cs similarity index 100% rename from Barotrauma/Source/Map/MapEntity.cs rename to BarotraumaShared/Source/Map/MapEntity.cs diff --git a/Barotrauma/Source/Map/MapEntityPrefab.cs b/BarotraumaShared/Source/Map/MapEntityPrefab.cs similarity index 100% rename from Barotrauma/Source/Map/MapEntityPrefab.cs rename to BarotraumaShared/Source/Map/MapEntityPrefab.cs diff --git a/Barotrauma/Source/Map/Md5Hash.cs b/BarotraumaShared/Source/Map/Md5Hash.cs similarity index 100% rename from Barotrauma/Source/Map/Md5Hash.cs rename to BarotraumaShared/Source/Map/Md5Hash.cs diff --git a/Barotrauma/Source/Map/Structure.cs b/BarotraumaShared/Source/Map/Structure.cs similarity index 100% rename from Barotrauma/Source/Map/Structure.cs rename to BarotraumaShared/Source/Map/Structure.cs diff --git a/Barotrauma/Source/Map/StructurePrefab.cs b/BarotraumaShared/Source/Map/StructurePrefab.cs similarity index 100% rename from Barotrauma/Source/Map/StructurePrefab.cs rename to BarotraumaShared/Source/Map/StructurePrefab.cs diff --git a/Barotrauma/Source/Map/Submarine.cs b/BarotraumaShared/Source/Map/Submarine.cs similarity index 100% rename from Barotrauma/Source/Map/Submarine.cs rename to BarotraumaShared/Source/Map/Submarine.cs diff --git a/Barotrauma/Source/Map/SubmarineBody.cs b/BarotraumaShared/Source/Map/SubmarineBody.cs similarity index 100% rename from Barotrauma/Source/Map/SubmarineBody.cs rename to BarotraumaShared/Source/Map/SubmarineBody.cs diff --git a/Barotrauma/Source/Map/TransitionCinematic.cs b/BarotraumaShared/Source/Map/TransitionCinematic.cs similarity index 100% rename from Barotrauma/Source/Map/TransitionCinematic.cs rename to BarotraumaShared/Source/Map/TransitionCinematic.cs diff --git a/Barotrauma/Source/Map/WayPoint.cs b/BarotraumaShared/Source/Map/WayPoint.cs similarity index 100% rename from Barotrauma/Source/Map/WayPoint.cs rename to BarotraumaShared/Source/Map/WayPoint.cs diff --git a/Barotrauma/Source/Networking/BanList.cs b/BarotraumaShared/Source/Networking/BanList.cs similarity index 100% rename from Barotrauma/Source/Networking/BanList.cs rename to BarotraumaShared/Source/Networking/BanList.cs diff --git a/Barotrauma/Source/Networking/ChatMessage.cs b/BarotraumaShared/Source/Networking/ChatMessage.cs similarity index 100% rename from Barotrauma/Source/Networking/ChatMessage.cs rename to BarotraumaShared/Source/Networking/ChatMessage.cs diff --git a/Barotrauma/Source/Networking/Client.cs b/BarotraumaShared/Source/Networking/Client.cs similarity index 100% rename from Barotrauma/Source/Networking/Client.cs rename to BarotraumaShared/Source/Networking/Client.cs diff --git a/Barotrauma/Source/Networking/EntitySpawner.cs b/BarotraumaShared/Source/Networking/EntitySpawner.cs similarity index 100% rename from Barotrauma/Source/Networking/EntitySpawner.cs rename to BarotraumaShared/Source/Networking/EntitySpawner.cs diff --git a/Barotrauma/Source/Networking/FileTransfer/FileReceiver.cs b/BarotraumaShared/Source/Networking/FileTransfer/FileReceiver.cs similarity index 100% rename from Barotrauma/Source/Networking/FileTransfer/FileReceiver.cs rename to BarotraumaShared/Source/Networking/FileTransfer/FileReceiver.cs diff --git a/Barotrauma/Source/Networking/FileTransfer/FileSender.cs b/BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs similarity index 100% rename from Barotrauma/Source/Networking/FileTransfer/FileSender.cs rename to BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs diff --git a/Barotrauma/Source/Networking/GameClient.cs b/BarotraumaShared/Source/Networking/GameClient.cs similarity index 100% rename from Barotrauma/Source/Networking/GameClient.cs rename to BarotraumaShared/Source/Networking/GameClient.cs diff --git a/Barotrauma/Source/Networking/GameServer.cs b/BarotraumaShared/Source/Networking/GameServer.cs similarity index 100% rename from Barotrauma/Source/Networking/GameServer.cs rename to BarotraumaShared/Source/Networking/GameServer.cs diff --git a/Barotrauma/Source/Networking/GameServerLogin.cs b/BarotraumaShared/Source/Networking/GameServerLogin.cs similarity index 100% rename from Barotrauma/Source/Networking/GameServerLogin.cs rename to BarotraumaShared/Source/Networking/GameServerLogin.cs diff --git a/Barotrauma/Source/Networking/GameServerSettings.cs b/BarotraumaShared/Source/Networking/GameServerSettings.cs similarity index 100% rename from Barotrauma/Source/Networking/GameServerSettings.cs rename to BarotraumaShared/Source/Networking/GameServerSettings.cs diff --git a/Barotrauma/Source/Networking/INetSerializable.cs b/BarotraumaShared/Source/Networking/INetSerializable.cs similarity index 100% rename from Barotrauma/Source/Networking/INetSerializable.cs rename to BarotraumaShared/Source/Networking/INetSerializable.cs diff --git a/Barotrauma/Source/Networking/NetBufferExtensions.cs b/BarotraumaShared/Source/Networking/NetBufferExtensions.cs similarity index 100% rename from Barotrauma/Source/Networking/NetBufferExtensions.cs rename to BarotraumaShared/Source/Networking/NetBufferExtensions.cs diff --git a/Barotrauma/Source/Networking/NetConfig.cs b/BarotraumaShared/Source/Networking/NetConfig.cs similarity index 100% rename from Barotrauma/Source/Networking/NetConfig.cs rename to BarotraumaShared/Source/Networking/NetConfig.cs diff --git a/Barotrauma/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs b/BarotraumaShared/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs similarity index 100% rename from Barotrauma/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs rename to BarotraumaShared/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs diff --git a/Barotrauma/Source/Networking/NetEntityEvent/NetEntityEvent.cs b/BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEvent.cs similarity index 100% rename from Barotrauma/Source/Networking/NetEntityEvent/NetEntityEvent.cs rename to BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEvent.cs diff --git a/Barotrauma/Source/Networking/NetEntityEvent/NetEntityEventManager.cs b/BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEventManager.cs similarity index 100% rename from Barotrauma/Source/Networking/NetEntityEvent/NetEntityEventManager.cs rename to BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEventManager.cs diff --git a/Barotrauma/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs b/BarotraumaShared/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs similarity index 100% rename from Barotrauma/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs rename to BarotraumaShared/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs diff --git a/Barotrauma/Source/Networking/NetIdUtils.cs b/BarotraumaShared/Source/Networking/NetIdUtils.cs similarity index 100% rename from Barotrauma/Source/Networking/NetIdUtils.cs rename to BarotraumaShared/Source/Networking/NetIdUtils.cs diff --git a/Barotrauma/Source/Networking/NetStats.cs b/BarotraumaShared/Source/Networking/NetStats.cs similarity index 100% rename from Barotrauma/Source/Networking/NetStats.cs rename to BarotraumaShared/Source/Networking/NetStats.cs diff --git a/Barotrauma/Source/Networking/NetworkMember.cs b/BarotraumaShared/Source/Networking/NetworkMember.cs similarity index 100% rename from Barotrauma/Source/Networking/NetworkMember.cs rename to BarotraumaShared/Source/Networking/NetworkMember.cs diff --git a/Barotrauma/Source/Networking/RespawnManager.cs b/BarotraumaShared/Source/Networking/RespawnManager.cs similarity index 100% rename from Barotrauma/Source/Networking/RespawnManager.cs rename to BarotraumaShared/Source/Networking/RespawnManager.cs diff --git a/Barotrauma/Source/Networking/ServerLog.cs b/BarotraumaShared/Source/Networking/ServerLog.cs similarity index 100% rename from Barotrauma/Source/Networking/ServerLog.cs rename to BarotraumaShared/Source/Networking/ServerLog.cs diff --git a/Barotrauma/Source/Networking/Voting.cs b/BarotraumaShared/Source/Networking/Voting.cs similarity index 100% rename from Barotrauma/Source/Networking/Voting.cs rename to BarotraumaShared/Source/Networking/Voting.cs diff --git a/Barotrauma/Source/Networking/WhiteList.cs b/BarotraumaShared/Source/Networking/WhiteList.cs similarity index 100% rename from Barotrauma/Source/Networking/WhiteList.cs rename to BarotraumaShared/Source/Networking/WhiteList.cs diff --git a/Barotrauma/Source/Networking/disabled/FileStreamReceiver.cs b/BarotraumaShared/Source/Networking/disabled/FileStreamReceiver.cs similarity index 100% rename from Barotrauma/Source/Networking/disabled/FileStreamReceiver.cs rename to BarotraumaShared/Source/Networking/disabled/FileStreamReceiver.cs diff --git a/Barotrauma/Source/Networking/disabled/FileStreamSender.cs b/BarotraumaShared/Source/Networking/disabled/FileStreamSender.cs similarity index 100% rename from Barotrauma/Source/Networking/disabled/FileStreamSender.cs rename to BarotraumaShared/Source/Networking/disabled/FileStreamSender.cs diff --git a/Barotrauma/Source/Networking/disabled/NetworkEvent.cs b/BarotraumaShared/Source/Networking/disabled/NetworkEvent.cs similarity index 100% rename from Barotrauma/Source/Networking/disabled/NetworkEvent.cs rename to BarotraumaShared/Source/Networking/disabled/NetworkEvent.cs diff --git a/Barotrauma/Source/Networking/disabled/ReliableSender.cs b/BarotraumaShared/Source/Networking/disabled/ReliableSender.cs similarity index 100% rename from Barotrauma/Source/Networking/disabled/ReliableSender.cs rename to BarotraumaShared/Source/Networking/disabled/ReliableSender.cs diff --git a/Barotrauma/Source/Physics/Physics.cs b/BarotraumaShared/Source/Physics/Physics.cs similarity index 100% rename from Barotrauma/Source/Physics/Physics.cs rename to BarotraumaShared/Source/Physics/Physics.cs diff --git a/Barotrauma/Source/Physics/PhysicsBody.cs b/BarotraumaShared/Source/Physics/PhysicsBody.cs similarity index 100% rename from Barotrauma/Source/Physics/PhysicsBody.cs rename to BarotraumaShared/Source/Physics/PhysicsBody.cs diff --git a/Barotrauma/Source/PlayerInput.cs b/BarotraumaShared/Source/PlayerInput.cs similarity index 100% rename from Barotrauma/Source/PlayerInput.cs rename to BarotraumaShared/Source/PlayerInput.cs diff --git a/Barotrauma/Source/Program.cs b/BarotraumaShared/Source/Program.cs similarity index 100% rename from Barotrauma/Source/Program.cs rename to BarotraumaShared/Source/Program.cs diff --git a/Barotrauma/Source/Properties.cs b/BarotraumaShared/Source/Properties.cs similarity index 100% rename from Barotrauma/Source/Properties.cs rename to BarotraumaShared/Source/Properties.cs diff --git a/Barotrauma/Source/Timing.cs b/BarotraumaShared/Source/Timing.cs similarity index 100% rename from Barotrauma/Source/Timing.cs rename to BarotraumaShared/Source/Timing.cs diff --git a/Barotrauma/Source/Utils/Homoglyphs.cs b/BarotraumaShared/Source/Utils/Homoglyphs.cs similarity index 100% rename from Barotrauma/Source/Utils/Homoglyphs.cs rename to BarotraumaShared/Source/Utils/Homoglyphs.cs diff --git a/Barotrauma/Source/Utils/MTRandom.cs b/BarotraumaShared/Source/Utils/MTRandom.cs similarity index 100% rename from Barotrauma/Source/Utils/MTRandom.cs rename to BarotraumaShared/Source/Utils/MTRandom.cs diff --git a/Barotrauma/Source/Utils/MathUtils.cs b/BarotraumaShared/Source/Utils/MathUtils.cs similarity index 100% rename from Barotrauma/Source/Utils/MathUtils.cs rename to BarotraumaShared/Source/Utils/MathUtils.cs diff --git a/Barotrauma/Source/Utils/Rand.cs b/BarotraumaShared/Source/Utils/Rand.cs similarity index 100% rename from Barotrauma/Source/Utils/Rand.cs rename to BarotraumaShared/Source/Utils/Rand.cs diff --git a/Barotrauma/Source/Utils/SaveUtil.cs b/BarotraumaShared/Source/Utils/SaveUtil.cs similarity index 100% rename from Barotrauma/Source/Utils/SaveUtil.cs rename to BarotraumaShared/Source/Utils/SaveUtil.cs diff --git a/Barotrauma/Source/Utils/ToolBox.cs b/BarotraumaShared/Source/Utils/ToolBox.cs similarity index 100% rename from Barotrauma/Source/Utils/ToolBox.cs rename to BarotraumaShared/Source/Utils/ToolBox.cs diff --git a/Barotrauma/Source/Utils/UpdaterUtil.cs b/BarotraumaShared/Source/Utils/UpdaterUtil.cs similarity index 100% rename from Barotrauma/Source/Utils/UpdaterUtil.cs rename to BarotraumaShared/Source/Utils/UpdaterUtil.cs diff --git a/Barotrauma_Solution.sln b/Barotrauma_Solution.sln index 4bf948c25..3c2fe7cfb 100644 --- a/Barotrauma_Solution.sln +++ b/Barotrauma_Solution.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Barotrauma", "Barotrauma\Barotrauma.csproj", "{008C0F83-E914-4966-9135-EA885059EDD8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarotraumaClient", "BarotraumaClient\BarotraumaClient.csproj", "{008C0F83-E914-4966-9135-EA885059EDD8}" ProjectSection(ProjectDependencies) = postProject {C293DB32-FA42-486D-B128-5A12522FAE4E} = {C293DB32-FA42-486D-B128-5A12522FAE4E} EndProjectSection @@ -22,9 +22,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpFont", "SharpFont\Sour EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharpFontShared", "SharpFont\Source\SharpFontShared\SharpFontShared.shproj", "{2E4773B7-961A-4328-9D77-9749F9071CA2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarotraumaServer", "BarotraumaServer\BarotraumaServer.csproj", "{85232B20-074D-4723-B0C6-91495391E448}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BarotraumaShared", "BarotraumaShared\BarotraumaShared.shproj", "{561357C2-DB28-4E01-B275-6BF545F70491}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Barotrauma", "Barotrauma", "{F35DF9BF-0BED-4FEF-A51C-DD83C531882F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{DE36F45F-F09E-4719-B953-00D148F7722A}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + BarotraumaShared\BarotraumaShared.projitems*{008c0f83-e914-4966-9135-ea885059edd8}*SharedItemsImports = 4 SharpFont\Source\SharpFontShared\SharpFontShared.projitems*{2e4773b7-961a-4328-9d77-9749f9071ca2}*SharedItemsImports = 13 + BarotraumaShared\BarotraumaShared.projitems*{561357c2-db28-4e01-b275-6bf545f70491}*SharedItemsImports = 13 SharpFont\Source\SharpFontShared\SharpFontShared.projitems*{c293db32-fa42-486d-b128-5a12522fae4e}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -345,8 +355,73 @@ Global {C293DB32-FA42-486D-B128-5A12522FAE4E}.Windows8|Mixed Platforms.Build.0 = Release|Any CPU {C293DB32-FA42-486D-B128-5A12522FAE4E}.Windows8|x86.ActiveCfg = Release|Any CPU {C293DB32-FA42-486D-B128-5A12522FAE4E}.Windows8|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Android|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Android|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Android|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Android|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Android|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Android|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Debug|x86.ActiveCfg = Debug|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Debug|x86.Build.0 = Debug|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.iOS|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.iOS|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.iOS|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.iOS|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.iOS|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.iOS|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Linux|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Linux|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Linux|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Linux|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Linux|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Linux|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.OSX|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.OSX|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.OSX|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.OSX|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.OSX|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.OSX|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.PSM|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.PSM|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.PSM|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.PSM|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.PSM|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.PSM|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Release|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Release|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Release|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows|x86.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows8|Any CPU.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows8|Any CPU.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows8|Mixed Platforms.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows8|Mixed Platforms.Build.0 = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows8|x86.ActiveCfg = Release|Any CPU + {85232B20-074D-4723-B0C6-91495391E448}.Windows8|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {008C0F83-E914-4966-9135-EA885059EDD8} = {F35DF9BF-0BED-4FEF-A51C-DD83C531882F} + {0AAD36E3-51A5-4A07-AB60-5C8A66BD38B7} = {DE36F45F-F09E-4719-B953-00D148F7722A} + {49BA1C69-6104-41AC-A5D8-B54FA9F696E8} = {DE36F45F-F09E-4719-B953-00D148F7722A} + {251AAFE1-F24B-4837-9128-9D04FCBFD528} = {DE36F45F-F09E-4719-B953-00D148F7722A} + {3B8F9EDB-6E5E-450C-ABC2-EC49075D0B50} = {DE36F45F-F09E-4719-B953-00D148F7722A} + {C293DB32-FA42-486D-B128-5A12522FAE4E} = {DE36F45F-F09E-4719-B953-00D148F7722A} + {2E4773B7-961A-4328-9D77-9749F9071CA2} = {DE36F45F-F09E-4719-B953-00D148F7722A} + {85232B20-074D-4723-B0C6-91495391E448} = {F35DF9BF-0BED-4FEF-A51C-DD83C531882F} + {561357C2-DB28-4E01-B275-6BF545F70491} = {F35DF9BF-0BED-4FEF-A51C-DD83C531882F} + EndGlobalSection EndGlobal diff --git a/Launcher2/Launcher.csproj b/Launcher2/Launcher.csproj index 1d9f91c42..33e6d933a 100644 --- a/Launcher2/Launcher.csproj +++ b/Launcher2/Launcher.csproj @@ -66,9 +66,9 @@ - + {008c0f83-e914-4966-9135-ea885059edd8} - Barotrauma + BarotraumaClient