Skip to content

chore: release/1.6.0 merge back to develop#2684

Merged
SamuelBellomo merged 4 commits intodevelopfrom
sam/1.6.0-merge-back-to-develop
Aug 30, 2023
Merged

chore: release/1.6.0 merge back to develop#2684
SamuelBellomo merged 4 commits intodevelopfrom
sam/1.6.0-merge-back-to-develop

Conversation

@SamuelBellomo
Copy link
Copy Markdown
Contributor

@SamuelBellomo SamuelBellomo commented Aug 29, 2023

merging back release 1.6.0 to develop. since there was a merge conflict, had to create a separate branch to resolve it.

Testing and Documentation

  • No tests have been added.
  • No documentation changes or additions were necessary.

SamuelBellomo and others added 3 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
* release/1.6.0:
  fix: NetworkManager.ShutdownInProgress not being reset (#2661)
  chore: version bump for changelog and package (#2657)

# Conflicts:
#	com.unity.netcode.gameobjects/CHANGELOG.md
@SamuelBellomo SamuelBellomo marked this pull request as ready for review August 29, 2023 22:10
@SamuelBellomo SamuelBellomo requested review from a team, TylerUnity and chrispope as code owners August 29, 2023 22:10
@SamuelBellomo SamuelBellomo enabled auto-merge (squash) August 29, 2023 22:11
adding missing ARMv7 entry
Copy link
Copy Markdown
Member

@NoelStephensUnity NoelStephensUnity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@SamuelBellomo SamuelBellomo merged commit 47f9d65 into develop Aug 30, 2023
@SamuelBellomo SamuelBellomo deleted the sam/1.6.0-merge-back-to-develop branch August 30, 2023 08:26
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