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

Bevy 0.10 - Fixed merge conflicts #29

Merged
merged 4 commits into from
Apr 3, 2023

Conversation

BlackPhlox
Copy link
Collaborator

@BlackPhlox BlackPhlox commented Apr 3, 2023

Fixed merge conflicts for:
#11 - Added KeyBindings
#21 - Fix init camera rotation bug
#26 - GrabCursor on FlyCam spawn
#28 - Update to bevy 0.10

This pr: Added prelude

@BlackPhlox BlackPhlox linked an issue Apr 3, 2023 that may be closed by this pull request
@BlackPhlox BlackPhlox linked an issue Apr 3, 2023 that may be closed by this pull request
@BlackPhlox BlackPhlox changed the title Fixed merge conflicts Bevy 0.10 - Fixed merge conflicts Apr 3, 2023
@BlackPhlox BlackPhlox merged commit 68eafb4 into sburris0:master Apr 3, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cursor grabbing before FlyCam entity added Cursor Grab won't work under macOS
1 participant