Commit c8fb89e
chore: merge v2.4.3 back into develop-2.0.0 (#3523)
Chore to merge the hot-fix patch v2.4.3 back into the develop-2.0.0
branch.
## Changelog
NA
## Testing and Documentation
- No tests have been added.
- No documentation changes or additions were necessary.
<!-- Uncomment and mark items off with a * if this PR deprecates any
API:
### Deprecated API
- [ ] An `[Obsolete]` attribute was added along with a `(RemovedAfter
yyyy-mm-dd)` entry.
- [ ] An [api updater] was added.
- [ ] Deprecation of the API is explained in the CHANGELOG.
- [ ] The users can understand why this API was removed and what they
should use instead.
-->
## Backport
This is a v2.x specific PR.
<!-- If this is a backport:
- Add the following to the PR title: "\[Backport\] ..." .
- Link to the original PR.
If this needs a backport - state this here
If a backport is not needed please provide the reason why.
If the "Backports" section is not present it will lead to a CI test
failure.
-->
---------
Co-authored-by: unity-renovate[bot] <120015202+unity-renovate[bot]@users.noreply.github.com>
Co-authored-by: Emma <emma.mcmillan@unity3d.com>1 parent 3a64ab0 commit c8fb89e
File tree
4 files changed
+273
-40
lines changed- com.unity.netcode.gameobjects
- Runtime/Connection
- Tests/Runtime/NetworkObject
4 files changed
+273
-40
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
23 | 30 | | |
24 | 31 | | |
25 | 32 | | |
| |||
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1177 | 1177 | | |
1178 | 1178 | | |
1179 | 1179 | | |
1180 | | - | |
1181 | | - | |
| 1180 | + | |
1182 | 1181 | | |
1183 | 1182 | | |
1184 | 1183 | | |
| |||
1244 | 1243 | | |
1245 | 1244 | | |
1246 | 1245 | | |
1247 | | - | |
| 1246 | + | |
1248 | 1247 | | |
1249 | 1248 | | |
1250 | 1249 | | |
| |||
0 commit comments