Mathew/Emberwild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

Browse Source 
# Conflicts:
#	Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
This commit is contained in:
Mathew
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark 2D.prefab
+1 -1
View File
@@ -185,7 +185,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6667641716399555817
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark 3D Normal.prefab
+1 -1
View File
@@ -93,7 +93,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6667641716399555817
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark 3D Rigidbodies.prefab
+2 -2
View File
@@ -249,7 +249,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 7
<PrefabId>k__BackingField: 8
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 8265366384202762268
SceneId: 0
@@ -277,7 +277,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6130968803401110125
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark Cubes.prefab
+2 -2
View File
@@ -65,7 +65,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 19
<PrefabId>k__BackingField: 22
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 17307177893486029436
SceneId: 0
@@ -93,7 +93,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6667641716399555817
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark Rigidbodies.prefab
+2 -2
View File
@@ -66,7 +66,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 12
<PrefabId>k__BackingField: 13
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 13441272123366128544
SceneId: 0
@@ -94,7 +94,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6130968803401110125
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/ColliderRollback/Prefabs/Player.prefab
+1 -1
View File
@@ -95,7 +95,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &2759061792589502182
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/HashGrid/Prefabs/HashGrid_Moving.prefab
+2 -2
View File
@@ -156,7 +156,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 13
<PrefabId>k__BackingField: 16
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 15851448279207409322
SceneId: 0
@@ -184,7 +184,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &4670340455971777434
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/HashGrid/Prefabs/HashGrid_Static.prefab
+1 -1
View File
@@ -182,7 +182,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &437322326027960749
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/Prediction/CharacterController/Prefabs/CharacterControllerPrediction.prefab
+2 -2
View File
@@ -85,7 +85,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 8
<PrefabId>k__BackingField: 9
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 8652468816125699328
SceneId: 0
@@ -114,7 +114,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!143 &4148834954576211901
CharacterController:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/Prediction/Rigidbody/Scripts/Prefabs/RigidbodyPrediction.prefab
+1 -1
View File
@@ -399,7 +399,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!54 &1517669882
Rigidbody:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/SceneManager (Old Examples)/Prefabs/Player.prefab
+2 -2
View File
@@ -319,7 +319,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 21
<PrefabId>k__BackingField: 24
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 18062267916601837655
SceneId: 0
@@ -347,7 +347,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6420552185407096997
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/FishNet/Demos/SceneManager/Additive Scenes/Prefabs/Player.prefab
+2 -2
View File
@@ -346,7 +346,7 @@ MonoBehaviour:
_spectatorInterpolation: 2
_enableTeleport: 0
_teleportThreshold: 1
<PrefabId>k__BackingField: 18
<PrefabId>k__BackingField: 21
<SpawnableCollectionId>k__BackingField: 0
<AssetPathHash>k__BackingField: 17300898577088521684
SceneId: 0
@@ -374,7 +374,7 @@ MonoBehaviour:
_initializeOrder: 0
_preventDespawnOnDisconnect: 0
_defaultDespawnType: 0
_initializedTimestamp: -8584169414543529327
_initializedTimestamp: -8584168773125460856
--- !u!114 &6767263130208162619
MonoBehaviour:
m_ObjectHideFlags: 0