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

Add Panda3D #153

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Add Panda3D #153

merged 1 commit into from
Apr 4, 2019

Conversation

rdb
Copy link
Contributor

@rdb rdb commented Mar 12, 2019

Panda3D is an open-source game engine with a Discord server with, at time of writing, 1463 stars on GitHub:
https://github.com/panda3d/panda3d

Thanks for considering!

@SolarionFX-zz
Copy link
Contributor

I'd be happy to accept this PR, I just need you to resolve the conflicts!

@rdb
Copy link
Contributor Author

rdb commented Mar 16, 2019

@SolarionFX I just rebased, how's that?

@SolarionFX-zz
Copy link
Contributor

Hey there, I still see some conflicts. Can you please update this branch with master?

@rdb
Copy link
Contributor Author

rdb commented Mar 20, 2019

@SolarionFX rebased again, should be ready to merge. Thanks!

@rdb
Copy link
Contributor Author

rdb commented Mar 31, 2019

@SolarionFX Merge conflict addressed again. Could you merge this? Thanks!

The test failure seems unrelated to my addition.

@jfurrow jfurrow merged commit 4655986 into discord:master Apr 4, 2019
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