Skip to content

Commit a023663

Browse files
committed
Merge branch 'main' into develop
* 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
2 parents 62981d1 + 91a6e3d commit a023663

File tree

3 files changed

+41
-2
lines changed

3 files changed

+41
-2
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!---
2+
Thank you for contributing to Unity.
3+
To help us process this pull request we recommend that you add the following information:
4+
- Summary and list of changes in the pull request,
5+
- Issue(s) related to the changes made such as GitHub or Jira,
6+
- Manual testing scenarios if available
7+
Fields marked with (*) are required. Please don't remove the template.
8+
-->
9+
### Description (*)
10+
<!---
11+
Please provide a description of the changes proposed in the pull request.
12+
Letting us know what has changed and why it needed changing will help us validate this pull request.
13+
-->
14+
### Related Pull Requests
15+
<!-- related pull request placeholder -->
16+
### Issue Number(s) (*)
17+
<!---
18+
Provide a list of fixed issues from Jira (GOMPS-ticketnumber) or GitHub (#issuenumber).
19+
This helps us understand the reasoning behind this change, what it fixes, feature being added, etc.
20+
-->
21+
Fixes issue(s):
22+
### Manual testing scenarios
23+
<!---
24+
Please provide a set of unambiguous steps to test the proposed code change.
25+
If an error is output to either the player or editor log file, please attach.
26+
Giving us manual testing scenarios will help with the processing and validation process.
27+
-->
28+
1. ...
29+
2. ...
30+
### Questions or comments
31+
<!---
32+
If relevant, here you can ask questions or provide comments on your pull request for the reviewer
33+
For example if you need assistance with writing tests or would like some feedback on one of your development ideas or for the reviewer to focus on a particular area of the code.
34+
-->
35+
### Contribution checklist
36+
- [ ] Pull request has a meaningful description of its purpose
37+
- [ ] All commits are accompanied by meaningful commit messages
38+
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
39+
- [ ] All automated tests passed successfully (all builds are green)

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Boss Room: Small Scale Co-op Sample © 2021 Unity Technologies
22

3-
Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license); otherwise licensed under the Unity Package Distribution License (see https://unity3d.com/legal/licenses/Unity_Package_Distribution_License).
3+
Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license).
44

55
Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Boss Room: Small scale co-op sample © 2021 Unity Technologies
22

3-
Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license); otherwise licensed under the Unity Package Distribution License (see https://unity3d.com/legal/licenses/Unity_Package_Distribution_License).
3+
Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license).
44

55
Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.

0 commit comments

Comments
 (0)