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

chore: release/1.6.0 merge back to develop #2684

Merged
merged 4 commits into from
Aug 30, 2023

Commits on Aug 11, 2023

  1. chore: version bump for changelog and package (#2657)

    * version bump for changelog and package
    
    * Update CHANGELOG.md
    
    adding the addition to NetworkTransform
    
    ---------
    
    Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>
    SamuelBellomo and NoelStephensUnity committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    960b58a View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. fix: NetworkManager.ShutdownInProgress not being reset (#2661)

    * 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
    NoelStephensUnity committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    4ee8da0 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge branch 'release/1.6.0' into release/1.6.0-merge-back-to-develop

    * 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 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    502a14a View commit details
    Browse the repository at this point in the history
  2. fix

    adding missing ARMv7 entry
    NoelStephensUnity committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    71f3bf6 View commit details
    Browse the repository at this point in the history