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

Adding ParrelSync and updating third party notice.md #357

Merged
merged 3 commits into from
Aug 5, 2021

Conversation

SamuelBellomo
Copy link
Contributor

No description provided.

@SamuelBellomo SamuelBellomo marked this pull request as ready for review August 5, 2021 17:42
@nomishen
Copy link
Contributor

nomishen commented Aug 5, 2021

Hey @SamuelBellomo, can you please help address a few things before I send it to Sue-Lyn for review?

  1. Missing [Copyright © [year] [owner] ] for UnityToonShader
  2. Additional place holders at the end of the file
  3. File name: Third Party Notices.md

@SamuelBellomo
Copy link
Contributor Author

SamuelBellomo commented Aug 5, 2021

Hey @SamuelBellomo, can you please help address a few things before I send it to Sue-Lyn for review?

  1. Missing [Copyright © [year] [owner] ] for UnityToonShader
  2. Additional place holders at the end of the file
  3. File name: Third Party Notices.md

@nomishen
1 and 2 ok
3. If you look at the files changed section of this PR, you can see the file name is Third Party Notices.md

@nomishen
Copy link
Contributor

nomishen commented Aug 5, 2021

Thank you Sam. All looks good on my end and it's shared with legal to review.

@SamuelBellomo SamuelBellomo merged commit 598c39f into develop Aug 5, 2021
@SamuelBellomo SamuelBellomo deleted the feature/third-party-notice branch August 5, 2021 18:59
@SamuelBellomo
Copy link
Contributor Author

@nomishen I merged this before reading your "shared with legal for review" part. Let me know if there's any changes, I'll create a new PR

@nomishen
Copy link
Contributor

nomishen commented Aug 5, 2021

It's all good. Legal came back with positive feedback. :) Thank you for the changes.

Cosmin-B added a commit that referenced this pull request Sep 14, 2021
* 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants