GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into localization

Browse Source 
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
This commit is contained in:
Wojtek Figat
2021-04-22 16:10:36 +02:00
parent c23d2ad2c4 d11a9d4d8f
commit ace8295ab7
37 changed files with 736 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Source/Platforms/DotNet/Newtonsoft.Json.dll (Stored with Git LFS)
View File

Binary file not shown.

BIN
Source/Platforms/DotNet/Newtonsoft.Json.pdb (Stored with Git LFS)
View File

Binary file not shown.

BIN
Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll (Stored with Git LFS)
View File

Binary file not shown.

3
Source/Platforms/UWP/Binaries/Project.csproj
View File

@@ -54,6 +54,7 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="Game.Build.json" />
<None Include="WSACertificate.pfx" />
</ItemGroup>
<ItemGroup>{3}
@@ -70,7 +71,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Content\**" />
<MonoDataFiles Include="Mono\**" />
<MonoDataFiles Include="$(ProjectDir)Mono\**" />
<DataSecondary Include="DataSecondary\**" />
</ItemGroup>
<ItemGroup>

BIN
Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll (Stored with Git LFS)
View File

Binary file not shown.

3
Source/Platforms/XboxOne/Binaries/Project.csproj
View File

@@ -54,6 +54,7 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="Game.Build.json" />
<None Include="WSACertificate.pfx" />
</ItemGroup>
<ItemGroup>{3}
@@ -70,7 +71,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Content\**" />
<MonoDataFiles Include="Mono\**" />
<MonoDataFiles Include="$(ProjectDir)Mono\**" />
<DataSecondary Include="DataSecondary\**" />
</ItemGroup>
<ItemGroup>