Skip to content

Commit

Permalink
Merge pull request #649 from xen2/stride
Browse files Browse the repository at this point in the history
Rename Xenko to Stride
  • Loading branch information
xen2 authored Apr 19, 2020
2 parents b372503 + aa446e2 commit 273dfdd
Show file tree
Hide file tree
Showing 14,586 changed files with 320,303 additions and 320,390 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ glslangValidator filter=lfs diff=lfs merge=lfs -text
*.hdr filter=lfs diff=lfs merge=lfs -text
*.exr filter=lfs diff=lfs merge=lfs -text
*.raw filter=lfs diff=lfs merge=lfs -text
*.xkimg filter=lfs diff=lfs merge=lfs -text
*.sdimg filter=lfs diff=lfs merge=lfs -text

# sound
*.wav filter=lfs diff=lfs merge=lfs -text
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ assignees: ''

---
<!--- Most questions and comments are more appropriately asked in our forums or discord server -->
<!--- Visit our forums at https://forums.xenko.com/ -->
<!--- Visit our forums at https://forums.stride3d.net/ -->
<!--- Visit our discord server at https://discord.gg/f6aerfE --->
# Question and/or Comment
44 changes: 22 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Debug_static
Release_static
CodeAnalyst
UpgradeLog*
xenko_doc_output
stride_doc_output
doc/doxygen/html
Tools/bin
Temp/
Expand All @@ -45,14 +45,14 @@ ipch/
obj/
.vs/
Cache/
/doc/xenko_doc_output/
/build/Xenko.version
/build/Xenko.*VC.db
/doc/stride_doc_output/
/build/Stride.version
/build/Stride.*VC.db
/tools
/externals/
/sources/common/externals/
/sources/tools/Xenko.ShaderKeyGenerator/build/
/sources/tools/Xenko.ProjectGenerator/build/
/sources/tools/Stride.ShaderKeyGenerator/build/
/sources/tools/Stride.ProjectGenerator/build/
/sources/tools/SLConverter/BuildRelease/Package/SLConverter-*.pdf
/sources/tools/SLConverter/BuildRelease/Package/bin/x64/SLConverter.exe
/sources/tools/SLConverter/BuildRelease/Package/bin/x86/SLConverter.exe
Expand All @@ -65,31 +65,31 @@ Cache/
/tools/
**/Properties/launchSettings.json
launch-android.bat
sources/tests/framework/Xenko.Framework.Audio.Tests/Resources/Resource.Designer.cs
sources/tests/framework/Stride.Framework.Audio.Tests/Resources/Resource.Designer.cs
Win32
Win32Debug
launch-ios.bat
sources/engine/Xenko.Graphics.Tests/log/
sources/engine/Stride.Graphics.Tests/log/
*.androidcache
sources/engine/Xenko.Graphics/log/
sources/engine/Xenko.Graphics/Shaders/log/
sources/engine/Xenko.Input.Tests/app_data/
sources/engine/Xenko.UI.Tests/log/
sources/engine/Xenko.UI.Tests/app_data/
sources/engine/Xenko.Graphics.Tests/app_data/
sources/tests/framework/Xenko.Framework.Audio.Tests/app_data/
sources/engine/Stride.Graphics/log/
sources/engine/Stride.Graphics/Shaders/log/
sources/engine/Stride.Input.Tests/app_data/
sources/engine/Stride.UI.Tests/log/
sources/engine/Stride.UI.Tests/app_data/
sources/engine/Stride.Graphics.Tests/app_data/
sources/tests/framework/Stride.Framework.Audio.Tests/app_data/
libfreetype.a
libcore.a
libbulletc.a
libNativePath.a
libxenkonative_arm64.a
libxenkonative_armv7.a
libxenkonative_armv7s.a
libxenkonative_i386.a
libxenkonative_x86_64.a
libstridenative_arm64.a
libstridenative_armv7.a
libstridenative_armv7s.a
libstridenative_i386.a
libstridenative_x86_64.a
*.CachedGlyphs
*.CachedImage
sources/engine/Xenko.Graphics/Shaders.Bytecodes/log/
sources/engine/Stride.Graphics/Shaders.Bytecodes/log/
log
x64Debug
x64Release
Expand All @@ -104,7 +104,7 @@ samplesGenerated
.DS_Store

## Build generated
sources/tools/Xenko iOS Relay/build/
sources/tools/Stride iOS Relay/build/
DerivedData

## Various settings
Expand Down
4 changes: 2 additions & 2 deletions BACKERS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Sponsors & Backers
==================

Xenko is a MIT-licensed opensource project, supported by generous [sponsors and backers](https://github.com/xenko3d/xenko/blob/master/BACKERS.md).
Stride is a MIT-licensed opensource project, supported by generous [sponsors and backers](https://github.com/stride3d/stride/blob/master/BACKERS.md).

[Become a sponsor or backer for the project](https://www.patreon.com/xenko).
[Become a sponsor or backer for the project](https://www.patreon.com/stride3d).

Thank you everybody for your generous contributions!

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018-2019 Xenko contributors (https://xenko.com)
Copyright (c) 2018-2019 Stride contributors (https://stride3d.net)
Copyright (c) 2011-2018 Silicon Studio Corp. (https://www.siliconstudio.co.jp)

All rights reserved.
Expand Down
64 changes: 32 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
![Xenko](https://xenko.com/images/external/xenko-logo-side.png)
![Stride](sources/data/images/Logo/stride-logo-readme.png)
=======

Welcome to the Xenko source code repository!
Welcome to the Stride source code repository!

Xenko is an open-source C# game engine for realistic rendering and VR.
Stride is an open-source C# game engine for realistic rendering and VR.
The engine is highly modular and aims at giving game makers more flexibility in their development.
Xenko comes with an editor that allows you create and manage the content of your games or applications in a visual and intuitive way.
Stride comes with an editor that allows you create and manage the content of your games or applications in a visual and intuitive way.

![Xenko Editor](https://xenko.com/images/external/script-editor.png)
![Stride Editor](https://stride3d.net/images/external/script-editor.png)

To learn more about Xenko, visit [xenko.com](https://xenko.com/).
To learn more about Stride, visit [stride3d.net](https://stride3d.net/).

## License

Xenko is covered by [MIT](LICENSE.md), unless stated otherwise (i.e. for some files that are copied from other projects).
Stride is covered by [MIT](LICENSE.md), unless stated otherwise (i.e. for some files that are copied from other projects).

You can find the list of third party projects [here](THIRD%20PARTY.md).

Contributors need to sign the following [Contribution License Agreement](docs/ContributorLicenseAgreement.md).

## Documentation

Find explanations and information about Xenko:
* [Xenko Manual](https://doc.xenko.com/latest/manual/index.html)
* [API Reference](https://doc.xenko.com/latest/api/index.html)
* [Release Notes](https://doc.xenko.com/latest/ReleaseNotes/index.html)
Find explanations and information about Stride:
* [Stride Manual](https://doc.stride3d.net/latest/manual/index.html)
* [API Reference](https://doc.stride3d.net/latest/api/index.html)
* [Release Notes](https://doc.stride3d.net/latest/ReleaseNotes/index.html)

## Community

Ask for help or report issues:
* [Chat with the community on Discord](https://discord.gg/f6aerfE) [![Join the chat at https://discord.gg/f6aerfE](https://img.shields.io/discord/500285081265635328.svg?style=flat&logo=discord&label=discord)](https://discord.gg/f6aerfE)
* [Discuss topics on our forums](http://forums.xenko.com/)
* [Report engine issues](https://github.com/xenko3d/xenko/issues)
* [Donate to support the project](https://www.patreon.com/xenko)
* [List of Projects made by users](https://github.com/xenko3d/xenko-community-projects)
* [Discuss topics on our forums](http://forums.stride3d.net/)
* [Report engine issues](https://github.com/stride3d/stride/issues)
* [Donate to support the project](https://www.patreon.com/stride3d)
* [List of Projects made by users](https://github.com/stride3d/stride-community-projects)
* [Localization](docs/localization.md)

## Building from source
Expand All @@ -55,12 +55,12 @@ Ask for help or report issues:
* Optional (to target iOS/Android): `Mobile development with .NET` and `Android SDK setup (API level 27)` individual component, then in Visual Studio go to `Tools > Android > Android SDK Manager` and install `NDK` (version 19+) from `Tools` tab.
3. [FBX SDK 2019.0 VS2015](https://www.autodesk.com/developer-network/platform-technologies/fbx-sdk-2019-0)

### Build Xenko
### Build Stride

1. Clone Xenko: `git clone https://github.com/xenko3d/xenko.git`
2. Open `<XenkoDir>\build\Xenko.sln` with Visual Studio 2019, and build.
3. Open `<XenkoDir>\samples\XenkoSamples.sln` and play with the samples.
4. Optionally, open and build `Xenko.Android.sln`, `Xenko.iOS.sln`, etc...
1. Clone Stride: `git clone https://github.com/stride3d/stride.git`
2. Open `<StrideDir>\build\Stride.sln` with Visual Studio 2019, and build.
3. Open `<StrideDir>\samples\StrideSamples.sln` and play with the samples.
4. Optionally, open and build `Stride.Android.sln`, `Stride.iOS.sln`, etc...

### Contribution Guidelines

Expand All @@ -70,15 +70,15 @@ Please check our [Contributing Guidelines](docs/CONTRIBUTING.md).

|Branch| **master** |
|:--:|:--:|
|Windows D3D11|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsD3d11&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsD3d11),branch:master/statusIcon"/></a>
|Windows D3D12|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsD3d12&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsD3d12),branch:master/statusIcon"/></a>
|Windows Vulkan|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsVulkan&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsVulkan),branch:master/statusIcon"/></a>
|Windows OpenGL|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsOpenGL&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsOpenGL),branch:master/statusIcon"/></a>
|Windows OpenGL ES|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsOpenGLES&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsOpenGLES),branch:master/statusIcon"/></a>
|UWP|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsUWP&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsUWP),branch:master/statusIcon"/></a>
|iOS|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildiOS&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildiOS),branch:master/statusIcon"/></a>
|Android|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildAndroid&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildAndroid),branch:master/statusIcon"/></a>
|Linux Vulkan|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildLinuxVulkan&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildLinuxVulkan),branch:master/statusIcon"/></a>
|Linux OpenGL|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildLinuxOpenGL&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildLinuxOpenGL),branch:master/statusIcon"/></a>
|Tests Windows Simple| <a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_Tests_WindowsSimple&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_Tests_WindowsSimple),branch:master/statusIcon"/></a>
|Tests Windows D3D11|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_Tests_WindowsD3D11&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_Tests_WindowsD3D11),branch:master/statusIcon"/></a>
|Windows D3D11|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildWindowsD3d11&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildWindowsD3d11),branch:master/statusIcon"/></a>
|Windows D3D12|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildWindowsD3d12&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildWindowsD3d12),branch:master/statusIcon"/></a>
|Windows Vulkan|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildWindowsVulkan&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildWindowsVulkan),branch:master/statusIcon"/></a>
|Windows OpenGL|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildWindowsOpenGL&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildWindowsOpenGL),branch:master/statusIcon"/></a>
|Windows OpenGL ES|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildWindowsOpenGLES&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildWindowsOpenGLES),branch:master/statusIcon"/></a>
|UWP|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildWindowsUWP&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildWindowsUWP),branch:master/statusIcon"/></a>
|iOS|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildiOS&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildiOS),branch:master/statusIcon"/></a>
|Android|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildAndroid&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildAndroid),branch:master/statusIcon"/></a>
|Linux Vulkan|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildLinuxVulkan&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildLinuxVulkan),branch:master/statusIcon"/></a>
|Linux OpenGL|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_BuildLinuxOpenGL&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_BuildLinuxOpenGL),branch:master/statusIcon"/></a>
|Tests Windows Simple| <a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_Tests_WindowsSimple&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_Tests_WindowsSimple),branch:master/statusIcon"/></a>
|Tests Windows D3D11|<a href="https://teamcity.stride3d.net/viewType.html?buildTypeId=Engine_Tests_WindowsD3D11&branch=master&guest=1"><img src="https://teamcity.stride3d.net/app/rest/builds/buildType:(id:Engine_Tests_WindowsD3D11),branch:master/statusIcon"/></a>
6 changes: 3 additions & 3 deletions THIRD PARTY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Third Party Software

Xenko uses the following open-source products.
Stride uses the following open-source products.

## Runtime

Expand Down Expand Up @@ -36,7 +36,7 @@ Xenko uses the following open-source products.

## Editor & Build

### License gift to Xenko
### License gift to Stride

* [Advanced Installer](https://www.advancedinstaller.com/) graciously offered us an Enterprise license. Thanks!
* [NDepend](https://www.ndepend.com/) for static code analysis. Thanks for providing us an Open Source license!
Expand All @@ -48,7 +48,7 @@ Xenko uses the following open-source products.
* [DocFX](https://dotnet.github.io/docfx/) (MIT License)
* [ffmpeg](https://ffmpeg.org/) (GPL 3)
* [FreeImage](http://freeimage.sourceforge.net/) (FreeImage Public License - Version 1.0)
* [Gettext.NET](https://sourceforge.net/projects/gettextnet/) (LGPL 2.1, [modified binaries](https://github.com/xenko3d/gettextnet))
* [Gettext.NET](https://sourceforge.net/projects/gettextnet/) (LGPL 2.1, [modified binaries](https://github.com/stride3d/gettextnet))
* [ILRepack](https://github.com/gluck/il-repack) (Apache License 2.0)
* [ImageMagick](http://www.imagemagick.org/)
* [Markdown.XAML](https://github.com/theunrepentantgeek/Markdown.XAML) (MIT License)
Expand Down
2 changes: 1 addition & 1 deletion build/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*.nupkg
XenkoSetup*.exe
StrideSetup*.exe
/TestResults
18 changes: 18 additions & 0 deletions build/01-InstallStrideForVisualStudio.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@echo off
setlocal
rmdir /S /Q "%LOCALAPPDATA%\temp\Stride"
REM -------------------------------------------------------------------
REM Global config
REM -------------------------------------------------------------------
set STRIDE_OUTPUT_DIR=%~dp0\..\Bin
set STRIDE_VSIX=%STRIDE_OUTPUT_DIR%\VSIX\Stride.vsix
REM -------------------------------------------------------------------
REM Build Stride
REM -------------------------------------------------------------------
IF EXIST "%STRIDE_VSIX%" GOTO :vsixok
echo Error, unable to find Stride VSIX [%STRIDE_VSIX%]
echo Run 00-BuildStride.bat before trying to install the VisualStudio package
pause
exit /b 1
:vsixok
"%STRIDE_VSIX%"
18 changes: 0 additions & 18 deletions build/01-InstallXenkoForVisualStudio.bat

This file was deleted.

2 changes: 1 addition & 1 deletion build/BuildXmlDocumentation.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat"
msbuild Xenko.build /p:XenkoGenerateDoc=true /t:BuildWindows > NUL
msbuild Stride.build /p:StrideGenerateDoc=true /t:BuildWindows > NUL

2 changes: 1 addition & 1 deletion build/BuildXmlDocumentationVS2015.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CALL "%VS140COMNTOOLS%VsDevCmd.bat"
msbuild Xenko.build /p:XenkoGenerateDoc=true /t:BuildWindows > NUL
msbuild Stride.build /p:StrideGenerateDoc=true /t:BuildWindows > NUL

2 changes: 2 additions & 0 deletions build/Stride.AllPlatforms.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set StridePlatforms=Windows;UWP;Android;iOS;Linux
Stride.sln
8 changes: 8 additions & 0 deletions build/Stride.Android.PreSettings.Local.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!-- Build file pre-included by all Stride projects -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<StrideCommonPreSettingsName>Stride</StrideCommonPreSettingsName>
<StridePlatforms Condition="'$(StridePlatforms)' == ''">Windows;Android</StridePlatforms>
</PropertyGroup>
</Project>

19 changes: 19 additions & 0 deletions build/Stride.Android.TestApks.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project DefaultTargets="SignAndroidPackage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
<SolutionName>Stride.Android</SolutionName>
<Platform>Android</Platform>
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
</PropertyGroup>
<ItemGroup>
<ProjectsToBuild Include="..\sources\**\*.Android.csproj"/>
</ItemGroup>

<Target Name="SignAndroidPackage">
<MSBuild Projects ="@(ProjectsToBuild)"
Targets="SignAndroidPackage"
Properties="Configuration=$(Configuration);Platform=$(Platform);SolutionName=$(SolutionName);SolutionDir=$(SolutionDir);AndroidDeploymentMode=AndroidAPKDeployment">
<Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
</MSBuild>
</Target>
</Project>
Loading

0 comments on commit 273dfdd

Please sign in to comment.