302 Commits

Author SHA1 Message Date
c0aeff4c33 Merge commit 'e8168d67747a31dba6d0a19946d4d23aec63dd14' 2025-04-10 17:24:20 +02:00
4cad020a35 Merge branch 'programming' 2025-04-10 17:18:42 +02:00
dbf1dfb9e5 Skip-Feature for Grotto Essen and Grotto Kueche (in Menu and in 3.2 Scene) 2025-04-10 17:17:18 +02:00
Dominik Gut
e8168d6774 Chatbot Timelines 2025-04-10 15:26:53 +02:00
Dominik Gut
a27a66f6ae Merge branch 'master' into leveldesign 2025-04-10 09:38:15 +02:00
Dominik Gut
7478b5e928 Chatbot 2025-04-10 09:37:37 +02:00
aadb3c3622 Add menu button to Handmenu 2025-04-09 16:48:14 +02:00
30c6393a4e Made menu working in android build 2025-04-09 16:20:04 +02:00
ad61172c7b Merge branch 'programming' 2025-04-09 14:01:17 +02:00
647432278c Update FMOD banks and Baeckerei 2025-04-09 14:00:01 +02:00
782c3c1dc1 Merge branch 'master' into programming 2025-04-09 09:38:06 +02:00
4844bee735 Merge commit '23eaae33d83c4539f06dae0007da3c691a325889' 2025-04-09 09:36:45 +02:00
Dominik Gut
23eaae33d8 Scene 0.0-Menu added 2025-04-08 16:57:01 +02:00
efcb3982a2 Merge branch 'programming' 2025-04-08 09:44:37 +02:00
44b12f549d Update Castello story 2025-04-07 15:00:52 +02:00
3e50d37694 Castello story 2025-04-04 17:24:59 +02:00
4c0378502d Merge branch 'master' into programming 2025-04-04 09:53:52 +02:00
07b384e5c4 Merge branch 'leveldesign' 2025-04-04 09:52:42 +02:00
Dominik Gut
b2c91dd13c Castello-Videos 2025-04-04 08:34:09 +02:00
Dominik Gut
00fc9cad82 Faulty Grotto- and Backerei-Videos replaced 2025-04-03 17:15:58 +02:00
Dominik Gut
54e7d7d532 Merge branch 'master' into leveldesign 2025-04-03 13:47:45 +02:00
41a912976a Merge branch 'programming' 2025-04-03 12:02:49 +02:00
9ed948fe1a Update 2.2 und 3.2 2025-04-03 12:00:28 +02:00
Dominik Gut
d705c17000 Castello Update 2025-04-03 02:10:54 +02:00
6c16bbb856 Add videos to Baeckerei Outro 2025-04-02 17:57:11 +02:00
2d0c11e937 Add videos to Baeckerei 2025-04-01 17:19:43 +02:00
a5c0e8084a Merge branch 'master' into programming 2025-04-01 11:48:58 +02:00
fd294f60c3 Merge branch 'leveldesign' 2025-04-01 11:48:38 +02:00
Dominik Gut
4a51a65f92 Baeckerei Update 2025-04-01 10:57:11 +02:00
Dominik Gut
740eec6ac9 Baeckerei-Update Video-Metafiles 2025-04-01 10:40:57 +02:00
548509e6dd Merge branch 'master' into programming 2025-04-01 10:03:55 +02:00
c932ce1e77 Merge branch 'leveldesign' 2025-04-01 10:02:59 +02:00
Dominik Gut
2ec156cd26 Geschaeft Update 2025-03-28 20:41:32 +01:00
Dominik Gut
ca710ba569 Merge branch 'master' into leveldesign 2025-03-28 20:32:55 +01:00
Dominik Gut
413f1f4969 Baeckerei-Videos 2025-03-28 20:18:11 +01:00
40a9ee122c Merge branch 'programming' 2025-03-28 17:28:46 +01:00
74932b5828 Implement Ablauf Baeckerei 2025-03-28 17:27:33 +01:00
3dafa55b8f Setup scene 2.0 + 2.1 2025-03-28 11:36:40 +01:00
Dominik Gut
3199d330a7 Replace Grotto-Videos "Nachfrage...4, 16, 22, 23" 2025-03-27 15:18:36 +01:00
b0cafc61f9 Merge branch 'programming' 2025-03-27 14:55:01 +01:00
2ba32ccc73 Merge branch 'master' into programming 2025-03-27 14:46:27 +01:00
fe36775a1b Merge branch 'leveldesign' 2025-03-27 14:42:10 +01:00
171763e3ba Update XR Hands, add custom gesture, add feature to skip intro in 1.0 SBB 2025-03-27 14:40:43 +01:00
Dominik Gut
026995ca06 Geschaeft Update 2025-03-27 10:48:09 +01:00
bda97c2583 Destroy textures when slideshow is finished 2025-03-26 15:02:50 +01:00
c97ccef80c Add function to rotate XR Origin, add rotations in BT 2025-03-26 13:30:49 +01:00
a8ff9dcf22 Add videos to Im_Grotto_Essen 2025-03-25 17:22:16 +01:00
Dominik Gut
34862ea67d Geschaeft Update 2025-03-24 07:53:48 +01:00
72d14de335 Merge branch 'programming' 2025-03-18 17:23:48 +01:00
cdee6ca4f5 Add ParticleTrigger for parmesan, fixes (Schneidebrett, Pilze, Handmenu) 2025-03-18 17:22:36 +01:00