Merge branch 'programming'

Shorten Idle Loop Francesca in Grotto Essen, add Speisekarte for Francesca
Merge branch 'master' into programming
2025-10-20 19:50:03 +02:00 · 2025-10-20 19:49:22 +02:00 · 2025-10-20 18:34:12 +02:00
2 changed files with 645 additions and 523 deletions
--- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt
+++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt
@ -63,7 +63,7 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
        BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")

        BTC.Show("GO.HINTS.SitDownHint")
-        BTC.Wait(5)
+        BTC.Wait(3)
        BTC.Hide("GO.HINTS.SitDownHint")
        BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
        BTC.Run("MediaPlayer.VIDEOS.IntroF2")
--- a/Viagg-io/Assets/Scenes/3.2-Grotto3.unity
+++ b/Viagg-io/Assets/Scenes/3.2-Grotto3.unity
Author	SHA1	Message	Date
Nadine Ganz	4f6ab12e97	Merge branch 'programming'	2025-10-20 19:50:03 +02:00
Nadine Ganz	73699c8a25	Shorten Idle Loop Francesca in Grotto Essen, add Speisekarte for Francesca	2025-10-20 19:49:22 +02:00
Nadine Ganz	90b1cea47c	Merge branch 'master' into programming	2025-10-20 18:34:12 +02:00