Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressable scene loading #3040

Open
wants to merge 119 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
e36996c
update
NoelStephensUnity Mar 25, 2024
67f4a62
update
NoelStephensUnity Mar 25, 2024
41d13bc
update
NoelStephensUnity Mar 25, 2024
20d1cc1
update
NoelStephensUnity Mar 25, 2024
552a37c
update
NoelStephensUnity Mar 25, 2024
bcbbb61
update and style
NoelStephensUnity Mar 25, 2024
1fda8ee
update
NoelStephensUnity Mar 25, 2024
e030a59
update
NoelStephensUnity Mar 25, 2024
8a9a852
Update package.json
NoelStephensUnity Mar 25, 2024
e322544
Update ValidationExceptions.json
NoelStephensUnity Mar 25, 2024
a1c5d1d
update
NoelStephensUnity Mar 25, 2024
43bc25d
update
NoelStephensUnity Mar 26, 2024
18b389d
test fix
NoelStephensUnity Mar 26, 2024
41dd028
fix
NoelStephensUnity Mar 26, 2024
a2ccf77
Update CHANGELOG.md
NoelStephensUnity Mar 26, 2024
0e04678
test fix
NoelStephensUnity Mar 26, 2024
a3b503b
update
NoelStephensUnity Mar 26, 2024
6953178
Merge branch 'experimental/distributed-authority' into experimental/d…
NoelStephensUnity Mar 26, 2024
54ed8bf
update
NoelStephensUnity Mar 26, 2024
3569d80
fix
NoelStephensUnity Mar 26, 2024
65c0cd6
style
NoelStephensUnity Mar 26, 2024
916e637
style
NoelStephensUnity Mar 26, 2024
5d38c54
style
NoelStephensUnity Mar 26, 2024
c9df98b
test
NoelStephensUnity Mar 26, 2024
6132bb9
test
NoelStephensUnity Mar 26, 2024
959e887
style
NoelStephensUnity Mar 26, 2024
dbcb347
update
NoelStephensUnity Mar 27, 2024
ee27047
update & fix
NoelStephensUnity Mar 29, 2024
400cdc0
test fix
NoelStephensUnity Mar 30, 2024
5877aad
test and style
NoelStephensUnity Mar 30, 2024
beebcd6
test fix
NoelStephensUnity Mar 30, 2024
38fe8c2
test fix
NoelStephensUnity Mar 31, 2024
65d9742
style
NoelStephensUnity Mar 31, 2024
ba9f37a
test
NoelStephensUnity Mar 31, 2024
77ae80a
test
NoelStephensUnity Mar 31, 2024
7904e3d
fix & test
NoelStephensUnity Mar 31, 2024
2aa38ce
update
NoelStephensUnity Mar 31, 2024
a038711
update
NoelStephensUnity Apr 1, 2024
bcf94a7
fix
NoelStephensUnity Apr 1, 2024
81a88fc
update
NoelStephensUnity Apr 1, 2024
bbdcf59
update & fix
NoelStephensUnity Apr 1, 2024
0f34139
test fix
NoelStephensUnity Apr 1, 2024
e7ac3c8
chore: update to for Unity6 support (#2863)
NoelStephensUnity Apr 3, 2024
b0106c3
chore
NoelStephensUnity Apr 25, 2024
b449ea8
fix: in-scene networkobject with networktransform synchronization whe…
NoelStephensUnity Apr 25, 2024
db2315c
fix
NoelStephensUnity Apr 26, 2024
be8a02a
feat: add pre and post spawn methods [MTT-8470] up-port v2.0.0 (#2912)
NoelStephensUnity May 2, 2024
f6f815c
chore!: migrate components to runtime assembly [MTT-8472] (#2914)
NoelStephensUnity May 10, 2024
0e10948
chore: add second part of session restore (#2919)
NoelStephensUnity May 10, 2024
4e35f84
fix: In-scene placed NetworkObjects getting destroyed if early discon…
NoelStephensUnity May 14, 2024
6a4bb8f
feat: enum ordered message versioning (#2929)
NoelStephensUnity May 21, 2024
0060d33
chore: migrate tests from public to internal (#2930)
fluong6 May 22, 2024
3f59dff
chore: NGO 2.0.0-exp.4 merge back to develop NGO 2.0.0 (#2940)
fluong6 May 31, 2024
98d4bbc
fix: new message versioning starting after session owner message (#2942)
NoelStephensUnity Jun 3, 2024
25c7e6b
refactor: Ensure lengths are always written as uints (#2946)
EmandM Jun 5, 2024
d9e1a5c
chore: merge release 2.0.0-exp.5 into develop-2.0.0 (#2947)
NoelStephensUnity Jun 10, 2024
60d321d
chore: Break up the NetworkVariableSerialization file (#2950)
EmandM Jun 13, 2024
90cbb1e
fix: ownership change halfprecision, session owner onclientconnected,…
NoelStephensUnity Jun 15, 2024
2493ff6
fix
NoelStephensUnity Jun 16, 2024
59cdd30
fix: MPSNGM-302 Fix DA integration tests (#2955)
EmandM Jun 18, 2024
8b13c4e
chore: merge 2.0.0 pre.2 into develop 2.0.0 (#2965)
NoelStephensUnity Jun 26, 2024
5bff58f
fix: post 2.0.0-pre.2 fixes and updates (#2962)
NoelStephensUnity Jun 26, 2024
8f71c14
update
NoelStephensUnity Jul 1, 2024
d4a6dcc
fix: InstantiateAndSpawn not honoring ownerClientId parameter in clie…
NoelStephensUnity Jul 15, 2024
ee0e045
fix
NoelStephensUnity Jul 16, 2024
558fc67
fix: scenemanager clean up ScenesLoaded after synch unloading of rema…
NoelStephensUnity Jul 16, 2024
d70f417
feat: MPSNGM-294 patch DA network variables (#2958)
EmandM Jul 17, 2024
5b93ce6
chore: protected network manager (#2975)
DSchroer Jul 18, 2024
7ea9f9d
fix: Regression between comb-server and NGO network variables (#2974)
EmandM Jul 18, 2024
9c927df
fix: Fixing API doc issues (#2976)
jabbacakes Jul 18, 2024
af564b6
chore: merge v2.0.0-pre.3 into develop-2.0.0 (#2991)
NoelStephensUnity Jul 29, 2024
9ef01ba
fix: Improve API doc for OnGainedOwnership and OnLostOwnership (#2997)
jabbacakes Aug 5, 2024
04825ac
feat: add ping tool to public repo (#3001)
NoelStephensUnity Aug 5, 2024
29e5146
update
NoelStephensUnity Aug 6, 2024
0c9ac4e
fix: notauthority da mode urpc sending to self (#3000)
NoelStephensUnity Aug 6, 2024
d2bc5d4
fix: MPSNGM-365 Remove invalid ProxyMessage test (#3006)
EmandM Aug 12, 2024
133c125
fix: collections not detecting deltas (#3004)
NoelStephensUnity Aug 13, 2024
57797b7
fix: fixedstring byte writing and comparing up port (#3009)
NoelStephensUnity Aug 13, 2024
503dd15
fix: dual triggers generating false state transition up port (#3008)
NoelStephensUnity Aug 13, 2024
285e307
fix: adding null checks when accessing NetworkBehaviour for develop 2…
fluong6 Aug 19, 2024
977746d
fix: nested networktransforms not updating (#3016)
NoelStephensUnity Aug 20, 2024
99dc876
fix: networkanimator auto owner authoritative mode when in distribute…
NoelStephensUnity Aug 21, 2024
1b900a4
chore: NGO 2.0.0-pre.4 merge back to develop NGO develop 2.0.0 (#3025)
fluong6 Aug 23, 2024
61a2d0d
fix: Stop checking hierarchy changed in playmode (#3026)
NoelStephensUnity Aug 26, 2024
40f84dc
fix: prevent exception when showing despawned NetworkObject - up port…
NoelStephensUnity Aug 26, 2024
2fd4114
Local changes for addressable support
kroecks May 10, 2024
36625fa
pending update
kroecks May 10, 2024
8d7b51b
local trollking changes
kroecks May 10, 2024
640a7a3
minor change
kroecks Jun 8, 2024
21cf55e
fix: allow the check for a NetworkObject component on NetworkBehaviou…
NoelStephensUnity Aug 31, 2024
aee018c
fix: NetworkTransform initial synchronization, parenting, smooth tran…
NoelStephensUnity Sep 5, 2024
c0cd658
fix: player prefab null exception when using prefab hash via connecti…
NoelStephensUnity Sep 6, 2024
8e62d9e
fix: Add size validation to named and unnamed message sending [Up Por…
NoelStephensUnity Sep 7, 2024
91bb80e
fix: hidden objects from newly promoted session owner still synchroni…
NoelStephensUnity Sep 7, 2024
4b58d28
fix: NetworkVariable LastUpdateSent client timing (#3045)
NoelStephensUnity Sep 8, 2024
26c01ec
chore: example Non-Rigidbody CharacterController, moving bodies, smo…
NoelStephensUnity Sep 9, 2024
7389f8b
fix: networkshow client connected scenemanagement disabled (#3056)
NoelStephensUnity Sep 9, 2024
1d22804
chore: final 2.0.0 clean up tasks (#3052)
NoelStephensUnity Sep 9, 2024
31c30e5
fix: networkanimator only updates observers (#3057)
NoelStephensUnity Sep 10, 2024
da4649e
chore: NGO 2.0.0 merge back to develop NGO develop 2.0.0 (#3068)
fluong6 Sep 17, 2024
3afc6f9
fix: spawn many objects apv failures (#3069)
NoelStephensUnity Sep 17, 2024
ef9e1c1
fix: client side disconnect incorrect client count on host-server sid…
NoelStephensUnity Sep 25, 2024
390c332
fix: player spawn not applying position and rotation via connection a…
NoelStephensUnity Sep 27, 2024
cb7ec98
fix: player prefab spawning not honoring when spawnwithobservers is d…
NoelStephensUnity Sep 27, 2024
87d23e9
fix: NetworkManager instantiate & destroy notifications and player sp…
NoelStephensUnity Oct 8, 2024
0bef65c
chore: updates to comb-server bypass and connection sequence configur…
NoelStephensUnity Oct 10, 2024
058481b
fix: in-sceneobject NetworkObject update in editor tool (up-port) (#3…
NoelStephensUnity Oct 10, 2024
0055e1c
fix: provide non Rigidbody contact events and Rigidbody prioritizatio…
NoelStephensUnity Oct 11, 2024
e9b7ef4
fix: scene loading event not synchronizing in scene objects (#3096)
NoelStephensUnity Oct 11, 2024
5f7441c
chore: adjust ConnectionRequestMessage to use ClientConfig version as…
NoelStephensUnity Oct 14, 2024
3625247
fix: client-server owner authoritative nested NetworkTransform invali…
NoelStephensUnity Oct 14, 2024
6b459a1
fix: minor fixes for 2.1.0 (#3097)
NoelStephensUnity Oct 15, 2024
632bf35
fix: networkvariable collections can be modified without write permis…
NoelStephensUnity Oct 16, 2024
9509696
fix: prefab processor dirty up port (up port) (#3103)
NoelStephensUnity Oct 17, 2024
c2ab328
chore: NGO 2.1.0 merge back to develop NGO develop 2.0.0 (#3104)
fluong6 Oct 18, 2024
264b30d
bump version to 2.1.1
fluong6 Oct 18, 2024
7f639ff
Merge branch 'Unity-Technologies:develop' into addressable
kroecks Oct 31, 2024
bebd5a5
Merge remote-tracking branch 'origin/2.1.1' into addressables
kroecks Oct 31, 2024
8e494c4
upgrade changes
kroecks Nov 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Metrics/ @Unity-Technologies/multiplayer-tools
/com.unity.netcode.gameobjects/Runtime/Transports/ @Unity-Technologies/multiplayer-workflows
/com.unity.netcode.gameobjects/Tests/Editor/Transports/ @Unity-Technologies/multiplayer-workflows
/com.unity.netcode.gameobjects/Tests/Runtime/Transports/ @Unity-Technologies/multiplayer-workflows
*.asmdef @chrispope @miniwolf @NoelStephensUnity @fluong6
package.json @chrispope @miniwolf @NoelStephensUnity @fluong6
AssemblyInfo.cs @chrispope @miniwolf @NoelStephensUnity @fluong6
.editorconfig @chrispope @miniwolf @NoelStephensUnity @fluong6
.gitignore @chrispope @miniwolf @NoelStephensUnity @fluong6
.github/ @chrispope @miniwolf @NoelStephensUnity @fluong6
.yamato/ @chrispope @miniwolf @NoelStephensUnity @fluong6
*.asmdef @chrispope @miniwolf
package.json @chrispope @miniwolf
AssemblyInfo.cs @chrispope @miniwolf
.editorconfig @chrispope @miniwolf
.gitignore @chrispope @miniwolf
.github/ @chrispope @miniwolf
.yamato/ @chrispope @miniwolf
1 change: 1 addition & 0 deletions .github/workflows/conventional-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- develop
- develop-2.0.0

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
Expand Down
2 changes: 1 addition & 1 deletion .yamato/_triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pull_request_trigger:
- "develop"
- "develop-2.0.0"
- "/release\/.*/"

# Currently, we need to have a trigger to updated badges
# Only package badges currently exist
badges_test_trigger:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/project-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ standards_{{ projects.first.name }}:
name: Standards Check {{ projects.first.name }}
agent:
type: Unity::VM
image: desktop/logging-testing-linux:v0.1.2-926285
image: package-ci/ubuntu-20.04:v4
flavor: b1.large
commands:
- dotnet --version
Expand Down
17 changes: 7 additions & 10 deletions .yamato/project.metafile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
validation_editor: 2021.3
mobile_validation_editor: 2021.3
validation_editor: 6000.0
mobile_validation_editor: 6000.0

# Platforms that will be tested. The first entry in this array will also
# be used for validation
Expand Down Expand Up @@ -42,9 +42,7 @@ projects:
- name: com.unity.netcode.gameobjects
path: com.unity.netcode.gameobjects
test_editors:
- 2021.3
- 2022.2
- 2023.1
- 6000.0
- trunk
- name: minimalproject
path: minimalproject
Expand All @@ -55,23 +53,22 @@ projects:
- name: com.unity.netcode.gameobjects
path: com.unity.netcode.gameobjects
test_editors:
- 2021.3
- 6000.0
- name: testproject-tools-integration
path: testproject-tools-integration
validate: false
publish: false
has_tests: true
test_editors:
- 2021.3
- 2022.2
- 6000.0
- trunk

# Package dependencies
dependencies:
- name: com.unity.transport
version: 2.0.0-pre.2
version: 2.2.1
test_editors:
- 2022.2
- 6000.0
- trunk

# Scripting backends used by Standalone Playmode Tests
Expand Down
83 changes: 83 additions & 0 deletions Examples/CharacterControllerMovingBodies/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json
/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json.meta

# Secrets
*.pem
*.pem.meta

InitTestScene*

boot.config
SceneTemplateSettings.json
*BurstAotSettings*.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3}
m_Name: DefaultNetworkPrefabs
m_EditorClassIdentifier:
IsDefault: 1
List:
- Override: 0
Prefab: {fileID: 2522762726852386808, guid: 380c984d34fc8664c8f53fc1d8733a25, type: 3}
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
- Override: 0
Prefab: {fileID: 8921789205124766477, guid: 89b57e576a8d47643b2dbd45b1f8cab1, type: 3}
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
- Override: 0
Prefab: {fileID: 3439633038736912633, guid: 398aad09d8b2a47eba664a076763cdcc, type: 3}
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ChildLocal
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 0.8980392, g: 0.039215658, b: 0.7682729, a: 0.2509804}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading