Skip to content

Briancoughlin patch 2 - #256

Merged
SamuelBellomo merged 9 commits into
masterfrom
Briancoughlin-patch-2
Apr 6, 2021
Merged

SamuelBellomo merged 9 commits into
masterfrom
Briancoughlin-patch-2

Conversation

@Briancoughlin

Copy link
Copy Markdown
Contributor

Suggested updates to the readme based on information gained writing the getting-started guide.

@lkrell lkrell left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Quick feedback

Comment thread README.md Outdated
Comment thread README.md Outdated
Comment thread README.md Outdated
@SamuelBellomo SamuelBellomo added the 0-URGENT Blocker for a release and needs to be merged ASAP label Apr 6, 2021
@SamuelBellomo

Copy link
Copy Markdown
Contributor

This should be merged after your other fix is merged

@SamuelBellomo SamuelBellomo added the 1-Needs Review PR needs attention from the assignee and reviewers label Apr 6, 2021
Briancoughlin and others added 2 commits April 6, 2021 17:22
Co-authored-by: Lori Krell <76010626+lkrell@users.noreply.github.com>
@Briancoughlin

Copy link
Copy Markdown
Contributor Author

have added the changes for the other PR ( Github was mucking about earlier so it lost my initial PR so i redid it ). everything should be in this one now.

Comment thread README.md Outdated
@SamuelBellomo SamuelBellomo added 2-One More Review One review in, one to go and removed 1-Needs Review PR needs attention from the assignee and reviewers labels Apr 6, 2021
@pdeschain pdeschain added 3-Good to Merge 4-On Hold PR can't proceed because it's blocked or is otherwise waiting on something. and removed 2-One More Review One review in, one to go 4-On Hold PR can't proceed because it's blocked or is otherwise waiting on something. labels Apr 6, 2021
@SamuelBellomo
SamuelBellomo merged commit 5d8cf6d into master Apr 6, 2021
@SamuelBellomo
SamuelBellomo deleted the Briancoughlin-patch-2 branch April 6, 2021 17:57
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 3-Good to Merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants