Skip to content

Conversation

@lkrell
Copy link
Contributor

@lkrell lkrell commented Apr 22, 2021

Updates in this PR:

  • Update LICENSE in repo and package to strictly UCL. Ticket GOMPS-494 , verified with Legal.
  • Update changelog to include 0.1.1 hotfix.
  • Added potential hotfix 0.1.2 entry for the UCL license. Can remove that entry if a hotfix is not cut.

Currently entering this PR against master branch. Can also provide a PR to develop if needed.

chrispope
chrispope previously approved these changes Apr 23, 2021
Copy link
Collaborator

@chrispope chrispope left a comment

Choose a reason for hiding this comment

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

Looks good

@lkrell
Copy link
Contributor Author

lkrell commented Apr 23, 2021

@chrispope @SamuelBellomo updated the hotfix note for the byte to bool, and changed date for 0.1.2 hotfix to today. Just need a review/approve and you can merge. Will make sure this is reflected in docsite. Thanks!

@chrispope chrispope self-requested a review April 23, 2021 13:10
chrispope
chrispope previously approved these changes Apr 23, 2021
Cosmin-B
Cosmin-B previously approved these changes Apr 23, 2021
@lkrell
Copy link
Contributor Author

lkrell commented Apr 23, 2021

Chris would like to add in the repo rename to main from master to the notes. May require another approval.

@lkrell lkrell dismissed stale reviews from Cosmin-B and chrispope via aef022b April 23, 2021 15:13
Copy link
Collaborator

@chrispope chrispope left a comment

Choose a reason for hiding this comment

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

Looks great

@SamuelBellomo SamuelBellomo merged commit 2702f80 into main Apr 23, 2021
@SamuelBellomo SamuelBellomo deleted the gomps-494 branch April 23, 2021 15:16
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants