Skip to content

Final Product #44

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

Draft
wants to merge 51 commits into
base: master
Choose a base branch
from
Draft

Final Product #44

wants to merge 51 commits into from

Conversation

ApolloZhu
Copy link
Collaborator

No description provided.

@ApolloZhu ApolloZhu added this to the Target Product milestone Mar 7, 2022
penpenLoveUwU and others added 3 commits March 13, 2022 21:59
TODO: Firebase newly added file not showing up
TODO: NetworkPlayerSpawner not getting called
@ebanisadr
Copy link
Collaborator

Lingering multiplayer issues should be fixed as of 9421c3a. A tested, working build from that commit was submitted on Canvas.

Sorry for the force push, I tried to fix merge conflicts but GitHub was still unhappy with me. I'd recommend a manual merge for this PR because things are getting pretty hairy given its massive size.

@ApolloZhu
Copy link
Collaborator Author

There should be no code changes to master since before-final branched off, so I’ll probably rebase master to remove wrongly merged commits and this should hopefully become merge-able.

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.

4 participants