Skip to content

Conversation

@SamuelBellomo
Copy link
Contributor

No description provided.

@SamuelBellomo SamuelBellomo merged commit ef215c4 into master Apr 6, 2021
@SamuelBellomo SamuelBellomo deleted the SamuelBellomo-patch-1 branch April 6, 2021 22:05
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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants