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

[Merged by Bors] - Support multiple #[reflect]/#[reflect_value] + improve error messages #6237

Closed
wants to merge 11 commits into from

Commits on Oct 11, 2022

  1. Configuration menu
    Copy the full SHA
    3743a3a View commit details
    Browse the repository at this point in the history
  2. Merge match arms

    TehPers committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    f1fb7e8 View commit details
    Browse the repository at this point in the history
  3. Update docs for TraitImpl::merge

    Co-authored-by: Gino Valente <49806985+MrGVSV@users.noreply.github.com>
    TehPers and MrGVSV authored Oct 11, 2022
    Configuration menu
    Copy the full SHA
    b9e38dd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f6f8171 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    94391a5 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'multiple-reflect-lists' of github.com:TehPers/bevy into…

    … multiple-reflect-lists
    TehPers committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    6ae1358 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    da763ad View commit details
    Browse the repository at this point in the history
  8. Update conflict error message

    TehPers committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    9192d3d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c87f7d4 View commit details
    Browse the repository at this point in the history
  10. Rename const

    TehPers committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    d5feec2 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Update comment

    Co-authored-by: Gino Valente <49806985+MrGVSV@users.noreply.github.com>
    TehPers and MrGVSV authored Oct 12, 2022
    Configuration menu
    Copy the full SHA
    2f55ef1 View commit details
    Browse the repository at this point in the history