Skip to content

Commit 3871941

Browse files
committed
Merge branch 'master' into upstream_xplat-editor
2 parents 9330c75 + 6c64331 commit 3871941

File tree

209 files changed

+3414
-28731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+3414
-28731
lines changed

README.old.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<p>
2-
<picture>
2+
<a href="https://www.stride3d.net/">
3+
<picture>
34
<source media="(prefers-color-scheme: dark)" srcset="https://media.githubusercontent.com/media/stride3d/stride/84092e8aa924e2039b3f8d968907b48fc699c6b3/sources/data/images/Logo/stride-logo-readme-white.png">
45
<source media="(prefers-color-scheme: light)" srcset="https://media.githubusercontent.com/media/stride3d/stride/84092e8aa924e2039b3f8d968907b48fc699c6b3/sources/data/images/Logo/stride-logo-readme-black.png">
5-
<a href="https://www.stride3d.net/"><img alt="The stride logo, a geometrical 'S' in the form of a cube" src="https://media.githubusercontent.com/media/stride3d/stride/84092e8aa924e2039b3f8d968907b48fc699c6b3/sources/data/images/Logo/stride-logo-readme-black.png"></a>
6-
</picture>
6+
<img alt="The stride logo, a geometrical 'S' in the form of a cube" src="https://media.githubusercontent.com/media/stride3d/stride/84092e8aa924e2039b3f8d968907b48fc699c6b3/sources/data/images/Logo/stride-logo-readme-black.png">
7+
</picture>
8+
</a>
79
</p>
810

