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

Protocol changes -> master #1096

Merged
merged 109 commits into from
Oct 21, 2024
Merged

Protocol changes -> master #1096

merged 109 commits into from
Oct 21, 2024

Conversation

HifiExperiments
Copy link
Member

@HifiExperiments HifiExperiments commented Jul 30, 2024

This PR includes all of the following changes:

@HifiExperiments HifiExperiments changed the title DNM: Protocol changes -> master Protocol changes -> master Sep 5, 2024
@HifiExperiments HifiExperiments removed the work in progress Do not merge yet label Sep 5, 2024
@HifiExperiments
Copy link
Member Author

from my side, this should be ready to merge now, unless anyone else wanted to include other protocol changes for the next release!

personally, I don't think it needs its own CR/QA since each individual PR was reviewed and the whole thing will be tested again as part of the RC, and if any issues do arise I can fix them directly in master, but I leave that to others to decide

@ksuprynowicz
Copy link
Member

I just want to add a small PR to disable voxel autodelete, but we can also do it after merging protocol changes into master. Before merging I think we should test it for a bit.

@JulianGro
Copy link
Member

I was meaning to do a new release candidate today.
Still seems like a good idea to me; Then we will have a release right before the protocol changes merge.

@HifiExperiments
Copy link
Member Author

so...I have a fair number of PRs I've been working on that depend on various changes in this branch, and I'm also worried about conflicts piling up if it sits too long (there are already several new PRs against master that will lead to conflicts once merged). I'll also have a bit less time to work on things starting in a few weeks, so I'd love to get this wrapped up.

do we have a plan/timeline for the upcoming release, or anything I could help with? or, since it's already been tagged, could we think about merging this sometime soonish? I think that'll be the best way to get people using and testing it anyways. removing the voxel autodelete could also come later, especially since #830 is not included in this (and in fact, that PR already includes the removal of the auto delete: https://github.com/overte-org/overte/pull/830/files#diff-637dfca649b67c61e00fd48f256591e8113cbca5cf791da6ff6e3e6d9c6dd303L1120)

@ksuprynowicz
Copy link
Member

@HifiExperiments Can I merge it today? I'll do one last short round of testing before merging of course.

@ksuprynowicz ksuprynowicz added QA approved This pull request has been successfully tested and removed needs QA This pull request needs to be tested labels Oct 21, 2024
@ksuprynowicz ksuprynowicz merged commit ce8d57b into master Oct 21, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working documentation Improvements or additions to documentation enhancement New feature or request needs CR This pull request needs to be code reviewed protocol change QA approved This pull request has been successfully tested server If used for a Pull Request, server packages are going to be built.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants