Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded to bevy 0.14 #61

Merged
merged 10 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: PR
permissions: read-all

on:
push:
branches: ["main"]
branches: [main]
pull_request:
branches: ["main"]
branches: [main]

env:
CARGO_TERM_COLOR: always
Expand Down
1 change: 1 addition & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
plugins
user_trunk.yaml
user.yaml
tmp
30 changes: 15 additions & 15 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
version: 0.1
cli:
version: 1.17.1
version: 1.22.3
plugins:
sources:
- id: trunk
ref: v1.2.6
ref: v1.6.2
uri: https://github.com/trunk-io/plugins
lint:
enabled:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- clippy@SYSTEM
- rustfmt@SYSTEM
- git-diff-check
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]

runtimes:
enabled:
Expand All @@ -40,4 +40,4 @@ actions:

merge:
required_statuses:
- Trunk Check
- PR / Trunk Check (pull_request)
23 changes: 12 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
[package]
edition = "2021"
name = "bevy_magic_light_2d"
version = "0.7.0"
version = "0.8.0"

[features]
default = ["egui"]
egui = ["dep:bevy-inspector-egui"]

[dependencies]
bevy = { version = "0.13", default-features = false, features = [
"bevy_render",
"bevy_core_pipeline",
"bevy_winit",
"bevy_asset",
"bevy_sprite",
"bevy_pbr",
"embedded_watcher",
bevy = { version = "0.14.1", default-features = false, features = [
"bevy_render",
"bevy_core_pipeline",
"bevy_winit",
"bevy_asset",
"bevy_sprite",
"bevy_pbr",
"embedded_watcher",
"multi_threaded",
] }
bevy-inspector-egui = { version = "0.23.0", optional = true }
bevy-inspector-egui = { version = "0.25.2", optional = true }
log = "0.4.20"
rand = "0.8.5"

[dev-dependencies]
bevy = "0.13"
bevy = "0.14.1"

[profile.release]
codegen-units = 1
Expand Down
Binary file modified assets/art/atlas_floor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading