fix: unitytransport connectionmode buttons#1176
Merged
NoelStephensUnity merged 6 commits intodevelopfrom Sep 14, 2021
Merged
Conversation
Member
NoelStephensUnity
commented
Sep 13, 2021
NoelStephensUnity
commented
- All manual tests and examples were broken due to the ConnectionModeButtons missing references
- Migrated the missing InputField asset into ConnectionModeButtons prefab to handle this.
- Refactored the ConncetionModeScript to be able to handle supporting UNet until we decided to primarily switch over to UTP.
|
|
||
| #if ENABLE_RELAY_SERVICE | ||
| //[NSS] This is never used? Do we need it still? | ||
| [SerializeField] |
Contributor
There was a problem hiding this comment.
It will be used when relay fixing an issue in their SDK
Member
Author
There was a problem hiding this comment.
Well, we can just leave that as it is since there doesn't appear to be any relay specific properties being used.
I tried to keep the defines limited to only the areas of the code that had dependencies to the relay portion of the UnityTransport.
| private bool HasRelaySupport() | ||
| { | ||
| var unityTransport = NetworkManager.Singleton.GetComponent<UnityTransport>(); | ||
| if (unityTransport != null && unityTransport.Protocol == UnityTransport.ProtocolType.RelayUnityTransport) |
Contributor
There was a problem hiding this comment.
If the relay SDK is not present then we should just always return false hence the defines.
Member
Author
There was a problem hiding this comment.
Ok, that makes sense. I think for our testproject we will always have it available from this point forward? If that is not the case then I can put the defines back where they were.
andrews-unity
approved these changes
Sep 13, 2021
0xFA11
approved these changes
Sep 13, 2021
Contributor
0xFA11
left a comment
0xFA11
left a comment
There was a problem hiding this comment.
thank you for fixing this quickly!
NoelStephensUnity
deleted the
fix/unitytransport-connectionmode-buttons
branch
SamuelBellomo
added a commit
that referenced
this pull request
Sep 16, 2021
…nsform * develop: feat: NetworkBehaviour.IsSpawned (#1190) feat: added tip to the network manager inspector that directs to install tools (MTT-1211) (#1182) refactor!: remove network dictionary & set, use native container in List, add tests (#1149) fix: Fixed remote disconnects not properly cleaning up (#1184) test: base changes to PR-1114 (#1165) test: verify do not destroy networkobjects on networkmanager shutdown (#1183) chore: removal of EnableNetworkVariable in NetworkConfig. It's always True now (#1179) fix: Fix DontDestroyWithOwner not returning ownership (#1181) test: Giving Android some more room as the connection tests are timing sensitive (#1178) fix: unitytransport connectionmode buttons (#1176) test: added min frames to multi-instance helper (#1170) chore: Add mobile tests to nightly trigger (#1161) feat: snapshot spawn pre-requisite (#1166) feat: Unity Transport + Relay (#887) feat: client scene synchronization mode (#1171) # Conflicts: # testproject/Assets/Scenes/SampleScene.unity
SamuelBellomo
added a commit
that referenced
this pull request
Sep 16, 2021
…am/feature/client-network-transform * sam/feature/interpolation-for-network-transform: (22 commits) fixing line issue more formatting fixing formatting issue removing not submitted LiteNetLib from ZooSam feat: Fast buffer reader and fast buffer writer (#1082) restricting public api bumping exec order feat: NetworkBehaviour.IsSpawned (#1190) feat: added tip to the network manager inspector that directs to install tools (MTT-1211) (#1182) refactor!: remove network dictionary & set, use native container in List, add tests (#1149) fix: Fixed remote disconnects not properly cleaning up (#1184) test: base changes to PR-1114 (#1165) test: verify do not destroy networkobjects on networkmanager shutdown (#1183) chore: removal of EnableNetworkVariable in NetworkConfig. It's always True now (#1179) fix: Fix DontDestroyWithOwner not returning ownership (#1181) test: Giving Android some more room as the connection tests are timing sensitive (#1178) fix: unitytransport connectionmode buttons (#1176) test: added min frames to multi-instance helper (#1170) chore: Add mobile tests to nightly trigger (#1161) feat: snapshot spawn pre-requisite (#1166) ... # Conflicts: # com.unity.netcode.gameobjects/Components/NetworkTransform.cs # testproject/Assets/Scenes/SampleScene.unity
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.