Skip to content

N16: ggez #385

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
merged 12 commits into from
Dec 6, 2020
Merged

N16: ggez #385

merged 12 commits into from
Dec 6, 2020

Conversation

icefoxen
Copy link
Contributor

@icefoxen icefoxen commented Dec 2, 2020

What the heck, I have no idea why this is dragging a bunch of other commits with it. I nuked and re-made my fork and branch from this repo and it's still doing it.

It's been one of those days.

Part of #365

Copy link
Collaborator

@17cupsofcoffee 17cupsofcoffee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no clue how this branch has gotten itself so confused - should be able to just cherry pick it to merge though, so not the end of the world 😄

Text looks good to me, just one minor formatting thing that's tripping up the linter:

Co-authored-by: Joe Clay <27cupsofcoffee@gmail.com>
@ozkriff ozkriff mentioned this pull request Dec 6, 2020
Copy link
Member

@ozkriff ozkriff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 (made a few small style/fmt tweaks)

@ozkriff ozkriff merged commit 6696d94 into rust-gamedev:source Dec 6, 2020
@ozkriff
Copy link
Member

ozkriff commented Dec 6, 2020

Thanks, merged!

As for the other commits - force pushing the source branch from the upstream repo to your fork's source should help.

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.

3 participants