Merge branch 'CBT' into dev_itemrefactor
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
|
||||
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
@@ -349,6 +350,7 @@ namespace FarseerPhysics.Dynamics
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Create all proxies.
|
||||
/// </summary>
|
||||
|
||||
@@ -1,40 +1,40 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<RootNamespace>FarseerPhysics</RootNamespace>
|
||||
<Copyright>Copyright Ian Qvist © 2013</Copyright>
|
||||
<Product>Farseer Physics Engine</Product>
|
||||
<Company></Company>
|
||||
<Version>3.5.0.0</Version>
|
||||
<Authors>Ian Qvist</Authors>
|
||||
<Platforms>AnyCPU;x64</Platforms>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<DebugType>portable</DebugType>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="DebugLinux\**" />
|
||||
<Compile Remove="DebugWindows\**" />
|
||||
<Compile Remove="ReleaseWindows\**" />
|
||||
<EmbeddedResource Remove="DebugLinux\**" />
|
||||
<EmbeddedResource Remove="DebugWindows\**" />
|
||||
<EmbeddedResource Remove="ReleaseWindows\**" />
|
||||
<None Remove="DebugLinux\**" />
|
||||
<None Remove="DebugWindows\**" />
|
||||
<None Remove="ReleaseWindows\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\XNATypes\XNATypes.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<RootNamespace>FarseerPhysics</RootNamespace>
|
||||
<Copyright>Copyright Ian Qvist © 2013</Copyright>
|
||||
<Product>Farseer Physics Engine</Product>
|
||||
<Company></Company>
|
||||
<Version>3.5.0.0</Version>
|
||||
<Authors>Ian Qvist</Authors>
|
||||
<Platforms>AnyCPU;x64</Platforms>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<DebugType>portable</DebugType>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="DebugLinux\**" />
|
||||
<Compile Remove="DebugWindows\**" />
|
||||
<Compile Remove="ReleaseWindows\**" />
|
||||
<EmbeddedResource Remove="DebugLinux\**" />
|
||||
<EmbeddedResource Remove="DebugWindows\**" />
|
||||
<EmbeddedResource Remove="ReleaseWindows\**" />
|
||||
<None Remove="DebugLinux\**" />
|
||||
<None Remove="DebugWindows\**" />
|
||||
<None Remove="ReleaseWindows\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\XNATypes\XNATypes.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
Reference in New Issue
Block a user