911
[![Join the chat at https://discord.gg/f6aerfE](https://img.shields.io/discord/500285081265635328.svg?style=flat&logo=discord&label=discord&logoColor=f2f2f2)](https://discord.gg/f6aerfE)
@@ -45,11 +47,12 @@ Our [Roadmap](https://doc.stride3d.net/latest/en/contributors/roadmap.html) comm
4547
1. **Latest [Git](https://git-scm.com/downloads)** with **Large File Support** selected during setup. For convenience, you might also use a Git UI client like [GitExtensions](https://gitextensions.github.io/).
4648
2. **[.NET 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)**
4749
- Run `dotnet --info` in a console or PowerShell window to see which versions you have installed.
48-
3. **[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)** (the Community edition is free) with the following workloads:
49-
- **.NET desktop development** with **.NET Framework 4.7.2 targeting pack** (should be enabled by default)
50+
3. **[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)** (the Community edition is free), with the following workloads. Follow this link if you would rather use [a different IDE or the command line](#build-stride-without-visual-studio).
51+
- **.NET desktop development** with **.NET Framework 4.7.2 targeting pack** *(should be enabled by default)*
5052
- **Desktop development with C++** with:
51-
- **Windows 11 SDK (10.0.22621.0)** or a later version (should be enabled by default)
52-
- **MSVC v143 - VS2022 C++ x64/x86 build tools (Latest)** (should be enabled by default)
53+
- **Windows 11 SDK (10.0.22621.0)** or a later version *(should be enabled by default)*
54+
- **MSVC v143 - VS2022 C++ x64/x86 build tools (Latest)** *(should be enabled by default)*
55+
- **MSVC v143 - VS2022 C++ ARM64/ARM64EC build tools (Latest)** *(not enabled by default, click Individual components tab to select or search)*
5356
- **C++/CLI support for v143 build tools (Latest)** *(not enabled by default)*
5457
- *Optional* (to target iOS/Android): **.NET Multi-platform App UI development** and the **Android SDK setup** individual component (enabled by default). Then, in Visual Studio, go to `Tools > Android > Android SDK Manager` and install **NDK** (version 20.1+) from the `Tools` tab.
5558
- *Optional* (to build the VSIX package): **Visual Studio extension development**
@@ -267,6 +270,8 @@ Thanks to all these wonderful people who have contributed to Stride!
267270
<td align="center" valign="top" width="14.28%"><a href="http://yerkoandrei.github.io"><img src="https://avatars.githubusercontent.com/u/19843418?v=4?s=100" width="100px;" alt="Yerko Andrei"/><br /><sub><b>Yerko Andrei</b></sub></a><br /><a href="https://github.com/stride3d/stride/commits?author=YerkoAndrei" title="Code">💻</a></td>
268271
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ComputerSmoke"><img src="https://avatars.githubusercontent.com/u/22194459?v=4?s=100" width="100px;" alt="Addison Schmidt"/><br /><sub><b>Addison Schmidt</b></sub></a><br /><a href="https://github.com/stride3d/stride/commits?author=ComputerSmoke" title="Code">💻</a></td>
269272
<td align="center" valign="top" width="14.28%"><a href="https://github.com/timconner"><img src="https://avatars.githubusercontent.com/u/22841670?v=4?s=100" width="100px;" alt="Tim Conner"/><br /><sub><b>Tim Conner</b></sub></a><br /><a href="https://github.com/stride3d/stride/commits?author=timconner" title="Code">💻</a></td>
273+
<td align="center" valign="top" width="14.28%"><a href="https://www.caleblamcodes.dev/"><img src="https://avatars.githubusercontent.com/u/67606076?v=4?s=100" width="100px;" alt="Caleb L."/><br /><sub><b>Caleb L.</b></sub></a><br /><a href="https://github.com/stride3d/stride/commits?author=ClamEater14" title="Code">💻</a></td>
274+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/net2cn"><img src="https://avatars.githubusercontent.com/u/6072596?v=4?s=100" width="100px;" alt="net2cn"/><br /><sub><b>net2cn</b></sub></a><br /><a href="https://github.com/stride3d/stride/commits?author=net2cn" title="Code">💻</a></td>
270275
</tr>
271276
</tbody>
272277
</table>

build/compile.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setlocal
44

5-
set STARTTIME=%TIME%
5+
set STARTTIME=%TIME: =0%
66
set __SkipTestBuild=true
77
set __BuildType=Debug
88
set __BuildVerbosity=n
@@ -115,7 +115,7 @@ goto :eof
115115

116116
:exit
117117

118-
set ENDTIME=%TIME%
118+
set ENDTIME=%TIME: =0%
119119

120120
echo.
121121
echo Starting time was: %STARTTIME%
@@ -130,7 +130,7 @@ rem calculating the duration is easy
130130
set /A DURATION=%ENDTIME%-%STARTTIME%
131131

132132
rem we might have measured the time inbetween days
133-
if %ENDTIME% LSS %STARTTIME% set set /A DURATION=%STARTTIME%-%ENDTIME%
133+
if %ENDTIME% LSS %STARTTIME% set /A DURATION=%STARTTIME%-%ENDTIME%
134134

135135
set /A DURATION=%DURATION%/1000
136136

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a96061f42cf402c6e3d20d4df8802ac28051dd63ff531baf1ebf1ed24b00c985
3-
size 160768
2+
oid sha256:92d72358a20dc1d658ed92a10e914e10f3fcdb26402ef9a79dd8343a112afbc9
3+
size 150016
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
A96061F42CF402C6E3D20D4DF8802AC28051DD63FF531BAF1EBF1ED24B00C985
1+
92D72358A20DC1D658ED92A10E914E10F3FCDB26402EF9A79DD8343A112AFBC9
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c531ef6b4477d53a302aa2e410f4af8c1494baf6e8c75eea9df78108840838a0
3-
size 84540
2+
oid sha256:2f5bf3cda3951ae2fe343e37c72e8b81cc045e46325d679ed01eaceb275951ae
3+
size 419328
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:8f8b52b2db00b3864791e849c88bb914a0be08ae259cd8a9054b23189a149f9d
3-
size 168960
2+
oid sha256:f23f46bee31edf39e2cf2d56545ae0056335eab83b5b4cd63ecd0961423901fc
3+
size 158208
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8F8B52B2DB00B3864791E849C88BB914A0BE08AE259CD8A9054B23189A149F9D
1+
F23F46BEE31EDF39E2CF2D56545AE0056335EAB83B5B4CD63ECD0961423901FC
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:44ce711f4ffe4e29fe6c9e0b094d5b45d410defd8fd80887e1f1a411c52e4c7d
3-
size 109740
2+
oid sha256:f07db2c58dd6e9993e0b1e49188175b2c5ec8ec0ffe726f947403faa589bbf12
3+
size 550400
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)