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.

Sign up for GitHub

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

Jump to bottom

Non-string labels (#1423 continued) #1473

Merged
merged 27 commits into from
Feb 18, 2021
Merged

Non-string labels (#1423 continued) #1473

merged 27 commits into from
Feb 18, 2021

Conversation

Ratysz
Copy link
Contributor

@Ratysz Ratysz commented Feb 18, 2021

This is essentially #1423. Because git does things sometimes.

TheRawMeatball and others added 27 commits February 9, 2021 23:35
@TheRawMeatball
Add Label type
2bd15fa
@TheRawMeatball
General improvement
f41d7eb
@TheRawMeatball
Fix stuff
85eebf2
@TheRawMeatball
hotfix
857fa83
@TheRawMeatball
rework to implement suggestions
d0cc270
@TheRawMeatball
cargo fmt
52567f5
@TheRawMeatball
cargo test
37941ba
@TheRawMeatball @bjorn3
Improve Debug impl on dyn Label
fd3747c 
Co-authored-by: bjorn3 <bjorn3@users.noreply.github.com>
@TheRawMeatball @Ratysz
Apply suggestions from code review
4b90fb0 
Co-authored-by: Alexander Sepity <ratysz@gmail.com>
@TheRawMeatball
hotfix
b8af092
@TheRawMeatball
Implement minor suggestion
c28f3fd
@TheRawMeatball
Revert changes in tests
099f8a6
@TheRawMeatball
Fix doctest
e70a8c1
@TheRawMeatball
Fix inconsistencies
c002ba2
@TheRawMeatball
Merge remote-tracking branch 'upstream/master' into zst-labels
2e95129
@TheRawMeatball
Revert accidental changes
c5724f6
@TheRawMeatball
Switch to requirig Debug impl
9c70a5d
@TheRawMeatball
cargo fmt
6d82c4e
@TheRawMeatball
Fix test
b7f1e85
@TheRawMeatball
Merge 'upstream/master' into zst-labels
6e8f6fd
@TheRawMeatball
Fancify labels
62f1eef
@cart
mod/use consistency
da24443
@TheRawMeatball
Implement requested changes
7c20ed2
@TheRawMeatball
cargo fmt
a904796
@Ratysz
Improvements from @Ratyzs
ea539b0
@Ratysz
Resolve conflicts
3f0d074
@Ratysz
Merge branch 'master' into zst-labels
d2eebf8 
# Conflicts:
#	crates/bevy_ecs/src/schedule/stage.rs
#	crates/bevy_ecs/src/schedule/system_container.rs
#	crates/bevy_ecs/src/schedule/system_descriptor.rs
#	crates/bevy_transform/src/lib.rs
@alice-i-cecile alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Feb 18, 2021
@Ratysz Ratysz added core A-ECS Entities, components, systems, and events labels Feb 18, 2021
@Ratysz Ratysz added the P-High This is particularly urgent, and deserves immediate attention label Feb 18, 2021
@Ratysz Ratysz mentioned this pull request Feb 18, 2021
Closed
@Ratysz
Copy link
Contributor Author

Ratysz commented Feb 18, 2021

In the interest of not letting changes slip by unnoticed: "merge commit" of 3f0d074 also implemented AmbiguitySetLabel for use by #1469.

@cart cart merged commit c2a427f into bevyengine:master Feb 18, 2021
@Ratysz Ratysz mentioned this pull request Feb 18, 2021
Closed
@Ratysz Ratysz deleted the resolve_conflicts_again_ffs branch February 19, 2021 12:17
@aevyrie aevyrie mentioned this pull request Feb 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-ECS Entities, components, systems, and events P-High This is particularly urgent, and deserves immediate attention S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Ratysz @cart @alice-i-cecile @TheRawMeatball