Merge branch 'master' into programming

Merge branch 'programming'
Merge leveldesign
2025-08-05 15:47:05 +02:00 · 2025-08-05 15:46:20 +02:00 · 2025-08-05 15:45:58 +02:00 · 2025-08-05 13:51:56 +02:00 · 2025-08-05 11:57:27 +02:00 · 2025-08-05 10:10:38 +02:00
17 changed files with 753 additions and 697 deletions
--- a/Viagg-io/Assets/Prefabs/Castello/chatbot.prefab
+++ b/Viagg-io/Assets/Prefabs/Castello/chatbot.prefab
@ -144,7 +144,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 131ed572a2d5d4441a8fb25816381e2d, type: 2}
+  - {fileID: 2100000, guid: 7c5a131077a815044a0f6a1028e6683e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -227,7 +227,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: b4902ac4b16b5a84499974a5dd14258c, type: 2}
+  - {fileID: 2100000, guid: bda3fb37263cf51438fd6b5822cc763f, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -310,7 +310,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 131ed572a2d5d4441a8fb25816381e2d, type: 2}
+  - {fileID: 2100000, guid: 7c5a131077a815044a0f6a1028e6683e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -476,7 +476,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 238d31dece945ee4a85033a3563fceb4, type: 2}
+  - {fileID: 2100000, guid: bda3fb37263cf51438fd6b5822cc763f, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -1164,7 +1164,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 131ed572a2d5d4441a8fb25816381e2d, type: 2}
+  - {fileID: 2100000, guid: 7c5a131077a815044a0f6a1028e6683e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
--- a/Viagg-io/Assets/Scenes/2.6-Castello.unity
+++ b/Viagg-io/Assets/Scenes/2.6-Castello.unity
--- a/Videos/Grotto/Kueche-Outro-F-1.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-1.mp4
--- a/Videos/Grotto/Kueche-Outro-F-11.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-11.mp4
--- a/Videos/Grotto/Kueche-Outro-F-15.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-15.mp4
--- a/Videos/Grotto/Kueche-Outro-F-4.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-4.mp4
--- a/Videos/Grotto/Kueche-Outro-F-7.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-7.mp4
--- a/Videos/Grotto/Kueche-Outro-F-idle-14.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-idle-14.mp4
--- a/Videos/Grotto/Kueche-Outro-F-idle-2.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-idle-2.mp4
--- a/Videos/Grotto/Kueche-Outro-F-idle-5.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-idle-5.mp4
--- a/Videos/Grotto/Kueche-Outro-F-idle-8.mp4
+++ b/Videos/Grotto/Kueche-Outro-F-idle-8.mp4
--- a/Videos/Grotto/Kueche-Outro-G-12.mp4
+++ b/Videos/Grotto/Kueche-Outro-G-12.mp4
--- a/Videos/Grotto/Kueche-Outro-G-3.mp4
+++ b/Videos/Grotto/Kueche-Outro-G-3.mp4
--- a/Videos/Grotto/Kueche-Outro-G-9.mp4
+++ b/Videos/Grotto/Kueche-Outro-G-9.mp4
--- a/Videos/Grotto/Kueche-Outro-G-idle-10.mp4
+++ b/Videos/Grotto/Kueche-Outro-G-idle-10.mp4
--- a/Videos/Grotto/Kueche-Outro-G-idle-13.mp4
+++ b/Videos/Grotto/Kueche-Outro-G-idle-13.mp4
--- a/Videos/Grotto/Kueche-Outro-G-idle-6.mp4
+++ b/Videos/Grotto/Kueche-Outro-G-idle-6.mp4
Author	SHA1	Message	Date
Nadine Ganz	ea35981ed8	Merge branch 'master' into programming	2025-08-05 15:47:05 +02:00
Nadine Ganz	737eda3e30	Merge branch 'programming'	2025-08-05 15:46:20 +02:00
Nadine Ganz	b06bdc7973	Merge leveldesign	2025-08-05 15:45:58 +02:00
Dominik Gut	727e33f5e3	Merge branch 'master' into leveldesign	2025-08-05 13:51:56 +02:00
Dominik Gut	8812c7fcac	Grotto Videos (Kueche-Outro) downscaled	2025-08-05 11:57:27 +02:00
Dominik Gut	908bf78228	Castello Update (video size + chatbot color)	2025-08-05 10:10:38 +02:00