Merge branch 'master' into programming

Merge leveldesign
Merge branch 'master' into leveldesign
2025-08-06 19:20:25 +02:00 · 2025-08-06 19:19:48 +02:00 · 2025-08-06 19:15:26 +02:00 · 2025-08-06 19:10:57 +02:00 · 2025-08-06 18:57:12 +02:00 · 2025-08-06 18:23:13 +02:00
10 changed files with 485343 additions and 1363 deletions
--- a/Viagg-io/Assets/Scenes/2.2-Geschaeft.unity
+++ b/Viagg-io/Assets/Scenes/2.2-Geschaeft.unity
--- a/Viagg-io/Assets/Scenes/2.2-Geschaeft/OcclusionCullingData.asset
+++ b/Viagg-io/Assets/Scenes/2.2-Geschaeft/OcclusionCullingData.asset
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-V-32.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-V-32.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-V-35.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-V-35.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-V-idle-33.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-V-idle-33.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-6.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-6.mp4
--- a/Videos/Grotto/Im_Grotto_essen-Grotto_Unterhaltung-G-10.mp4
+++ b/Videos/Grotto/Im_Grotto_essen-Grotto_Unterhaltung-G-10.mp4
--- a/Videos/Grotto/Kueche-Zusammen_Kochen-F-9.mp4
+++ b/Videos/Grotto/Kueche-Zusammen_Kochen-F-9.mp4
--- a/Videos/Grotto/Story_B_Grotto-Outro-F-3.mp4
+++ b/Videos/Grotto/Story_B_Grotto-Outro-F-3.mp4
--- a/Videos/Grotto/Story_B_Grotto-Outro-F-5.mp4
+++ b/Videos/Grotto/Story_B_Grotto-Outro-F-5.mp4
Author	SHA1	Message	Date
Nadine Ganz	468ca0847a	Merge branch 'master' into programming	2025-08-06 19:20:25 +02:00
Nadine Ganz	c1f1598cec	Merge leveldesign	2025-08-06 19:19:48 +02:00
Dominik Gut	eeecf0df22	Merge branch 'master' into leveldesign	2025-08-06 19:15:26 +02:00
Dominik Gut	148562ea3c	Baeckerei Update (videos scaled and rebaked occlusion)	2025-08-06 19:10:57 +02:00
Dominik Gut	bd6f7fd233	Grotto Videos Update (phone screen added and alpha mask corrected)	2025-08-06 18:57:12 +02:00
Dominik Gut	bc0aa14da6	Revert "Grotto Videos Update (added smartphone screen)" This reverts commit 93cd0746ecf5a772516a7f272c58fe869f4ed3a9.	2025-08-06 18:23:13 +02:00
Dominik Gut	93cd0746ec	Grotto Videos Update (added smartphone screen)	2025-08-06 18:20:54 +02:00
Dominik Gut	2199681d3b	Baeckerei Videos Update (correction audio and faulty videos)	2025-08-06 18:20:08 +02:00
Nadine Ganz	4c8dcefbab	Merge branch 'programming'	2025-08-06 17:44:50 +02:00
Nadine Ganz	911bcbbcab	Merge branch 'programming'	2025-08-06 12:07:47 +02:00
Nadine Ganz	3ef821fdac	Merge branch 'programming'	2025-08-05 22:17:46 +02:00