Commit Graph

  • 04f7816512 Clean up project programming Nadine Ganz 2025-04-23 14:19:06 +02:00
  • 51e7ecdbf7 Add parameter to Rucksack Anim, add audio to Bäckerei Nadine Ganz 2025-04-22 16:45:18 +02:00
  • ac33733843 Added audio of Nonna to Grotto, deleted old unused audios, added Gesture Detection to all scenes Nadine Ganz 2025-04-22 15:37:39 +02:00
  • c902096238 Merge branch 'master' into programming Nadine Ganz 2025-04-22 10:37:41 +02:00
  • d3c6418925 Merge branch 'leveldesign' master Nadine Ganz 2025-04-22 10:36:45 +02:00
  • 4e062cd687 Minor fixes in 1.0-SBB, 2.2-Geschaeft und 2.6-Castello (models, materials, prefabs, lighting) leveldesign Dominik Gut 2025-04-17 21:36:09 +02:00
  • 02001a75aa Updates 1.0-SBB, 2.2-Castello und 2.6-Geschaeft (models, materials, prefabs, lighting) Dominik Gut 2025-04-17 12:10:05 +02:00
  • 138b9d7953 Grotto Update (Missing Prefab repaired + Materials and Lighting) Dominik Gut 2025-04-15 13:17:17 +02:00
  • 8efa1fe3c3 Merge branch 'master' into programming Nadine Ganz 2025-04-14 14:10:32 +02:00
  • 6f59aaae1d Merge commit '1e242317370e6dddab6bac27206c14e42925414e' Nadine Ganz 2025-04-14 14:08:49 +02:00
  • 08708a542c Merge branch 'programming' Nadine Ganz 2025-04-14 14:08:11 +02:00
  • b8bb876042 Add audio to Castello Nadine Ganz 2025-04-14 13:56:59 +02:00
  • 1e24231737 SBB-video in all SBB-Levels replaced (+ skybox) Dominik Gut 2025-04-11 17:12:48 +02:00
  • dbc8f9dc1a Add Timeline Handler for BTC; integrate first chatbot anims to story Nadine Ganz 2025-04-11 17:06:40 +02:00
  • 6d53c95c06 Grotto Update (backofen nearer to corner and leveldesign extended and lighting updated) Dominik Gut 2025-04-11 17:03:10 +02:00
  • 386f7f0fac Video-Loop Bellinzona replaced (slowed and stabilized) Dominik Gut 2025-04-11 11:29:23 +02:00
  • 18d04fc29e Merge branch 'master' into programming Nadine Ganz 2025-04-10 17:25:39 +02:00
  • c0aeff4c33 Merge commit 'e8168d67747a31dba6d0a19946d4d23aec63dd14' Nadine Ganz 2025-04-10 17:24:20 +02:00
  • 4cad020a35 Merge branch 'programming' Nadine Ganz 2025-04-10 17:18:42 +02:00
  • dbf1dfb9e5 Skip-Feature for Grotto Essen and Grotto Kueche (in Menu and in 3.2 Scene) Nadine Ganz 2025-04-10 17:17:18 +02:00
  • e8168d6774 Chatbot Timelines Dominik Gut 2025-04-10 15:26:53 +02:00
  • a27a66f6ae Merge branch 'master' into leveldesign Dominik Gut 2025-04-10 09:38:15 +02:00
  • 7478b5e928 Chatbot Dominik Gut 2025-04-10 09:37:37 +02:00
  • aadb3c3622 Add menu button to Handmenu Nadine Ganz 2025-04-09 16:48:14 +02:00
  • 30c6393a4e Made menu working in android build Nadine Ganz 2025-04-09 16:20:04 +02:00
  • ad61172c7b Merge branch 'programming' Nadine Ganz 2025-04-09 14:01:17 +02:00
  • 647432278c Update FMOD banks and Baeckerei Nadine Ganz 2025-04-09 14:00:01 +02:00
  • 782c3c1dc1 Merge branch 'master' into programming Nadine Ganz 2025-04-09 09:38:06 +02:00
  • 4844bee735 Merge commit '23eaae33d83c4539f06dae0007da3c691a325889' Nadine Ganz 2025-04-09 09:36:45 +02:00
  • 23eaae33d8 Scene 0.0-Menu added Dominik Gut 2025-04-08 16:57:01 +02:00
  • efcb3982a2 Merge branch 'programming' Nadine Ganz 2025-04-08 09:44:37 +02:00
  • 44b12f549d Update Castello story Nadine Ganz 2025-04-07 15:00:52 +02:00
  • 3e50d37694 Castello story Nadine Ganz 2025-04-04 17:24:59 +02:00
  • 4c0378502d Merge branch 'master' into programming Nadine Ganz 2025-04-04 09:53:52 +02:00
  • 07b384e5c4 Merge branch 'leveldesign' Nadine Ganz 2025-04-04 09:52:42 +02:00
  • b2c91dd13c Castello-Videos Dominik Gut 2025-04-04 08:34:09 +02:00
  • 00fc9cad82 Faulty Grotto- and Backerei-Videos replaced Dominik Gut 2025-04-03 17:15:58 +02:00
  • 54e7d7d532 Merge branch 'master' into leveldesign Dominik Gut 2025-04-03 13:47:45 +02:00
  • 41a912976a Merge branch 'programming' Nadine Ganz 2025-04-03 12:02:49 +02:00
  • 9ed948fe1a Update 2.2 und 3.2 Nadine Ganz 2025-04-03 12:00:28 +02:00
  • d705c17000 Castello Update Dominik Gut 2025-04-03 02:10:54 +02:00
  • 6c16bbb856 Add videos to Baeckerei Outro Nadine Ganz 2025-04-02 17:57:11 +02:00
  • 2d0c11e937 Add videos to Baeckerei Nadine Ganz 2025-04-01 17:19:43 +02:00
  • a5c0e8084a Merge branch 'master' into programming Nadine Ganz 2025-04-01 11:48:58 +02:00
  • fd294f60c3 Merge branch 'leveldesign' Nadine Ganz 2025-04-01 11:48:38 +02:00
  • 4a51a65f92 Baeckerei Update Dominik Gut 2025-04-01 10:57:11 +02:00
  • 740eec6ac9 Baeckerei-Update Video-Metafiles Dominik Gut 2025-04-01 10:40:57 +02:00
  • 548509e6dd Merge branch 'master' into programming Nadine Ganz 2025-04-01 10:03:55 +02:00
  • c932ce1e77 Merge branch 'leveldesign' Nadine Ganz 2025-04-01 10:02:59 +02:00
  • 2ec156cd26 Geschaeft Update Dominik Gut 2025-03-28 20:41:32 +01:00
  • ca710ba569 Merge branch 'master' into leveldesign Dominik Gut 2025-03-28 20:32:55 +01:00
  • 413f1f4969 Baeckerei-Videos Dominik Gut 2025-03-28 20:18:11 +01:00
  • 40a9ee122c Merge branch 'programming' Nadine Ganz 2025-03-28 17:28:46 +01:00
  • 74932b5828 Implement Ablauf Baeckerei Nadine Ganz 2025-03-28 17:27:33 +01:00
  • 3dafa55b8f Setup scene 2.0 + 2.1 Nadine Ganz 2025-03-28 11:36:40 +01:00
  • 3199d330a7 Replace Grotto-Videos "Nachfrage...4, 16, 22, 23" Dominik Gut 2025-03-27 15:18:36 +01:00
  • b0cafc61f9 Merge branch 'programming' Nadine Ganz 2025-03-27 14:55:01 +01:00
  • 2ba32ccc73 Merge branch 'master' into programming Nadine Ganz 2025-03-27 14:46:27 +01:00
  • fe36775a1b Merge branch 'leveldesign' Nadine Ganz 2025-03-27 14:42:10 +01:00
  • 171763e3ba Update XR Hands, add custom gesture, add feature to skip intro in 1.0 SBB Nadine Ganz 2025-03-27 14:40:43 +01:00
  • 026995ca06 Geschaeft Update Dominik Gut 2025-03-27 10:48:09 +01:00
  • bda97c2583 Destroy textures when slideshow is finished Nadine Ganz 2025-03-26 15:02:50 +01:00
  • c97ccef80c Add function to rotate XR Origin, add rotations in BT Nadine Ganz 2025-03-26 13:30:49 +01:00
  • a8ff9dcf22 Add videos to Im_Grotto_Essen Nadine Ganz 2025-03-25 17:22:16 +01:00
  • 34862ea67d Geschaeft Update Dominik Gut 2025-03-24 07:53:48 +01:00
  • 72d14de335 Merge branch 'programming' Nadine Ganz 2025-03-18 17:23:48 +01:00
  • cdee6ca4f5 Add ParticleTrigger for parmesan, fixes (Schneidebrett, Pilze, Handmenu) Nadine Ganz 2025-03-18 17:22:36 +01:00
  • e50e4ba9a6 Update checkmarks + rotation of teller, add videos Nadine Ganz 2025-03-17 17:41:47 +01:00
  • 53e30e174f Merge branch 'master' into programming Nadine Ganz 2025-03-17 16:51:19 +01:00
  • 1ef77c49aa Grotto Update OHNE 3.2-Grotto (Parmesan, Rezept-Grafik und Checkmarks, Teller (hatten ein falsches Meshcollider-Mesh), Zusammen_Kochen.5.Kueche.png, Videos (hast Du schon separat erhalten), + deren PNGs) Dominik Gut 2025-03-17 16:44:48 +01:00
  • 0b91b07a67 Merge branch 'master' into leveldesign Dominik Gut 2025-03-17 16:31:20 +01:00
  • 13e9747346 Merge branch 'programming' Nadine Ganz 2025-03-17 16:23:06 +01:00
  • 9e9c878a4f Merge branch 'leveldesign' into programming Nadine Ganz 2025-03-17 15:53:09 +01:00
  • 80ca7b22c6 Revert "Grotto Update (Parmesan, Rezept-Grafik und Checkmarks, Teller (hatten ein falsches Meshcollider-Mesh), Zusammen_Kochen.5.Kueche.png, Videos (hast Du schon separat erhalten), + deren PNGs)" Dominik Gut 2025-03-17 15:46:47 +01:00
  • a3bffa85b6 Made Glas Wasser readable for liquids Nadine Ganz 2025-03-17 14:51:18 +01:00
  • 0c5218d7ed Grotto Update (Parmesan, Rezept-Grafik und Checkmarks, Teller (hatten ein falsches Meshcollider-Mesh), Zusammen_Kochen.5.Kueche.png, Videos (hast Du schon separat erhalten), + deren PNGs) Dominik Gut 2025-03-17 14:42:35 +01:00
  • e1941e5322 Add Speech Alarm audio to handmenu; hide Idle Nonna Video in 3.2 Nadine Ganz 2025-03-17 14:39:02 +01:00
  • d6151b0008 Update fmod banks Nadine Ganz 2025-03-17 10:21:06 +01:00
  • 341d3a19dc Add more videos and checkmarks to 3.2 Nadine Ganz 2025-03-14 17:22:38 +01:00
  • eb98e5278e Add Particles Trigger for liquids (Wein, Bouillon), fix rotation of Salz+Pfeffer Socket Nadine Ganz 2025-03-14 16:03:04 +01:00
  • 6d983533e1 Merge branch 'leveldesign' into programming Nadine Ganz 2025-03-14 14:03:20 +01:00
  • 8dcd04656c Update Grotto Fluids (Wein, Bouillon + Reis) + Checkmarks Dominik Gut 2025-03-14 12:09:44 +01:00
  • 06682d352c Add Kuechen Videos Nadine Ganz 2025-03-13 17:47:40 +01:00
  • 292120f265 Merge branch 'leveldesign' into programming Nadine Ganz 2025-03-13 15:38:28 +01:00
  • 0d70d1f04a Updatae Grotto Flüssigkeiten Dominik Gut 2025-03-13 15:20:37 +01:00
  • 84854d4290 Merge branch 'master' into leveldesign Dominik Gut 2025-03-11 15:39:46 +01:00
  • 0a227ddee8 Korrekturen 3.0-SBB (videosphere + static objects) + Photos file extensions Dominik Gut 2025-03-11 15:35:44 +01:00
  • 059b92b063 Finished Zwiebeln schneiden, Add all physics layers to controllers + hands Nadine Ganz 2025-03-11 15:05:08 +01:00
  • 40f7978682 Update fmod banks Nadine Ganz 2025-03-11 09:50:25 +01:00
  • 3a28c19bc1 Integrate Zwiebeln schneiden in 3.2 (wip) Nadine Ganz 2025-03-10 19:42:58 +01:00
  • 8fe605216c Add NamedParticle for detecting liquid particles in pan Nadine Ganz 2025-03-10 16:20:34 +01:00
  • 536bbbe217 Merge branch 'master' into leveldesign Dominik Gut 2025-03-07 17:55:35 +01:00
  • 68cb452973 Android SDK Update to Level 34 Dominik Gut 2025-03-07 17:46:46 +01:00
  • de10219b74 Update 3.2 Nadine Ganz 2025-03-07 17:37:10 +01:00
  • b5e85b30ec Merge branch 'leveldesign' Nadine Ganz 2025-03-07 17:20:16 +01:00
  • 5275a1560b Merge branch 'programming' Nadine Ganz 2025-03-07 17:13:54 +01:00
  • 3899960b5c Fix memory bug in looping videos Nadine Ganz 2025-03-07 17:13:21 +01:00
  • 636a5f0d4c Fluids implemented (olivenoel + kochtopf) Dominik Gut 2025-03-07 16:56:41 +01:00
  • 2b8fab7d24 Update slideshows 3.1 + 3.5 Nadine Ganz 2025-03-07 15:58:31 +01:00
  • dd45a2900f Add Idle Loop in SBB, change NamedDepthkitPlayer for handling looping videos Nadine Ganz 2025-03-07 14:27:58 +01:00