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.

Sign up for GitHub

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

Jump to bottom

Integrating Unity Transport and Relay into Boss Room #366

Merged
merged 48 commits into from
Sep 20, 2021
Merged

Integrating Unity Transport and Relay into Boss Room #366

merged 48 commits into from
Sep 20, 2021

Conversation

Cosmin-B
Copy link
Contributor

Will follow up with a better description!

fjgal and others added 30 commits June 21, 2021 21:39
@fjgal
WIP relay integration
72acae2
@andrews-unity
Updating to latest versions of stuff :D
e5e8f59
@fjgal
update utp and mlapi versions
bc64417
@fjgal
ui improvements
44246a8
Fix network prefab configuration
f7e7792
@SamuelBellomo
porting to UTP
9830e85
@SamuelBellomo
Merge branch 'develop' into feature/adding-UTP
ace8773 
* develop:
  Feature/player persistence prefab refactor (#349)
  upping MLAPI develop version (#355)
  Update to MLAPI: onnetworkspawn refactoring, player prefab removed from networkmanager prefab list (#352)

# Conflicts:
#	Assets/BossRoom/Prefabs/NetworkingManager.prefab
#	Packages/packages-lock.json
@SamuelBellomo
updating to latest UTP
202b087
@Cosmin-B
Merge branch 'develop' into feature/adding-UTP
944461d
@Cosmin-B
[Packages] Update our manifest to point to latest Relay, MLAPI + UTP
7f04f30
@Cosmin-B
Merge branch 'feature/adding-UTP' into feature/unity-relay
22c44c3 
* feature/adding-UTP:
  Adding ParrelSync and updating third party notice.md (#357)
  updating to latest UTP
  Feature/player persistence prefab refactor (#349)
  upping MLAPI develop version (#355)
  Update to MLAPI: onnetworkspawn refactoring, player prefab removed from networkmanager prefab list (#352)
  porting to UTP

# Conflicts:
#	Assets/BossRoom/Prefabs/NetworkingManager.prefab
#	Assets/BossRoom/Scenes/Startup.unity
#	Assets/BossRoom/Scripts/Client/BossRoom.Client.asmdef
#	Assets/BossRoom/Scripts/Shared/BossRoom.Shared.asmdef
#	Assets/BossRoom/Scripts/Shared/Game/UI/Editor/NetworkLatencyWarning.cs
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/PackageManagerSettings.asset
@Cosmin-B
[Relay] Fix-up all the SDK API changes and enable Relay & Lobby for m…
c008202 
…y organization and project id
@Cosmin-B
[Scenes] Submit Startup.unity files, not the git lfs object should be…
27f64f6 
… added as well
@Cosmin-B
[Scenes] Revert Startup.unity to utp-add branch
8f77451
@SamuelBellomo
#
05def81
@Cosmin-B
[Packages] Subscribe to a previous revision of UTP to make sure we ar…
5225e32 
…e testing against the same revisions as before
@wackoisgod
Fixing up bossroom to work with the latest mlapi UTP branch
bd91640
@wackoisgod
Forgot this
599a1c9
@SamuelBellomo
#
fb54e72
@VALERE91
Updating to latest NGO
ed4dc1d
@Cosmin-B
Merge remote-tracking branch 'refs/remotes/BossRoom-Main/sam/update-t…
61a149b 
…o-latest-NGO'
@Cosmin-B
[Packages] Update manifest to point NGO to latest develop
108ee17
@Cosmin-B
[Packages] Point NGO to initial-relay UTP branch taking into account …
d861b79 
…the new rename
@Cosmin-B
[Project] Fix up all assemblies + code that requires to reflect the r…
6335f5a 
…ename of the Netcode SDK
@VALERE91
Latest NetCode working with Hack
8be181e
@Cosmin-B
[Game] Some more quick fixes to avoid a NullReferenceException
9b696ea
@VALERE91
Update to latest NetCode
cbee4f4 
Only compilation commit still WIP
@VALERE91
Fix in Unity version
f58d04f
@VALERE91
LobbyPLayerState NetVariable
443d9cf
@VALERE91
Fix code for new Netcode version
aaeed41
@SamuelBellomo
Copy link
Contributor

I added a few comments that didn't touch your work, not sure who to talk to service side for this, this API is weird.
Also, I'm noticing you have private repos in PackageManagerSetting.asset and other manifest.

@Cosmin-B
Copy link
Contributor Author

Cosmin-B commented Sep 15, 2021 •
edited
Loading

I added a few comments that didn't touch your work, not sure who to talk to service side for this, this API is weird.

Yes, you are right, 99% of the relay code has been extracted from the Relay sample or the UTP Transport adapter. We can inform @bgagnon and @fjgal. Although, i would still think that some of these comments could be addressed.

@andrews-unity
Updating Relay API to 1.0.1-pre.1
f2baf97 
* Fixing Relay API using the new simpler API
* removing Candidates repo
* Remove ref to tools as its private
@andrews-unity
Copy link
Contributor

I added a few comments that didn't touch your work, not sure who to talk to service side for this, this API is weird.

Yes, you are right, 99% of the relay code has been extracted from the Relay sample or the UTP Transport adapter. We can inform @bgagnon and @fjgal. Although, i would still think that some of these comments could be addressed.

I have updated the API to using the new simple API which is much cleaner and less weird! With that said we intentionally didn't want Relay stuff in the Adapter because while not implemented in this sample we didn't want it to need to the relay SDK and there is point where users will need to select their region and if they want to use DTLS or not which we (Relay and Server) didn't feel that should be in the adapter. So the only entry point is setting the connection data.

@Cosmin-B
Merge branch 'develop' into feature/unity-relay
34d7ec8
@Cosmin-B
fix: address all PR feedback
4dbe459 
- Remove unused functions
- Clean-up logs and correctly add try-catch exceptions, now we will display a pop up
- Added a small singleton implementation for the MainMenuUI to be easily accessible from other classes
- Remove NetworkVariableGUID file
- Remove commented out code
VALERE91Unity
VALERE91Unity previously approved these changes Sep 17, 2021
View reviewed changes
Copy link
Contributor

@VALERE91Unity VALERE91Unity left a comment

Choose a reason for hiding this comment

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

Could we create an issue concerning the join through IP and port for UTP? So we don't forget that we cannot anymore and we need to fix it ASAP?

@SamuelBellomo
Copy link
Contributor

Could we create an issue concerning the join through IP and port for UTP? So we don't forget that we cannot anymore and we need to fix it ASAP?

Created https://jira.unity3d.com/browse/MTT-1238
Thanks for making us think about it :)

SamuelBellomo
SamuelBellomo approved these changes Sep 20, 2021
View reviewed changes
Copy link
Contributor

@SamuelBellomo SamuelBellomo left a comment

Choose a reason for hiding this comment

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

🚀

VALERE91Unity
VALERE91Unity approved these changes Sep 20, 2021
View reviewed changes
Copy link
Contributor

@VALERE91Unity VALERE91Unity left a comment

Choose a reason for hiding this comment

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

Ship it!!!!

@Cosmin-B Cosmin-B merged commit 68841a3 into develop Sep 20, 2021
@fernando-cortez fernando-cortez deleted the feature/unity-relay branch September 20, 2021 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrews-unity andrews-unity andrews-unity left review comments

@SamuelBellomo SamuelBellomo SamuelBellomo approved these changes

@VALERE91Unity VALERE91Unity VALERE91Unity approved these changes

@LukeStampfli LukeStampfli Awaiting requested review from LukeStampfli

Assignees

@Cosmin-B Cosmin-B

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@Cosmin-B @unity-cla-assistant @SamuelBellomo @andrews-unity @VALERE91Unity @fjgal @wackoisgod @VALERE91 @LukeStampfli