Skip to content

updating MLAPI develop version #355

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
Merged
merged 1 commit into from
Jul 9, 2021
Merged

updating MLAPI develop version #355

merged 1 commit into from
Jul 9, 2021

Conversation

fernando-cortez
Copy link
Collaborator

MLAPI update. Necessary for new feature tasks.

@fernando-cortez fernando-cortez added 2-Easy This PR is trivial and can be reviewed quickly 1-Needs Review PR needs attention from the assignee and reviewers labels Jul 7, 2021
@SamuelBellomo SamuelBellomo merged commit f45373e into develop Jul 9, 2021
@SamuelBellomo SamuelBellomo deleted the feature/mlapi-update branch July 9, 2021 14:51
SamuelBellomo added a commit that referenced this pull request Jul 20, 2021
@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
Cosmin-B added a commit that referenced this pull request Sep 14, 2021
@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SamuelBellomo SamuelBellomo SamuelBellomo approved these changes

Assignees

@Cosmin-B Cosmin-B

@SamuelBellomo SamuelBellomo

Labels
1-Needs Review PR needs attention from the assignee and reviewers 2-Easy This PR is trivial and can be reviewed quickly
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fernando-cortez @SamuelBellomo @Cosmin-B