Skip to content

Commit

Permalink
Merge pull request #10 from Waridley/nightly
Browse files Browse the repository at this point in the history
A bunch of pending nightly changes
  • Loading branch information
Waridley authored Dec 15, 2023
2 parents 7401e31 + 1504456 commit 265081d
Show file tree
Hide file tree
Showing 65 changed files with 3,288 additions and 902 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "sond-bevy-particles"]
path = sond-bevy-particles
url = [email protected]:Waridley/bevy-particles.git
[submodule "leafwing_abilities"]
path = leafwing_abilities
url = [email protected]:k-specht/leafwing_abilities.git
17 changes: 0 additions & 17 deletions .idea/runConfigurations/Build__debug_.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Run__debug_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/runConfigurations/Run__release_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions .idea/runConfigurations/Test.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions .idea/runConfigurations/Visual_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/runConfigurations/Web.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/runConfigurations/clippy.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions .idea/runConfigurations/rustfmt.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations/trunk_build__release_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations/trunk_serve__LAN___debug_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations/trunk_serve__debug_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations/trunk_watch__debug_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions .idea/runConfigurations/web__debug_.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/runConfigurations/web__release_.xml

This file was deleted.

2 changes: 1 addition & 1 deletion bevy_rapier
Submodule bevy_rapier updated 38 files
+1 −1 .github/workflows/dependencies.yml
+3 −3 .github/workflows/main.yml
+22 −0 CHANGELOG.md
+4 −4 bevy_rapier2d/Cargo.toml
+0 −3 bevy_rapier2d/examples/custom_system_setup2.rs
+2 −2 bevy_rapier2d/examples/events2.rs
+5 −5 bevy_rapier3d/Cargo.toml
+0 −3 bevy_rapier3d/examples/custom_system_setup3.rs
+2 −2 bevy_rapier3d/examples/events3.rs
+6 −2 bevy_rapier3d/examples/ray_casting3.rs
+2 −0 src/dynamics/joint.rs
+2 −0 src/dynamics/mod.rs
+113 −62 src/dynamics/rigid_body.rs
+60 −33 src/geometry/collider.rs
+3 −1 src/geometry/collider_impl.rs
+24 −15 src/geometry/mod.rs
+1 −0 src/geometry/shape_views/ball.rs
+1 −0 src/geometry/shape_views/capsule.rs
+101 −0 src/geometry/shape_views/collider_view.rs
+1 −0 src/geometry/shape_views/compound.rs
+1 −0 src/geometry/shape_views/cone.rs
+1 −0 src/geometry/shape_views/convex_polygon.rs
+1 −0 src/geometry/shape_views/convex_polyhedron.rs
+1 −0 src/geometry/shape_views/cuboid.rs
+1 −0 src/geometry/shape_views/cylinder.rs
+1 −0 src/geometry/shape_views/halfspace.rs
+1 −0 src/geometry/shape_views/heightfield.rs
+1 −0 src/geometry/shape_views/polyline.rs
+1 −0 src/geometry/shape_views/round_shape.rs
+1 −0 src/geometry/shape_views/segment.rs
+1 −0 src/geometry/shape_views/triangle.rs
+1 −0 src/geometry/shape_views/trimesh.rs
+7 −1 src/pipeline/events.rs
+2 −0 src/pipeline/query_filter.rs
+38 −8 src/plugin/context.rs
+59 −34 src/plugin/plugin.rs
+148 −74 src/plugin/systems.rs
+5 −1 src/render/mod.rs
1 change: 1 addition & 0 deletions leafwing_abilities
Submodule leafwing_abilities added at 977115
3 changes: 3 additions & 0 deletions promo/screenshots/pretty_sky.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions rs/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ rustflags = ["-C", "link-arg=-fuse-ld=/opt/homebrew/bin/zld", "-Zshare-generics=
linker = "rust-lld.exe"
rustflags = ["-Zshare-generics=n"]

[target.wasm32-unknown-unknown]
runner = "wasm-server-runner"

# Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'
# In most cases the gains are negligible, but if you are on macos and have slow compile times you should see significant gains.
#[profile.dev]
Expand Down
3 changes: 2 additions & 1 deletion rs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target/
dist/
dist/
imported_assets/
Loading

0 comments on commit 265081d

Please sign in to comment.