Commit a023663
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.assetFile tree
3 files changed
+41
-2
lines changed- .github/ISSUE_TEMPLATE
- Packages/com.unity.multiplayer.samples.coop
3 files changed
+41
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
0 commit comments