Merge branch 'master' into programming

Merge branch leveldesign
Merge branch 'programming'
2025-07-29 15:37:01 +02:00 · 2025-07-29 15:36:18 +02:00 · 2025-07-29 15:35:33 +02:00 · 2025-07-29 11:49:34 +02:00 · 2025-07-29 10:40:37 +02:00
101 changed files with 0 additions and 0 deletions
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-2.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-5.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-5.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-idle-16.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-idle-16.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-idle-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-idle-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-idle-7.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-F-idle-7.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-10.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-10.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-12.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-12.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-14.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-14.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-8.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-8.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-11.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-11.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-13.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-13.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-15.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-15.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-6.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-6.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-9.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Intro-V-idle-9.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-10.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-10.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-12.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-12.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-14.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-14.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-18.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-18.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-22.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-22.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-26.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-26.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-27.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-27.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-5.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-5.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-6.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-6.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-11.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-11.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-13.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-13.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-15.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-15.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-19.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-19.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-23.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-23.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-7.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-E-idle-7.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-16.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-16.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-20.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-20.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-24.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-24.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-28.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-28.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-30.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-30.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-34.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-34.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-8.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-8.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-17.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-17.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-21.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-21.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-25.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-25.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-29.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-29.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-31.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-31.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-9.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Baeckerei_Outro-F-idle-9.mp4
--- 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-Bestellung_Begleiter-F-10.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-10.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-2.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-6.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-6.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-idle-11.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-idle-11.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-idle-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-idle-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-idle-7.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-F-idle-7.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-12.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-12.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-16.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-16.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-8.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-8.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-13.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-13.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-17.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-17.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-5.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-5.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-9.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter-V-idle-9.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-11-cellulare.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-11-cellulare.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-11.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-11.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-15.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-15.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-idle-12.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-idle-12.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-idle-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-idle-2.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-idle-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-F-idle-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-10-idle.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-10-idle.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-13.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-13.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-5.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-5.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-6.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-6.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-idle-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-idle-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-idle-10.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-idle-10.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-idle-14.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bestellung_Begleiter_beide-V-idle-14.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-F-idle-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-F-idle-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-2.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-4.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/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-idle-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-idle-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-idle-5.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-idle-5.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-idle-7.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Bezahlen_einzeln-V-idle-7.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Dank_Einkauf-V-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Dank_Einkauf-V-2.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Dank_Einkauf-V-idle-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Dank_Einkauf-V-idle-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Mitnehmen-V-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Mitnehmen-V-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-F-idle-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-F-idle-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-V-3.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-V-3.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-V-idle-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-V-idle-2.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-V-idle-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bestellung-V-idle-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-4.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-4.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-6-scan.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-6-scan.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-6-twint.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-6-twint.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-6.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-6.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-idle-1.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-F-idle-1.mp4
--- a/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-V-2.mp4
+++ b/Videos/Baeckerei/Story_A_Picknicken-Nachfrage_Bezahlung-V-2.mp4
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nadine Ganz	95fa4e39d1	Merge branch 'master' into programming	2025-07-29 15:37:01 +02:00
Nadine Ganz	e8cabbe7ee	Merge branch leveldesign	2025-07-29 15:36:18 +02:00
Nadine Ganz	8c646c916e	Merge branch 'programming'	2025-07-29 15:35:33 +02:00
Dominik Gut	a0da9dfde4	Merge branch 'master' into leveldesign	2025-07-29 11:49:34 +02:00
Dominik Gut	a5bf792e42	Videos Baeckerei (converted back to H.264)	2025-07-29 10:40:37 +02:00