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

# Conflicts: # Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
2026-07-06 18:14:44 +05:45
parent 40ba0df92d dfd76d187f
commit c2d3ff4dd9
49 changed files with 4485 additions and 2144 deletions
--- a/Assets/Darkmatter/Content/.DS_Store
+++ b/Assets/Darkmatter/Content/.DS_Store
--- a/Assets/Darkmatter/Content/Colorbook
+++ b/Assets/Darkmatter/Content/Colorbook
--- a/Assets/Darkmatter/Content/Colorbook
+++ b/Assets/Darkmatter/Content/Colorbook
--- a/UI/DrawingItems/Aeroplane/Areroplane
+++ b/UI/DrawingItems/Aeroplane/Areroplane
@@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
    flipGreenChannel: 0
-  isReadable: 1
+  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
--- a/Assets/Darkmatter/Content/Colorbook
+++ b/Assets/Darkmatter/Content/Colorbook
@@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
    flipGreenChannel: 0
-  isReadable: 1
+  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
--- a/Assets/Darkmatter/Content/Colorbook
+++ b/Assets/Darkmatter/Content/Colorbook
@@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
    flipGreenChannel: 0
-  isReadable: 1
+  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
--- a/UI/DrawingItems/Car1/Car1_Reference(1).png.meta
+++ b/UI/DrawingItems/Car1/Car1_Reference(1).png.meta
@@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
    flipGreenChannel: 0
-  isReadable: 1
+  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
--- a/Assets/Darkmatter/Content/Colorbook
+++ b/Assets/Darkmatter/Content/Colorbook
@@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
    flipGreenChannel: 0
-  isReadable: 1
+  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
--- a/Assets/Darkmatter/Content/Colorbook
+++ b/Assets/Darkmatter/Content/Colorbook
@@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
    flipGreenChannel: 0
-  isReadable: 1
+  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
--- a/Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold
+++ b/Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold