Skip to content

Commit 93f952d

Browse files
committed
Merge remote-tracking branch 'origin/main' into default_filters
2 parents ad128dd + edb34cd commit 93f952d

File tree

1,251 files changed

+82668
-34710
lines changed

Some content is hidden

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

1,251 files changed

+82668
-34710
lines changed

.cargo/config_fast_builds.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# Mold is a newer linker written by one of the authors of LLD. It boasts even greater performance, specifically
2222
# through its high parallelism, though it only supports Linux.
2323
#
24-
# Mold is disabled by default in this file. If you wish to enable it, follow the installation instructions for
24+
# Mold is disabled by default in this file. If you wish to enable it, follow the installation instructions for
2525
# your corresponding target, disable LLD by commenting out its `-Clink-arg=...` line, and enable Mold by
2626
# *uncommenting* its `-Clink-arg=...` line.
2727
#
@@ -32,7 +32,7 @@
3232
#
3333
# # Nightly configuration
3434
#
35-
# Be warned that the following features require nightly Rust, which is expiremental and may contain bugs. If you
35+
# Be warned that the following features require nightly Rust, which is experimental and may contain bugs. If you
3636
# are having issues, skip this section and use stable Rust instead.
3737
#
3838
# There are a few unstable features that can improve performance. To use them, first install nightly Rust
@@ -51,7 +51,7 @@
5151
# crates to share monomorphized generic code, so they do not duplicate work.
5252
#
5353
# In other words, instead of crate 1 generating `Foo<String>` and crate 2 generating `Foo<String>` separately,
54-
# only one crate generates `Foo<String>` and the other adds on to the pre-exiting work.
54+
# only one crate generates `Foo<String>` and the other adds on to the pre-existing work.
5555
#
5656
# Note that you may have some issues with this flag on Windows. If compiling fails due to the 65k symbol limit,
5757
# you may have to disable this setting. For more information and possible solutions to this error, see
@@ -150,7 +150,7 @@ rustflags = [
150150
# "-Zthreads=0",
151151
]
152152

153-
# Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'
153+
# Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'.
154154
# In most cases the gains are negligible, but if you are on macOS and have slow compile times you should see significant gains.
155155
# [profile.dev]
156156
# debug = 1

.github/ISSUE_TEMPLATE/docs_improvement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ assignees: ''
1010

1111
Provide a link to the documentation and describe how it could be improved. In what ways is it incomplete, incorrect, or misleading?
1212

13-
If you have suggestions on exactly what the new docs should say, feel free to include them here. Alternatively, make the changes yourself and [create a pull request](https://bevyengine.org/learn/book/contributing/code/) instead.
13+
If you have suggestions on exactly what the new docs should say, feel free to include them here. Alternatively, make the changes yourself and [create a pull request](https://bevyengine.org/learn/contribute/helping-out/writing-docs/) instead.

.github/ISSUE_TEMPLATE/performance_regression.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Performance Regression
33
about: Bevy running slowly after upgrading? Report a performance regression.
44
title: ''
5-
labels: C-Bug, C-Performance, C-Regression, S-Needs-Triage
5+
labels: C-Bug, C-Performance, P-Regression, S-Needs-Triage
66
assignees: ''
77
---
88

.github/example-run/alien_cake_addict.ron

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/example-run/breakout.ron

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/example-run/contributors.ron

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/example-run/load_gltf.ron

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/example-run/testbed_2d.ron

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(
2+
events: [
3+
(100, Screenshot),
4+
(200, Custom("switch_scene")),
5+
(300, Screenshot),
6+
(400, Custom("switch_scene")),
7+
(500, Screenshot),
8+
(600, Custom("switch_scene")),
9+
(700, Screenshot),
10+
(800, AppExit),
11+
]
12+
)

.github/example-run/testbed_3d.ron

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(
2+
events: [
3+
(100, Screenshot),
4+
(200, Custom("switch_scene")),
5+
(300, Screenshot),
6+
(400, Custom("switch_scene")),
7+
(500, Screenshot),
8+
(600, Custom("switch_scene")),
9+
(700, Screenshot),
10+
(800, AppExit),
11+
]
12+
)

.github/example-run/testbed_ui.ron

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
(
2+
events: [
3+
(100, Screenshot),
4+
(200, AppExit),
5+
]
6+
)

0 commit comments

Comments
 (0)