Merge remote-tracking branch 'origin/savya' into work_branch

# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF Blue Outline.asset
This commit is contained in:
Mausham
2026-05-29 15:03:52 +05:45
141 changed files with 30011 additions and 18310 deletions

View File

@@ -418,8 +418,7 @@ MonoBehaviour:
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras:
- {fileID: 82022334}
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
@@ -481,12 +480,12 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 34
orthographic: 1
orthographic: 0
orthographic size: 1
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 0
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff