Skip to content

chore: Release/1.6.0 merge back in develop#2665

Closed
SamuelBellomo wants to merge 2 commits intodevelopfrom
release/1.6.0
Closed

chore: Release/1.6.0 merge back in develop#2665
SamuelBellomo wants to merge 2 commits intodevelopfrom
release/1.6.0

Conversation

@SamuelBellomo
Copy link
Copy Markdown
Contributor

@SamuelBellomo SamuelBellomo commented Aug 17, 2023

merging back release in develop

SamuelBellomo and others added 2 commits August 11, 2023 15:44
* version bump for changelog and package

* Update CHANGELOG.md

adding the addition to NetworkTransform

---------

Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>
* fix

This resolves the issue where the NetworkManager.m_ShuttingDown property could be set to true again if the shutdown method is invoked within OnClientStopped or OnServerStopped.

* test

This validates that if you invoke shutdown within OnClientStopped or OnServerStopped that NetworkManager.ShutdownInProgress remains false once completing the shutdown process.

* update

Adding the changelog entry for this fix.
Making the changelog entry for v1.6.0 branch match #2657

* Update CHANGELOG.md

Removing the adjusted changelog entry
@SamuelBellomo SamuelBellomo requested a review from a team August 17, 2023 16:08
@SamuelBellomo SamuelBellomo marked this pull request as ready for review August 17, 2023 16:08
@SamuelBellomo SamuelBellomo changed the title Release/1.6.0 merge back in develop chore: Release/1.6.0 merge back in develop Aug 29, 2023
@SamuelBellomo
Copy link
Copy Markdown
Contributor Author

since there's a conflict, closing this one and creating this one here

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