commit 409d4d96ead69028a164274637d23e350acb73fb Merge: 95169f539 26e89c63d Author: EdusFF <pitkanen.eetu@gmail.com> Date: Mon Mar 11 15:13:27 2019 +0200 Merge branch 'dev' of github.com:Regalis11/Barotrauma into dev commit 95169f53937f9a7e168a884171eaa21ae7f08023 Author: EdusFF <pitkanen.eetu@gmail.com> Date: Mon Mar 11 15:13:11 2019 +0200 Modified: ServerMessage structure to allow _ ; in player & submarine names commit 26e89c63dc8da771aea9f09978a630a6cff60a6f Merge: b7646d06d fb0b821bc Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 14:42:44 2019 +0200 Merge branch 'kuraiookami-logicExpantion' into dev # Conflicts: # Barotrauma/BarotraumaShared/SharedContent.projitems commit fb0b821bc97891cdeec8f2c740a12119696393ea Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 14:41:21 2019 +0200 Use invariant culture when parsing floats or converting them to strings in signal components commit f0c8afba934b41358cf5d59a22b87caf33f98a61 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 14:00:44 2019 +0200 Update new signal components to use identifiers & added names and descriptions to the text file, use invariant culture in equalscomponent, memorycomponent doesn't require the signals to be floats commit 674d9ec804fc4770b602d4b09240b08cafc8ccec Merge: 3ea33fb54 242e2429f Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 12:01:27 2019 +0200 Merge branch 'logicExpantion' of https://github.com/kuraiookami/Barotrauma into kuraiookami-logicExpantion # Conflicts: # Barotrauma/BarotraumaShared/BarotraumaShared.projitems # Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml # Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml # Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs # Barotrauma/BarotraumaShared/Source/Items/Components/Signal/AdderComponent.cs commit b7646d06d53fb05227276e6286d0e15da5dc9080 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 11:37:33 2019 +0200 Re-enabled multiplayer campaign commit cf7258f6410a5995c881ec6e95eb9def5cd90ad4 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 11:28:48 2019 +0200 Fixed item interfaces getting repositioned every frame when the editing HUD is open. Closes #1212 commit e8906239c779cf71de694bc65c81058e5cae16ef Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 11:12:05 2019 +0200 Fixed VoipCapture creating new "could not start voice capture" popups constantly if there's no suitable capture device. Closes #1262 commit a30f47fbe47fde4fccb0453c1773a76d730d226b Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Sun Mar 10 19:04:59 2019 +0200 Disable audio instead of crashing if no audio device is found. Closes #1214 commit 242e2429fd2c3ed199ac26b55e2cbdc8636e73f9 Author: Darkwolf <Darkwolf0101@gmail.com> Date: Mon Jan 21 21:26:57 2019 -0600 Expansion of Barotrauma's logic system. Changed: - AdderComponent and children can clamp their output - Powercontainer signals for charge,charge% and charge rate Added: - ColorComponent: Dynamic signals for light set_color inputs - MemoryComponent: Stores and sends a signal that is edge latched - DivideComponent: Standard division - MultiplyComponent: Standard multiplication - SubtractComponent: Standard subtraction - XorComponent: Exclusive or - EqualsComponent: Equals comparison - GreaterComponent: Greater than comparison
224 lines
11 KiB
XML
224 lines
11 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<PropertyGroup>
|
|
<Configuration Condition=" '$(Configuration)' == '' ">ReleaseLinux</Configuration>
|
|
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
|
|
<ProjectGuid>{85232B20-074D-4723-B0C6-91495391E448}</ProjectGuid>
|
|
<OutputType>Exe</OutputType>
|
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
<RootNamespace>Barotrauma</RootNamespace>
|
|
<AssemblyName>DedicatedServer</AssemblyName>
|
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
|
<FileAlignment>512</FileAlignment>
|
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
|
<TargetFrameworkProfile />
|
|
<PublishUrl>publish\</PublishUrl>
|
|
<Install>true</Install>
|
|
<InstallFrom>Disk</InstallFrom>
|
|
<UpdateEnabled>false</UpdateEnabled>
|
|
<UpdateMode>Foreground</UpdateMode>
|
|
<UpdateInterval>7</UpdateInterval>
|
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
|
<UpdatePeriodically>false</UpdatePeriodically>
|
|
<UpdateRequired>false</UpdateRequired>
|
|
<MapFileExtensions>true</MapFileExtensions>
|
|
<ApplicationRevision>0</ApplicationRevision>
|
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
|
<UseApplicationTrust>false</UseApplicationTrust>
|
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
|
<ReleaseVersion>0.9.0.0</ReleaseVersion>
|
|
<NuGetPackageImportStamp>
|
|
</NuGetPackageImportStamp>
|
|
</PropertyGroup>
|
|
<PropertyGroup>
|
|
<ApplicationIcon>..\BarotraumaShared\Icon.ico</ApplicationIcon>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
|
|
<DebugSymbols>true</DebugSymbols>
|
|
<OutputPath>..\bin\ReleaseLinux\</OutputPath>
|
|
<DefineConstants>TRACE;SERVER</DefineConstants>
|
|
<Optimize>true</Optimize>
|
|
<DebugType>pdbonly</DebugType>
|
|
<PlatformTarget>x64</PlatformTarget>
|
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
|
<Prefer32Bit>true</Prefer32Bit>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
|
|
<DebugSymbols>true</DebugSymbols>
|
|
<OutputPath>..\bin\DebugLinux\</OutputPath>
|
|
<DefineConstants>TRACE;SERVER;DEBUG</DefineConstants>
|
|
<DebugType>full</DebugType>
|
|
<PlatformTarget>x64</PlatformTarget>
|
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
|
<Prefer32Bit>true</Prefer32Bit>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMac|x64'">
|
|
<DebugSymbols>true</DebugSymbols>
|
|
<OutputPath>..\bin\ReleaseMac\</OutputPath>
|
|
<DefineConstants>TRACE;SERVER</DefineConstants>
|
|
<Optimize>true</Optimize>
|
|
<DebugType>pdbonly</DebugType>
|
|
<PlatformTarget>x64</PlatformTarget>
|
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
|
<Prefer32Bit>true</Prefer32Bit>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMac|x64'">
|
|
<DebugSymbols>true</DebugSymbols>
|
|
<OutputPath>..\bin\DebugMac\</OutputPath>
|
|
<DefineConstants>TRACE;SERVER;DEBUG</DefineConstants>
|
|
<DebugType>full</DebugType>
|
|
<PlatformTarget>x64</PlatformTarget>
|
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
|
<Prefer32Bit>true</Prefer32Bit>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWindows|x64'">
|
|
<DebugSymbols>true</DebugSymbols>
|
|
<OutputPath>..\bin\ReleaseWindows\</OutputPath>
|
|
<DefineConstants>TRACE;SERVER</DefineConstants>
|
|
<Optimize>true</Optimize>
|
|
<DebugType>pdbonly</DebugType>
|
|
<PlatformTarget>x64</PlatformTarget>
|
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
|
<Prefer32Bit>true</Prefer32Bit>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWindows|x64'">
|
|
<DebugSymbols>true</DebugSymbols>
|
|
<OutputPath>..\bin\DebugWindows\</OutputPath>
|
|
<DefineConstants>TRACE;SERVER;DEBUG</DefineConstants>
|
|
<DebugType>full</DebugType>
|
|
<PlatformTarget>x64</PlatformTarget>
|
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
|
<Prefer32Bit>true</Prefer32Bit>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<Reference Include="System" />
|
|
<Reference Include="System.Xml" />
|
|
<Reference Include="System.Xml.Linq" />
|
|
<Reference Include="Microsoft.CSharp" />
|
|
<Reference Include="System.Configuration" />
|
|
<Reference Include="System.Core" />
|
|
<Reference Include="System.Data" />
|
|
<Reference Include="System.IO.Compression" />
|
|
<Reference Include="System.Runtime.Serialization" />
|
|
<Reference Include="System.ServiceModel" />
|
|
<Reference Include="System.Transactions" />
|
|
<Reference Include="NLog">
|
|
<HintPath>..\..\Libraries\NuGet\NLog.4.3.8\lib\net45\NLog.dll</HintPath>
|
|
</Reference>
|
|
<Reference Include="GameAnalytics.Mono">
|
|
<HintPath>..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\lib\net45\GameAnalytics.Mono.dll</HintPath>
|
|
</Reference>
|
|
<Reference Include="System.Data.SQLite">
|
|
<HintPath>..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\lib\net45\System.Data.SQLite.dll</HintPath>
|
|
</Reference>
|
|
<Reference Include="RestSharp">
|
|
<HintPath>..\..\Libraries\NuGet\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
|
|
</Reference>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
<Compile Include="Source\Camera.cs" />
|
|
<Compile Include="Source\Characters\Character.cs" />
|
|
<Compile Include="Source\Characters\CharacterInfo.cs" />
|
|
<Compile Include="Source\Characters\CharacterNetworking.cs" />
|
|
<Compile Include="Source\DebugConsole.cs" />
|
|
<Compile Include="Source\Events\Missions\CombatMission.cs" />
|
|
<Compile Include="Source\GameMain.cs" />
|
|
<Compile Include="Source\GameSession\CrewManager.cs" />
|
|
<Compile Include="Source\GameSession\GameModes\CharacterCampaignData.cs" />
|
|
<Compile Include="Source\GameSession\GameModes\MultiPlayerCampaign.cs" />
|
|
<Compile Include="Source\GameSession\GameModes\TraitorManager.cs" />
|
|
<Compile Include="Source\Items\Components\Door.cs" />
|
|
<Compile Include="Source\Items\Components\ItemComponent.cs" />
|
|
<Compile Include="Source\Items\Components\ItemLabel.cs" />
|
|
<Compile Include="Source\Items\Components\Machines\Deconstructor.cs" />
|
|
<Compile Include="Source\Items\Components\Machines\Engine.cs" />
|
|
<Compile Include="Source\Items\Components\Machines\Fabricator.cs" />
|
|
<Compile Include="Source\Items\Components\Machines\Pump.cs" />
|
|
<Compile Include="Source\Items\Components\Machines\Reactor.cs" />
|
|
<Compile Include="Source\Items\Components\Machines\Steering.cs" />
|
|
<Compile Include="Source\Items\Components\Power\PowerContainer.cs" />
|
|
<Compile Include="Source\Items\Components\Repairable.cs" />
|
|
<Compile Include="Source\Items\Components\Signal\ConnectionPanel.cs" />
|
|
<Compile Include="Source\Items\Components\Signal\CustomInterface.cs" />
|
|
<Compile Include="Source\Items\Components\Signal\Wire.cs" />
|
|
<Compile Include="Source\Items\Inventory.cs" />
|
|
<Compile Include="Source\Items\Item.cs" />
|
|
<Compile Include="Source\Map\Hull.cs" />
|
|
<Compile Include="Source\Map\Structure.cs" />
|
|
<Compile Include="Source\Map\Submarine.cs" />
|
|
<Compile Include="Source\Networking\BanList.cs" />
|
|
<Compile Include="Source\Networking\ChatMessage.cs" />
|
|
<Compile Include="Source\Networking\Client.cs" />
|
|
<Compile Include="Source\Networking\EntitySpawner.cs" />
|
|
<Compile Include="Source\Networking\FileTransfer\FileSender.cs" />
|
|
<Compile Include="Source\Networking\GameServer.cs" />
|
|
<Compile Include="Source\Networking\GameServerLogin.cs" />
|
|
<Compile Include="Source\Networking\NetEntityEvent\ServerEntityEventManager.cs" />
|
|
<Compile Include="Source\Networking\NetworkMember.cs" />
|
|
<Compile Include="Source\Networking\OrderChatMessage.cs" />
|
|
<Compile Include="Source\Networking\RespawnManager.cs" />
|
|
<Compile Include="Source\Networking\ServerSettings.cs" />
|
|
<Compile Include="Source\Networking\SteamManager.cs" />
|
|
<Compile Include="Source\Networking\Voip\VoipServer.cs" />
|
|
<Compile Include="Source\Networking\Voting.cs" />
|
|
<Compile Include="Source\Networking\WhiteList.cs" />
|
|
<Compile Include="Source\Physics\PhysicsBody.cs" />
|
|
<Compile Include="Source\PlayerInput.cs" />
|
|
<Compile Include="Source\Program.cs" />
|
|
<Compile Include="Source\Screens\NetLobbyScreen.cs" />
|
|
<Compile Include="Source\Screens\UnimplementedScreen.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Color.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Graphics\SpriteEffects.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Input\KeyboardState.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Input\Keys.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Input\KeyState.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Point.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Quaternion.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Rectangle.cs" />
|
|
<Compile Include="Source\Utils\MonogameTypes\Vector4.cs" />
|
|
<Compile Include="Source\Utils\XnaToConsoleColor.cs" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\..\Libraries\Facepunch.Steamworks\Facepunch.Steamworks.csproj">
|
|
<Project>{3af0347c-5a9b-4421-868c-8ee3dbfaebc6}</Project>
|
|
<Name>Facepunch.Steamworks</Name>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\..\Libraries\Farseer Physics Engine 3.5\Farseer Physics.csproj">
|
|
<Project>{a4610e4c-dd34-428b-babb-779ca0b5993a}</Project>
|
|
<Name>Farseer Physics</Name>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\..\Libraries\Hyper.ComponentModel\Hyper.ComponentModel.csproj">
|
|
<Project>{3b8f9edb-6e5e-450c-abc2-ec49075d0b50}</Project>
|
|
<Name>Hyper.ComponentModel</Name>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\..\Libraries\Lidgren.Network\Lidgren.Network.csproj">
|
|
<Project>{49ba1c69-6104-41ac-a5d8-b54fa9f696e8}</Project>
|
|
<Name>Lidgren.Network</Name>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
|
|
<Visible>False</Visible>
|
|
<ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
|
|
<Install>true</Install>
|
|
</BootstrapperPackage>
|
|
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
|
<Visible>False</Visible>
|
|
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
|
<Install>false</Install>
|
|
</BootstrapperPackage>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<WCFMetadata Include="Service References\" />
|
|
</ItemGroup>
|
|
<ItemGroup />
|
|
<ItemGroup>
|
|
<None Include="packages.config" />
|
|
</ItemGroup>
|
|
<Import Project="..\BarotraumaShared\SharedCode.projitems" Label="Shared" />
|
|
<Import Project="..\BarotraumaShared\SharedContent.projitems" Label="Shared" />
|
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
<Import Project="..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\build\net45\GameAnalytics.Mono.SDK.targets" Condition="Exists('..\..\Libraries\NuGet\GameAnalytics.Mono.SDK.1.1.12\build\net45\GameAnalytics.Mono.SDK.targets')" />
|
|
</Project> |