Skip to content

chore: cleanup/upgrade serialized scenes#1020

Merged
0xFA11 merged 4 commits intodevelopfrom
chore/cleanup-scenes
Aug 4, 2021
Merged

chore: cleanup/upgrade serialized scenes#1020
0xFA11 merged 4 commits intodevelopfrom
chore/cleanup-scenes

Conversation

@0xFA11
Copy link
Copy Markdown
Contributor

@0xFA11 0xFA11 commented Aug 4, 2021

No description provided.

- component: {fileID: 1024114718}
m_Layer: 0
m_Name: NetworkManager
m_Name: '[NetworkManager]'
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I had to change at least a thing in the scenes to cause Unity to re-serialize scenes down to disk.
So I surrounded NetworkManager objects in scenes with square brackets.

MLAPIRelayPort: 8888
UseNetcodeRelay: 0
NetcodeRelayAddress: 127.0.0.1
NetcodeRelayPort: 8888
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

and these are the real changes

@0xFA11 0xFA11 enabled auto-merge (squash) August 4, 2021 23:06
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!

@0xFA11 0xFA11 merged commit f881d33 into develop Aug 4, 2021
@0xFA11 0xFA11 deleted the chore/cleanup-scenes branch August 4, 2021 23:40
SamuelBellomo added a commit that referenced this pull request Aug 11, 2021
…nsform

* develop: (32 commits)
  refactor: calling networkShow(NetworkObject) code in networkshow(List<NetworkObject>) (#1028)
  feat: snapshot. MTT-685 MTT-822 (#1021)
  test: adding a multi-instance test checking NetworkShow and NetworkHide on lists of objects (#1036)
  fix: corrected NetworkVariable WriteField/WriteDelta/ReadField/ReadDelta dropping the last byte if unaligned. (#1008)
  chore: run standards check over solution files (#1027)
  chore: replace MLAPI with Netcode in Markdown files (#1025)
  fix!: added plainly-callable Add() method to NetworkSet [MTT-1005] (#1022)
  fix: fixing incorrect merge done as part of commit 85842ee (#1023)
  chore: cleanup/upgrade serialized scenes (#1020)
  chore: replace MLAPI with Netcode in C# source files (#1019)
  test: add network collections, struct and class tests MTT-936 (#1000)
  test: add buildtests to test build pipeline on target platforms (#1018)
  chore: rename MLAPI types to Netcode (#1017)
  chore!: rename asmdefs, change top-level namespaces (#1015)
  Replacing community NetworkManagerHUD with a simpler implementation (#993)
  test: network prefab pools and INetworkPrefabInstanceHandler (#1004)
  fix: do not expose Runtime internals to TestProject.ManualTests asmdef (#1014)
  refactor: snapshot. merge preparation. Removing old acks, removing unused varia… (#1013)
  chore!: per-asmdef namespaces instead of per-folder (#1009)
  feat: snapshot. ground work, preparing depedencies. No impact on code behaviour (#1012)
  ...

# Conflicts:
#	com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs
#	com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs
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.

2 participants