Skip to content

Commit 243e8c8

Browse files
committed
Merge branch 'master' into xplat-editor
2 parents ee1b1e6 + 9ea93a6 commit 243e8c8

File tree

620 files changed

+30594
-9878
lines changed

Some content is hidden

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

620 files changed

+30594
-9878
lines changed

.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,42 @@
680680
"contributions": [
681681
"code"
682682
]
683+
},
684+
{
685+
"login": "laske185",
686+
"name": "Peter Laske",
687+
"avatar_url": "https://avatars.githubusercontent.com/u/37439758?v=4",
688+
"profile": "https://github.com/laske185",
689+
"contributions": [
690+
"code"
691+
]
692+
},
693+
{
694+
"login": "MikhailArsentevTheSecond",
695+
"name": "Mikhail Arsentev",
696+
"avatar_url": "https://avatars.githubusercontent.com/u/22962265?v=4",
697+
"profile": "https://github.com/MikhailArsentevTheSecond",
698+
"contributions": [
699+
"code"
700+
]
701+
},
702+
{
703+
"login": "hoelzl",
704+
"name": "Matthias Hölzl",
705+
"avatar_url": "https://avatars.githubusercontent.com/u/35998?v=4",
706+
"profile": "https://github.com/hoelzl",
707+
"contributions": [
708+
"code"
709+
]
710+
},
711+
{
712+
"login": "kutal10",
713+
"name": "Rahul Pai ",
714+
"avatar_url": "https://avatars.githubusercontent.com/u/36085864?v=4",
715+
"profile": "https://github.com/kutal10",
716+
"contributions": [
717+
"code"
718+
]
683719
}
684720
],
685721
"contributorsPerLine": 7,

.github/CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# 🤝 Contributing
2+
3+
For questions and general discussions, please join our [Discord server](https://discord.gg/f6aerfE) or participate in [GitHub Discussions](https://github.com/stride3d/stride/discussions).
4+
5+
To report bugs or propose features, please use the [Issues](https://github.com/stride3d/stride/issues) section on GitHub.
6+
7+
We welcome code contributions via pull requests. Issues tagged with **[`good first issue`](https://github.com/stride3d/stride/labels/good%20first%20issue)** are great starting points for code contributions.
8+
9+
You can help us translate Stride; check out our [Localization Guide](https://doc.stride3d.net/latest/en/contributors/engine/localization.html).
10+
11+
## Earn Money by Contributing
12+
13+
If you are a developer with solid experience in C#, rendering techniques, or game development, we want to hire you! We have allocated funds from supporters on [Open Collective](https://opencollective.com/stride3d) and can pay for work on certain projects. [More information is available here](https://doc.stride3d.net/latest/en/contributors/engine/bug-bounties.html).
14+

.github/copilot-instructions.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Stride Game Engine Copilot Instructions
2+
3+
This document provides guidelines and best practices for using GitHub Copilot and Copilot Chat within the Stride Game Engine repository. The goal is to ensure Copilot is used effectively and consistently to maintain code quality, project standards, and team productivity.
4+
5+
## Coding & Contribution Guidelines
6+
7+
- Prefer concise, well-documented, and idiomatic C# code.
8+
- Do not use `#region` directives; prefer clear, self-documenting code.
9+
10+
## Copilot Pull Request Code Review Instructions
11+
12+
Stride is a game engine project that requires careful code reviews to maintain quality and performance. Please follow these guidelines when reviewing pull requests (PRs):
13+
14+
- Generate a neat and concise Pull Request Overview, highlighting the most important changes.
15+
- Focus reviews on logic, safety, performance, and code consistency with the existing codebase.
16+
- Avoid suggesting large architectural changes in PR reviews.
17+
- Comments on formatting, grammar, or spelling are welcome.
18+
- Minor style or nit-pick comments are acceptable to maintain consistency.
19+
- Do not review auto-generated, third-party code, binary files, or assets.
20+
- If you find a bug or performance issue, suggest a concrete fix in the PR.
21+
- For large PRs (20+ C#/*.cs files), do not attempt a full review, only highlight critical or blocking issues.
22+
- Always consider the context and established patterns in the Stride codebase before making suggestions.
23+
24+
The goal is to minimize noise and maximize helpful, actionable feedback.

.github/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ changelog:
88
- title: 💥 Breaking Changes
99
labels:
1010
- breaking-change
11+
- behavioral-change
1112
- title: 🎉 New Features
1213
labels:
1314
- enhancement

.github/workflows/build-android.yml

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,42 @@ jobs:
5151
lfs: true
5252
- uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '8.0.x'
54+
dotnet-version: '10.0.x'
55+
- name: Install Android Workload
56+
run: dotnet workload install android
57+
- name: Remove Conflicting NDK
58+
shell: pwsh
59+
run: |
60+
$conflictingNdk = "C:\Android\android-sdk\ndk\26.3.11579264"
61+
if (Test-Path $conflictingNdk) {
62+
Write-Host "Removing conflicting NDK 26.3.11579264"
63+
Remove-Item -Path $conflictingNdk -Recurse -Force
64+
}
65+
- name: Setup Android
66+
uses: android-actions/setup-android@v3
67+
with:
68+
cmdline-tools-version: 12266719
69+
accept-android-sdk-licenses: true
70+
log-accepted-android-sdk-licenses: true
71+
packages: tools platform-tools ndk;21.4.7075529
72+
- name: Configure NDK Environment
73+
shell: pwsh
74+
run: |
75+
$ndkPath = "$env:ANDROID_SDK_ROOT\ndk\21.4.7075529"
76+
echo "ANDROID_NDK_ROOT=$ndkPath" >> $env:GITHUB_ENV
77+
echo "ANDROID_NDK_HOME=$ndkPath" >> $env:GITHUB_ENV
78+
echo "Using NDK at: $ndkPath"
5579
- uses: microsoft/setup-msbuild@v2
80+
- name: Debug NDK Configuration
81+
shell: pwsh
82+
run: |
83+
Write-Host "ANDROID_SDK_ROOT: $env:ANDROID_SDK_ROOT"
84+
Write-Host "ANDROID_NDK_ROOT: $env:ANDROID_NDK_ROOT"
85+
Write-Host "ANDROID_NDK_HOME: $env:ANDROID_NDK_HOME"
86+
Write-Host "NDK Path exists: $(Test-Path $env:ANDROID_NDK_ROOT)"
87+
if (Test-Path "$env:ANDROID_NDK_ROOT\source.properties") {
88+
Get-Content "$env:ANDROID_NDK_ROOT\source.properties"
89+
}
5690
- name: Build
5791
run: |
5892
msbuild build\Stride.Android.sln `
@@ -61,4 +95,5 @@ jobs:
6195
-p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
6296
-p:StridePlatforms=Android `
6397
-p:StrideSkipUnitTests=true `
64-
-p:StrideSkipAutoPack=true
98+
-p:StrideSkipAutoPack=true `
99+
-p:_AndroidNdkDirectory="$env:ANDROID_NDK_ROOT"

.github/workflows/build-assembly-processor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
lfs: true
4848
- uses: actions/setup-dotnet@v4
4949
with:
50-
dotnet-version: '8.0.x'
50+
dotnet-version: '10.0.x'
5151
- name: Build
5252
run: |
5353
dotnet build build\Stride.AssemblyProcessor.sln `

.github/workflows/build-ios.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ jobs:
5151
lfs: true
5252
- uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '8.0.x'
54+
dotnet-version: '10.0.x'
55+
- name: Install .NET iOS Workload
56+
run: dotnet workload install ios
5557
- uses: microsoft/setup-msbuild@v2
5658
- name: Build
5759
run: |

.github/workflows/build-launcher.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
lfs: true
5050
- uses: actions/setup-dotnet@v4
5151
with:
52-
dotnet-version: '8.0.x'
52+
dotnet-version: '10.0.x'
5353
- uses: microsoft/setup-msbuild@v2
5454
- name: Build
5555
run: |

.github/workflows/build-linux-runtime.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
lfs: true
6262
- uses: actions/setup-dotnet@v4
6363
with:
64-
dotnet-version: '8.0.x'
64+
dotnet-version: '10.0.x'
6565
- name: Install dependencies
6666
run: |
6767
sudo apt-get install clang lld

.github/workflows/build-vs-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
lfs: true
4747
- uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: '8.0.x'
49+
dotnet-version: '10.0.x'
5050
- uses: microsoft/setup-msbuild@v2
5151
- name: Build
5252
run: |

0 commit comments

Comments
 (0)