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

Jump to bottom

N41: Open Combat #1237

Merged
merged 2 commits into from
Jan 3, 2023
Merged

N41: Open Combat #1237

merged 2 commits into from
Jan 3, 2023

Conversation

buxx
Copy link
Contributor

@buxx buxx commented Jan 2, 2023

Part of #1233

@buxx buxx mentioned this pull request Jan 2, 2023
Merged
17cupsofcoffee
17cupsofcoffee approved these changes Jan 3, 2023
View reviewed changes
content/news/041/index.md Outdated Show resolved Hide resolved
content/news/041/index.md Outdated Show resolved Hide resolved
@buxx buxx force-pushed the opencombat-nl41 branch from 099408c to 824fa04 Compare January 3, 2023 16:10
@buxx
Copy link
Contributor Author

buxx commented Jan 3, 2023

I resolved the conflict and pushed with your changes @17cupsofcoffee

17cupsofcoffee
17cupsofcoffee approved these changes Jan 3, 2023
View reviewed changes
content/news/041/index.md Outdated Show resolved Hide resolved
@AngelOnFira AngelOnFira changed the title part of #1233: open combat game updates N41: Open Combat Jan 3, 2023
ozkriff
ozkriff approved these changes Jan 3, 2023
View reviewed changes
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.

🔥

@ozkriff ozkriff merged commit 7a8f6bf into rust-gamedev:source Jan 3, 2023
@ozkriff
Copy link
Member

ozkriff commented Jan 3, 2023

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@17cupsofcoffee 17cupsofcoffee 17cupsofcoffee approved these changes

@ozkriff ozkriff ozkriff approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@buxx @ozkriff @17cupsofcoffee