Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into VoxelGI
Browse files Browse the repository at this point in the history
# Conflicts:
#	build/Xenko.sln
  • Loading branch information
WhyPenguins committed Feb 13, 2020
2 parents c0d69cd + 9cb2785 commit f165892
Show file tree
Hide file tree
Showing 202 changed files with 6,735 additions and 4,405 deletions.
15 changes: 15 additions & 0 deletions build/Xenko.sln
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Rendering", "..\sourc
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Voxels", "..\sources\engine\Xenko.Voxels\Xenko.Voxels.csproj", "{66BE41FC-FC52-48D0-9C04-BCE8CC393020}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.runner.xenko", "..\sources\tests\xunit.runner.xenko\xunit.runner.xenko.csproj", "{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems*{00b72ed7-00e9-47f7-868d-8162027cd068}*SharedItemsImports = 13
Expand Down Expand Up @@ -1587,6 +1589,18 @@ Global
{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Win32.ActiveCfg = Release|Any CPU
{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Win32.Build.0 = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Debug|Win32.ActiveCfg = Debug|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Debug|Win32.Build.0 = Debug|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Any CPU.Build.0 = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Win32.ActiveCfg = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Win32.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1712,6 +1726,7 @@ Global
{62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209}
{66BE41FC-FC52-48D0-9C04-BCE8CC393020} = {4C142567-C42B-40F5-B092-798882190209}
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
Expand Down
2 changes: 1 addition & 1 deletion deps/RoslynPad/checkout.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ IF NOT ERRORLEVEL 0 (
)
%GIT_CMD% clone --recursive https://github.com/aelij/RoslynPad -b master ../../externals/RoslynPad
pushd ..\..\externals\RoslynPad
%GIT_CMD% checkout c2f1c48
%GIT_CMD% checkout 0d576ca5d18d67d447bce5d078f0a568a69a677d
popd
if ERRORLEVEL 1 echo "Could not checkout RoslynPad" && pause
2 changes: 1 addition & 1 deletion deps/RoslynPad/net462/RoslynPad.Editor.Windows.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/RoslynPad/net462/RoslynPad.Editor.Windows.pdb
Git LFS file not shown
2 changes: 1 addition & 1 deletion deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.pdb
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/RoslynPad/net462/RoslynPad.Roslyn.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/RoslynPad/net462/RoslynPad.Roslyn.pdb
Git LFS file not shown
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<RootNamespace>SimpleAudio</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions samples/Games/JumpyJet/Assets/Shared/Scene.xkscene
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ Hierarchy:
Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
Scale: {X: 1.0, Y: 1.0, Z: 1.0}
Children: {}
a941cd713c0995458f02918f1c0258bd: !JumpyJet.PipesScript,JumpyJet.Game
Id: 71cd41a9-093c-4595-8f02-918f1c0258bd
a124a98b8ada02d77a29033b4c58dcc8: !JumpyJet.PipesScript,JumpyJet.Game
Id: a3abb282-de05-4800-b279-e562372a4185
PipePrefabUrl: ce7c2b81-110c-4150-bf9a-d902b03b3d41:Pipe Set
- Entity:
Id: fb0a2c4b-0ae0-47c0-a222-089448e7890c
Name: Character
Expand Down
12 changes: 6 additions & 6 deletions samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<RootNamespace>JumpyJet</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Physics" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion samples/Games/JumpyJet/JumpyJet.Game/PipesScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using Xenko.Core.Mathematics;
using Xenko.Core.Serialization;
using Xenko.Engine;
using Xenko.Engine.Events;

Expand All @@ -29,9 +30,11 @@ public class PipesScript : SyncScript
private float sceneWidth;
private float pipeOvervaluedWidth = 1f;

public UrlReference<Prefab> PipePrefabUrl { get; set; }

public override void Start()
{
var pipeSetPrefab = Content.Load<Prefab>("Pipe Set");
var pipeSetPrefab = Content.Load(PipePrefabUrl);

// Create PipeSets
sceneWidth = GameGlobals.GamePixelToUnitScale*GraphicsDevice.Presenter.BackBuffer.Width;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<RootNamespace>AnimatedModel</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions samples/Graphics/AnimatedModel/Assets/Shared/Scene.xkscene
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ Hierarchy:
Size: Large
DepthRange: {}
PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
ComputeTransmittance: false
BiasParameters: {}
ComputeTransmittance: false
Intensity: 0.6
- Entity:
Id: bb7065d2-498a-45d7-b4b1-0bb1a573cc69
Expand Down Expand Up @@ -158,8 +158,8 @@ Hierarchy:
Size: Large
DepthRange: {}
PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
ComputeTransmittance: false
BiasParameters: {}
ComputeTransmittance: false
Intensity: 0.6
- Entity:
Id: df07ee24-de65-4561-8f4a-da086654e07b
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<RootNamespace>CustomEffect</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<RootNamespace>MaterialShader</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<RootNamespace>SpriteFonts</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<RootNamespace>SpriteStudioDemo</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Physics" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.SpriteStudio.Runtime" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.SpriteStudio.Runtime" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<RootNamespace>GravitySensor</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xenko.Core" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Physics" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.1.0.1" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>
</Project>
Loading

0 comments on commit f165892

Please sign in to comment.