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

Changes for new version control system #47

Merged
merged 10 commits into from
Jan 10, 2022

Conversation

Janglee123
Copy link
Contributor

It is based on libgit2-bump-fix and requires vcs-new-ui to work. Both branches are updated parallelly.

@twaritwaikar
Copy link
Contributor

twaritwaikar commented Sep 6, 2020

@Janglee123 Could you rebase this on the current master? Also, there are some merge conflicts now, which I guess are quite small. Just use the build_libs.bat changes exactly as in the master branch, except if you are adding some new CMake flags, then you can append those flags to the ones in the master

SConstruct Outdated Show resolved Hide resolved
@twaritwaikar
Copy link
Contributor

Simply updating this branch to master by a basic merge for now because all that has changed in master, which is minimal C++ code changes but still a lot of build scripts and CI configs.

@Janglee123
Copy link
Contributor Author

Updated for Godot 3.x branch.

@twaritwaikar
Copy link
Contributor

Updating this branch to run macOS arm arch CI

@twaritwaikar twaritwaikar merged commit b34311b into godotengine:master Jan 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants