Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!NavigationMeshAsset
Id: 355e2ef3-1b55-42be-af1d-ce219d71f584
SerializedVersion: {Xenko: 2.0.0.0}
SerializedVersion: {Stride: 2.0.0.0}
Tags: []
Scene: 50be6bd0-3731-42cd-9cfe-ddc2aa5a0090:MainScene
IncludedCollisionGroups: AllFilter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!SceneAsset
Id: 412503d3-04f6-49be-a8b4-27571fdd49f6
SerializedVersion: {Xenko: 3.1.0.1}
SerializedVersion: {Stride: 3.1.0.1}
Tags: []
ChildrenIds: []
Offset: {X: 0.0, Y: 0.0, Z: 0.0}
Expand Down
33 changes: 15 additions & 18 deletions Xenko.ClientServerSample.Server/HeadlessGame.cs
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
// Copyright (c) Xenko contributors (https://xenko.com)
// Copyright (c) Xenko contributors (https://xenko.com)
// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xenko.Core;
using Xenko.Core.IO;
using Xenko.Core.Mathematics;
using Xenko.Core.Serialization;
using Xenko.Core.Serialization.Contents;
using Xenko.Core.Storage;
using Xenko.Engine;
using Xenko.Engine.Design;
using Xenko.Engine.Network;
using Xenko.Games;
using Xenko.Physics;
using Stride.Core;
using Stride.Core.IO;
using Stride.Core.Mathematics;
using Stride.Core.Serialization;
using Stride.Core.Serialization.Contents;
using Stride.Core.Storage;
using Stride.Engine;
using Stride.Engine.Design;
using Stride.Engine.Network;
using Stride.Games;
using Stride.Physics;

namespace Xenko.ClientServerSample.Server
namespace Stride.ClientServerSample.Server
{
class HeadlessGame
{
public ServiceRegistry Services { get; private set; }

public ContentManager Content { get; private set; }

static void Main(string[] args)
static void Main()
{
new HeadlessGame().Run().Wait();
}
Expand Down Expand Up @@ -90,4 +87,4 @@ public async Task Run()
Console.ReadKey();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<OutputPath>..\Bin\Server\$(Configuration)\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand All @@ -13,7 +13,12 @@

<ItemGroup>
<ProjectReference Include="..\Xenko.ClientServerSample\Xenko.ClientServerSample.csproj" />
<PackageReference Include="Xenko" Version="3.1.0.1-beta01-0359" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Stride.Core" Version="4.1.0.1459-beta" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Stride.Core.Assets.CompilerApp" Version="4.1.0.1459-beta" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
<PackageReference Include="Stride.Engine" Version="4.1.0.1459-beta" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Stride.Particles" Version="4.1.0.1459-beta" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Stride.Physics" Version="4.1.0.1459-beta" PrivateAssets="contentfiles;analyzers" />
<PackageReference Include="Stride.UI" Version="4.1.0.1459-beta" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net5.0-windows</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
<OutputType>WinExe</OutputType>
<RootNamespace>Xenko.ClientServerSample.Windows</RootNamespace>

<OutputPath>..\Bin\Windows\$(Configuration)\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

<!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
<DisableFastUpToDateCheck>false</DisableFastUpToDateCheck>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Xenko.ClientServerSample\Xenko.ClientServerSample.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Xenko.Engine;
using Stride.Engine;

namespace Xenko.ClientServerSample.Windows
namespace Stride.ClientServerSample.Windows
{
class Xenko_ClientServerSampleApp
{
Expand Down
2 changes: 1 addition & 1 deletion Xenko.ClientServerSample.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.168
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!Texture
Id: b531eaf3-212c-4bfb-8793-ce0b8a93a505
SerializedVersion: {Xenko: 2.0.0.0}
SerializedVersion: {Stride: 2.0.0.0}
Tags: []
Source: !file ../Resources/Crosshair256.png
Type: !ColorTextureType
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
!GameSettingsAsset
Id: 4e8cfd29-c437-4a0e-8eae-6d95384f5ebb
SerializedVersion: {Xenko: 2.1.0.3}
SerializedVersion: {Stride: 3.1.0.1}
Tags: []
DefaultScene: 50be6bd0-3731-42cd-9cfe-ddc2aa5a0090:MainScene
GraphicsCompositor: d929a46b-ada5-4f56-9498-acee739ab4f7:GraphicsCompositor
Defaults:
- !Xenko.Audio.AudioEngineSettings,Xenko.Audio
- !Stride.Audio.AudioEngineSettings,Stride.Audio
HrtfSupport: false
- !Xenko.Assets.EditorSettings,Xenko.Assets
- !Stride.Assets.EditorSettings,Stride.Assets
RenderingMode: HDR
- !Xenko.Navigation.NavigationSettings,Xenko.Navigation
- !Stride.Navigation.NavigationSettings,Stride.Navigation
EnableDynamicNavigationMesh: false
IncludedCollisionGroups: AllFilter
BuildSettings:
Expand All @@ -30,21 +30,21 @@ Defaults:
MaxClimb: 0.25
MaxSlope: {Radians: 0.7853982}
Radius: 0.5
- !Xenko.Physics.PhysicsSettings,Xenko.Physics
- !Stride.Physics.PhysicsSettings,Stride.Physics
Flags: None
MaxSubSteps: 1
FixedTimeStep: 0.0166666675
- !Xenko.Graphics.RenderingSettings,Xenko.Graphics
FixedTimeStep: 0.016666668
- !Stride.Graphics.RenderingSettings,Stride.Graphics
DefaultBackBufferWidth: 1280
DefaultBackBufferHeight: 720
AdaptBackBufferToScreen: false
DefaultGraphicsProfile: Level_10_0
ColorSpace: Linear
DisplayOrientation: LandscapeRight
- !Xenko.Streaming.StreamingSettings,Xenko.Engine
- !Stride.Streaming.StreamingSettings,Stride.Rendering
ManagerUpdatesInterval: 0:00:00:00.0330000
ResourceLiveTimeout: 0:00:00:08.0000000
- !Xenko.Assets.Textures.TextureSettings,Xenko.Assets
- !Stride.Assets.Textures.TextureSettings,Stride.Assets
TextureQuality: Fast
Overrides: []
PlatformFilters:
Expand All @@ -58,5 +58,5 @@ PlatformFilters:
- ^Mali\-4
- ^Mali\-T6
- ^Mali\-T7
SplashScreenTexture: d26edb11-10bd-403c-b3c2-9c7fcccf25e5:XenkoDefaultSplashScreen
SplashScreenTexture: d26edb11-10bd-403c-b3c2-9c7fcccf25e5:StrideDefaultSplashScreen
SplashScreenColor: {R: 0, G: 0, B: 0, A: 255}
Loading