Skip to content

Conversation

@chrispope
Copy link
Collaborator

A file containing details on our third-party contributors.

A file containing details on our third-party contributors.
@chrispope chrispope self-assigned this Apr 7, 2021
@chrispope chrispope requested a review from pdeschain April 7, 2021 16:02
@SamuelBellomo SamuelBellomo added the 0-URGENT Blocker for a release and needs to be merged ASAP label Apr 7, 2021
@pdeschain
Copy link
Contributor

@SamuelBellomo @chrispope just to verify - this PR is going to merge on master. Is it intended? If so - gtg, ig not - the target branch needs to be set appropriately.

@SamuelBellomo SamuelBellomo merged commit b09b4d6 into master Apr 8, 2021
@SamuelBellomo SamuelBellomo deleted the chrispope-adding-third-party-contribs-file branch April 8, 2021 21:17
SamuelBellomo added a commit that referenced this pull request May 19, 2021
* main:
  Adding suggested changes
  Uploading pull-request-template
  docs: License UCL update and changelog additions (#304)
  Correction for stealth state, should use bool, not byte (#263)
  Create third-party contributions file (#262)
  Update README.md in package (#260)
  Architecture.md improvements (#254)
  docs: Changelog and Third Party for 0.1.0  (#233)
  Update LICENSE.md
  Update LICENSE.md
  Update LICENSE.md
  adding initial codeowners file (sam as global) (#258)
  Update readme (#256)
  Adding missing space
  project name update (#245)
  quick fix for missing TGA

# Conflicts:
#	Assets/BossRoom/Scripts/Client/Game/Character/ClientCharacterVisualization.cs
#	Assets/BossRoom/Scripts/Server/Game/Action/StealthModeAction.cs
#	Assets/BossRoom/Scripts/Server/Game/Character/AIBrain.cs
#	Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md
#	ProjectSettings/ProjectSettings.asset
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0-URGENT Blocker for a release and needs to be merged ASAP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants