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

[Merged by Bors] - ParamSet for conflicting SystemParam:s #2765

Closed
wants to merge 42 commits into from
Closed

[Merged by Bors] - ParamSet for conflicting SystemParam:s #2765

Changes from 2 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f8c9a73
fix get_conflicts to return every conflict. added get_conflicts_set
bilsen Sep 2, 2021
3149b56
add extend method to `FilteredAccessSet`
bilsen Sep 2, 2021
2501b97
impl Into for FilteredAccess
bilsen Sep 2, 2021
6ab43ea
refactor SystemParamState init, added methods
bilsen Sep 2, 2021
79fb544
add and impl ParamSet
bilsen Sep 2, 2021
aeffdad
add some tests
bilsen Sep 2, 2021
142b123
add safety comments
bilsen Sep 2, 2021
33ac800
fix access bug
bilsen Sep 2, 2021
089b904
run cargo fmt
bilsen Sep 2, 2021
907b02d
fix clippy stuff
bilsen Sep 2, 2021
5955bfe
add specialized panic messages
bilsen Sep 2, 2021
3f9056a
remove debug comments
bilsen Sep 2, 2021
3b77ea3
add ParamSet to prelude
bilsen Sep 2, 2021
d678368
added paramset to prelude
bilsen Sep 2, 2021
bc72f56
add docstrings
bilsen Sep 2, 2021
90a5236
remove ParamConflictType
bilsen Sep 2, 2021
dae0456
remove QuerySet in favour of ParamSet
bilsen Sep 3, 2021
5f011c9
Update add context in ParamSet docs
bilsen Sep 3, 2021
159ced1
use HashSet from `bevy_util`
bilsen Sep 11, 2021
330c95f
up max parameters in `ParamSet` from 4 to 8
bilsen Oct 31, 2021
c875753
fix rebase
bilsen Dec 17, 2021
cf2c51c
fix tests
bilsen Dec 17, 2021
7a28816
remove more references to querysets
bilsen Dec 17, 2021
7b520e5
remove broken doc links
bilsen Dec 17, 2021
b06818b
Merge branch 'main' into param-set-merge
bilsen Dec 23, 2021
2c53e1d
Merge branch 'main' into param-set-merge
bilsen Jan 6, 2022
107003d
Merge branch 'main' into param-set-merge
bilsen Feb 4, 2022
e466cf4
Better docs
bilsen Feb 4, 2022
0ebd608
Fix &World SystemParam implementation
bilsen Feb 4, 2022
74cc0cf
Wording
bilsen Feb 4, 2022
538a12e
Add ParamSets and remove QuerySets
cart Feb 25, 2022
88eaefc
Merge remote-tracking branch 'cart/param-set' into param-set-merge
bilsen Mar 19, 2022
3236779
fix merge
bilsen Mar 19, 2022
385bdc7
Merge branch 'param-set-merge' of github.com:bilsen/bevy into param-s…
bilsen Mar 19, 2022
265f8fd
Merge remote-tracking branch 'upstream/main' into param-set-merge
bilsen Mar 19, 2022
c6964fc
cargo fmt
bilsen Mar 19, 2022
2b62288
remove paramset link
bilsen Mar 19, 2022
18a84b6
Merge remote-tracking branch 'upstream/main' into param-set-merge
bilsen Mar 25, 2022
16c8258
remove old compile_fail tests
cart Mar 29, 2022
3a4eee0
remove unused Access function
cart Mar 29, 2022
6503fed
Merge remote-tracking branch 'origin/main' into pr/bilsen/2765
cart Mar 29, 2022
a2dc8ae
remove unused
cart Mar 29, 2022
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

These merge commits were added into this branch cleanly.

There are no new changes to show.