Skip to content

Commit 9fbfb5b

Browse files
committed
Merge branch 'test/multiprocess-tests/execute-step-in-context' into test/multiprocess-tests/adding-perf-tests-for-spawn
* test/multiprocess-tests/execute-step-in-context: proper rename for scene rename for test scene Update testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/BuildMultiprocessTestPlayer.cs rename test scene # changing root menu PR suggestions no longer ignore '[Ss]treamingAssets/buildInfo.txt' feat: network animator Trigger parameter support (#872) # Conflicts: # testproject/Assets/Tests/Runtime/MultiprocessRuntime.meta # testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers.meta # testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/BuildMultiprocessTestPlayer.cs
2 parents f45df03 + bde44dd commit 9fbfb5b

File tree

331 files changed

+3231
-112894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+3231
-112894
lines changed

com.unity.multiplayer.mlapi/Editor/NetworkAnimatorEditor.cs

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)