-
Notifications
You must be signed in to change notification settings - Fork 69
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
Flight demo improvements #780
Flight demo improvements #780
Conversation
Co-authored-by: Daft Freak <charlie@daft.games>
Looks good to me! Nice sleuthing (and fixing!) poor example has been neglected for so, so very long. Would you like me to merge #779 so you can rebase this PR? |
I have a feeling I also have some changes to this example somewhere, but I think it's completely different stuff to this. (Definitely approve of making the trees scale, made sure that worked in SBK's mode7 code 😄) EDIT: Yep, it was mostly about the map data: master...Daft-Freak:32blit-beta:flight-tilemap-assets2 |
I think #779 wants to be rebased or squash-merged to remove the self-merge in there... The commits from there will probably disappear here after that one is merged. (I almost said I'd rebase it myself, forgetting that I don't have write access here, whoops. But that also means I probably don't get to say how things should be merged either 😆 ) |
Ah! I'd thought the self merge was here. But yes, you're right. Would be ideal to get those squashed out. |
I'm not entirely sure how to fix the mess in #779, since when I've tried doing a squash merge before, I've ended up with a ton of seemingly blank commits (probably because I pushed before doing the squash merge). Would rebasing work, despite the fact that I've already pushed it? |
Improved the controls for joystick and D-pad.
a910985
to
91f794b
Compare
I did something, not sure if it was the right thing, but there's certainly a lot less commits now! |
Great stuff, thank you! Definitely need to do a release soooon. While I can snatch some time. 😬 Merging this also ate #779. |
This PR depends on (but could replace) #779.
On top of #779, I have added several improvements to the flight demo game: