Commit Graph

Select branches

Hide Pull Requests

PerformanceV2

btc_debug

depthkit_samples

dev

interaction

leveldesign

master

programming

scene_loading

story_process

Mono Color

• 00fb913e2a Merge branch 'programming' master leveldesign Nadine Ganz 2025-10-06 14:55:07 +02:00
• 1bb7e3fcbc Update to Unity Version 2022.3.62f2 to fix security issue programming Nadine Ganz 2025-10-06 14:54:33 +02:00
• 17fc82bb53 Merge branch 'master' into programming Nadine Ganz 2025-10-02 11:40:39 +02:00
• 49bf5cf247 Merge ''leveldesign' Nadine Ganz 2025-10-02 11:40:24 +02:00
• 8bca921f4f Korrekturen (Zug: 2 different still background images, hint text changed; Castello: text on slideshow corrected) Dominik Gut 2025-09-26 14:22:12 +02:00
• 543fb05123 Merge branch 'programming' Nadine Ganz 2025-09-20 19:33:57 +02:00
• ffcc78bdad Update speech package, rename button handmenu Nadine Ganz 2025-09-20 19:27:26 +02:00
• 3e10e2ace2 Add context in italien to chatbot Nadine Ganz 2025-09-20 16:44:14 +02:00
• 5eab66c402 Merge branch 'master' into programming Nadine Ganz 2025-09-20 16:29:50 +02:00
• d6add2f7ce Merge leveldesign Nadine Ganz 2025-09-20 16:29:23 +02:00
• 778dc0ee64 Handmenu prefab (added level Valposchiavo) Dominik Gut 2025-09-18 10:23:01 +02:00
• f1f260197a smaller corrections (castello mountains holes corrected and camera far plane adjusted, sbb background static image added, typo on menucard, tazzin upscaled) Dominik Gut 2025-09-17 19:20:36 +02:00
• 9508b84297 0.0-Menu corrections (pointing-note, menu-position lowered, valposchiavo-button renamed) Dominik Gut 2025-09-17 14:03:26 +02:00
• 88241c2c81 DepthKit-Test from Neu-Dreh Dominik Gut 2025-09-17 13:59:54 +02:00
• ca7a3e87f2 Merge branch 'programming' Nadine Ganz 2025-09-05 15:57:24 +02:00
• 3958dba5ba Add error handling for conversation, add start sound speech intent Nadine Ganz 2025-09-05 15:56:44 +02:00
• 2cce77e5ef Add KI-Chatbot Feature Nadine Ganz 2025-09-04 17:30:35 +02:00
• 7500481bb3 Update speech package Nadine Ganz 2025-09-04 12:01:13 +02:00
• 6fce2e22a7 Merge branch 'programming' Nadine Ganz 2025-09-03 13:47:36 +02:00
• eb2f9f68bc Optimize Speech Button Interaction in Handmenu Nadine Ganz 2025-09-03 13:46:39 +02:00
• 1ad2581cfe Add Puschlav to Menu, update sentence from Castello Bot Nadine Ganz 2025-09-03 10:55:46 +02:00
• 42e98ae3d8 Merge branch 'programming' Nadine Ganz 2025-08-14 19:36:51 +02:00
• 4fd3670a52 Fixes Nadine Ganz 2025-08-14 19:34:00 +02:00
• 958f87624b Merge branch 'programming' Nadine Ganz 2025-08-13 15:24:49 +02:00
• 79cbcc5a08 Update sounds; add missing Enrico Idle Nadine Ganz 2025-08-13 11:32:58 +02:00
• 47df6586e0 Add Anim Door Baeckerei - Enrico left; fix bugs Nadine Ganz 2025-08-11 17:48:02 +02:00
• 7cf10f27dc Add title to Puschlav, change BT-LoadImage to wait until img is fully loaded Nadine Ganz 2025-08-11 15:53:34 +02:00
• e519f33126 Merge branch 'master' into programming Nadine Ganz 2025-08-07 15:45:16 +02:00
• 2afb513811 Merge leveldesign Nadine Ganz 2025-08-07 15:44:03 +02:00
• 4e59be9031 Merge branch 'master' into leveldesign Dominik Gut 2025-08-06 20:57:39 +02:00
• 6ae34d8561 Grotto Update (Giuseppina scale and position) Dominik Gut 2025-08-06 20:55:30 +02:00
• 468ca0847a Merge branch 'master' into programming Nadine Ganz 2025-08-06 19:20:25 +02:00
• c1f1598cec Merge leveldesign Nadine Ganz 2025-08-06 19:19:48 +02:00
• eeecf0df22 Merge branch 'master' into leveldesign Dominik Gut 2025-08-06 19:15:26 +02:00
• 148562ea3c Baeckerei Update (videos scaled and rebaked occlusion) Dominik Gut 2025-08-06 19:10:57 +02:00
• bd6f7fd233 Grotto Videos Update (phone screen added and alpha mask corrected) Dominik Gut 2025-08-06 18:57:12 +02:00
• bc0aa14da6 Revert "Grotto Videos Update (added smartphone screen)" Dominik Gut 2025-08-06 18:23:13 +02:00
• 93cd0746ec Grotto Videos Update (added smartphone screen) Dominik Gut 2025-08-06 18:20:54 +02:00
• 2199681d3b Baeckerei Videos Update (correction audio and faulty videos) Dominik Gut 2025-08-06 18:20:08 +02:00
• 4c8dcefbab Merge branch 'programming' Nadine Ganz 2025-08-06 17:44:50 +02:00
• a0931e6d3e Fix position in grotto1 Nadine Ganz 2025-08-06 17:43:56 +02:00
• 0755ed60ac Add handling of speech errors Nadine Ganz 2025-08-06 16:17:00 +02:00
• 911bcbbcab Merge branch 'programming' Nadine Ganz 2025-08-06 12:07:47 +02:00
• 97863be2c5 Delete fade effect between SBBs, fix user position+handmenu in Baeckerei Outro Nadine Ganz 2025-08-06 12:07:04 +02:00
• 79f94399cb Add Hints to Story A Track Nadine Ganz 2025-08-06 10:28:19 +02:00
• 3ef821fdac Merge branch 'programming' Nadine Ganz 2025-08-05 22:17:46 +02:00
• c1e189daeb Add hints to SBB + Grotto, fixes Nadine Ganz 2025-08-05 22:16:48 +02:00
• ea35981ed8 Merge branch 'master' into programming Nadine Ganz 2025-08-05 15:47:05 +02:00
• 737eda3e30 Merge branch 'programming' Nadine Ganz 2025-08-05 15:46:20 +02:00
• b06bdc7973 Merge leveldesign Nadine Ganz 2025-08-05 15:45:58 +02:00
• 34df427885 Add routing from Puschlav; clean up SBB Scenes Nadine Ganz 2025-08-05 15:42:46 +02:00
• 89ba62605a Grotto1: Clean up, add loading of minigame Nadine Ganz 2025-08-05 14:31:42 +02:00
• c8587fdbbd Update Kueche_Abbruch in Grotto2+Grotto1 Nadine Ganz 2025-08-05 14:14:55 +02:00
• 727e33f5e3 Merge branch 'master' into leveldesign Dominik Gut 2025-08-05 13:51:56 +02:00
• 4d0aa99499 Grotto2: Cleanup, add Outline, add Speak Hint Nadine Ganz 2025-08-05 13:17:27 +02:00
• 8812c7fcac Grotto Videos (Kueche-Outro) downscaled Dominik Gut 2025-08-05 11:57:27 +02:00
• 908bf78228 Castello Update (video size + chatbot color) Dominik Gut 2025-08-05 10:10:38 +02:00
• dba07ca889 Merge branch 'master' into programming Nadine Ganz 2025-08-05 09:39:30 +02:00
• 6607a68991 Merge commit '2d774b79142cb2377132de6baf2223813e767d79' Nadine Ganz 2025-08-05 09:39:13 +02:00
• 2d774b7914 Grotto2 Update (GO positions) Dominik Gut 2025-08-05 09:26:37 +02:00
• ef17908e08 Merge branch 'programming' Nadine Ganz 2025-08-04 21:14:02 +02:00
• c72a2212dc Change layer in direct interactor to everything Nadine Ganz 2025-08-04 21:13:23 +02:00
• 153e1255a4 Merge branch 'master' into programming Nadine Ganz 2025-08-04 20:49:16 +02:00
• 5ee344eada Merge leveldesign Nadine Ganz 2025-08-04 20:48:49 +02:00
• 5280c12017 Merge branch 'programming' Nadine Ganz 2025-08-04 20:48:17 +02:00
• 33fc13e908 Update speech intents Nadine Ganz 2025-08-04 20:44:21 +02:00
• ac004ea0ac Add hints to Castello Nadine Ganz 2025-08-04 19:59:56 +02:00
• a1d8081fdb Grotto1+3 Update (Video positions rotations scales) Dominik Gut 2025-08-04 18:22:05 +02:00
• 3850273faf Fix Chatbot Button and animation, add NamedPokeEvent Nadine Ganz 2025-08-04 17:41:41 +02:00
• 8c2f5d4a51 Grotto1-3 Update (Video positions and scales, camera occlusion) + Handmenu-Shift Dominik Gut 2025-08-04 17:25:16 +02:00
• 664c3a0326 Update Castello, add Keystore Nadine Ganz 2025-08-04 16:37:18 +02:00
• 59e31a8292 Grotto3 rebaked camera occlusion Dominik Gut 2025-08-04 13:25:41 +02:00
• 156d1ba169 Videos Grotto3 Outro scaled down Dominik Gut 2025-08-04 13:21:45 +02:00
• 095b6532b9 Merge branch 'master' into programming Nadine Ganz 2025-07-31 17:09:51 +02:00
• 50b20756e4 Merge leveldesign Nadine Ganz 2025-07-31 17:09:16 +02:00
• ea82367a8c Merge branch 'programming' Nadine Ganz 2025-07-31 17:07:48 +02:00
• 018c8bcbfe Update Grotto 3: Bestellung_Essen, Grotto_Unterhaltung, Outro Nadine Ganz 2025-07-31 16:56:58 +02:00
• 397ed32831 Castello Update (videos added + sitting-mesh improved) Dominik Gut 2025-07-31 12:27:03 +02:00
• 1b15624a17 Grotto1 Update (Unterbau Grotto-Haus + Postprocessing MainCamera + Papierset-Collider) Dominik Gut 2025-07-31 10:19:44 +02:00
• 0bcd7a0c5c Castello Update (chatbot-source-cone scaled to zero) + sponsoren-panel Update Dominik Gut 2025-07-31 09:45:17 +02:00
• 53d5536158 Update HANDMENU positions in Tutorial and SBB Dominik Gut 2025-07-31 09:40:15 +02:00
• 5ad72468dd Merge branch 'master' into programming Nadine Ganz 2025-07-31 09:29:26 +02:00
• 682225dc41 Merge leveldesign Nadine Ganz 2025-07-31 09:28:47 +02:00
• 8ce40e7cc1 Merge branch 'programming' Nadine Ganz 2025-07-31 09:22:10 +02:00
• 0a53f52643 Baeckerei Update (Handmenu-Text, Pos+Scale Videos, LookAt script activated + invert option added, Lightmap) Dominik Gut 2025-07-30 21:06:01 +02:00
• 7a3b65f45a Update Grotto3 Intro + Bestellung_Getraenke Nadine Ganz 2025-07-30 20:49:46 +02:00
• 440e95b048 Merge branch 'master' into leveldesign Dominik Gut 2025-07-30 14:35:29 +02:00
• 5c089603dd Baeckerei Update (Steintextur + chatbot-source-cone scaled down) Dominik Gut 2025-07-30 14:33:24 +02:00
• 92fc58577e Replace 1-9099.JPG, deactivate Intro GOs when starting slideshow Nadine Ganz 2025-07-30 12:05:01 +02:00
• a1d3637479 Rename first Button in Menu and change link to 1.0-SBB Nadine Ganz 2025-07-30 11:51:13 +02:00
• 8499759e8d Merge branch 'master' into programming Nadine Ganz 2025-07-30 11:37:10 +02:00
• c100f60768 Merge leveldesign Nadine Ganz 2025-07-30 11:36:41 +02:00
• 642d604758 Merge branch 'programming' Nadine Ganz 2025-07-30 11:36:10 +02:00
• 8e19b86b0e Replace Cavaglia Bahnhof Sound, make Puschlav Sounds louder Nadine Ganz 2025-07-30 11:28:18 +02:00
• e2619b5392 SBB-Levels Update (XR-Rig-Position, Video-Scaling, Rucksack-Scaling, Karte-Scaling, Lightmaps, Train-UVs) Dominik Gut 2025-07-30 10:55:45 +02:00
• 70eb084316 Slideshow Intro added Dominik Gut 2025-07-30 08:15:47 +02:00
• b70551584b Update User Intents Nadine Ganz 2025-07-29 17:49:46 +02:00
• 95fa4e39d1 Merge branch 'master' into programming Nadine Ganz 2025-07-29 15:37:01 +02:00
• e8cabbe7ee Merge branch leveldesign Nadine Ganz 2025-07-29 15:36:18 +02:00
• 8c646c916e Merge branch 'programming' Nadine Ganz 2025-07-29 15:35:33 +02:00