Commit Graph

163 Commits (6b3a0069a33323634ffb91790c89d9e814654fd6)

Author SHA1 Message Date
Dominik Gut a1b3171ea0 Update Test Scene Grotto (interactables sounds assignments corrected, interactables in own folder, materials with gpu instancing, camera occlusion, and more minor changes) 2025-01-28 22:28:14 +01:00
Nadine Ganz 9a35dae878 Update 3.2 story 2025-01-27 17:31:53 +01:00
Nadine Ganz 51b58383f5 Update Next buttons 2025-01-27 16:13:40 +01:00
Nadine Ganz be178e4478 Updated 3.2 Grotto story 2025-01-27 14:58:23 +01:00
Nadine Ganz d133d306e9 Update 3.5 Scene 2025-01-27 10:41:35 +01:00
Dominik Gut b041ab728f Materialien und Texturen konsolidiert (ganze blocking-Objectszenen wie Grotto, Laden, etc. wurden in den Importeinstellungen OHNE Materialimport eingestellt. Das kann zu weissen oder fehlenden Materialien auf diesen Objekten führen.) 2025-01-24 10:43:25 +01:00
Dominik Gut c1e68a68f0 Transfer 3.2-Grotto --> Test-Scene-Grotto (wip) 2025-01-23 10:06:20 +01:00
Nadine Ganz e61d80f2aa Handling speech errors 2025-01-22 15:45:15 +01:00
Nadine Ganz 2bb1202530 Update SpeechPackage 2025-01-22 13:33:28 +01:00
Dominik Gut ed7c9b24e8 Merge branch 'leveldesign' 2025-01-21 17:00:13 +01:00
Dominik Gut 1f5cae44d2 Grotto_v2 importsettings 2025-01-21 16:58:11 +01:00
Dominik Gut f254593d57 update Grotto leveldesign with lightmapping 2025-01-21 14:44:20 +01:00
Nadine Ganz 2ae3489c8f Add italian alternative sentences for story B 2025-01-20 16:56:42 +01:00
Dominik Gut 12a3ea2d6d update Grotto leveldesign wip 2025-01-18 23:12:00 +01:00
Nadine Ganz 01eb01a0d9 Transitions in story B 2025-01-17 17:26:41 +01:00
Nadine Ganz 4154304e96 Implemented 3.0 SBB 2025-01-16 17:31:46 +01:00
Nadine Ganz 62e667bd8e Implemented 1.0-SBB Intro 2025-01-16 16:15:09 +01:00
Nadine Ganz be9c3c5033 Update fmod banks 2025-01-15 11:36:10 +01:00
Dominik Gut 0848f5072d update Grotto leveldesign wip 2025-01-15 10:51:44 +01:00
Nadine Ganz 121de1df33 Merge commit 'e404ec8d5dbce74693d231ff719733573dab716a' 2025-01-15 09:45:10 +01:00
Dominik Gut e404ec8d5d update grotto prefabs 2025-01-10 15:12:01 +01:00
Dominik Gut dbc718c004 update train with floor and wall coliders 2025-01-10 15:10:48 +01:00
Nadine Ganz 428d7a1e0b Merge commit '73bc53619d9bc822f99df75068fe022973d1d1c3' 2025-01-10 11:34:01 +01:00
Dominik Gut 73bc53619d Update train colliders on interactables 2025-01-10 11:29:16 +01:00
Nadine Ganz 7a66f72aa8 Add SetParameter function in NamedStudioEventEmitter 2025-01-08 21:05:50 +01:00
Nadine Ganz 75d6785dc6 Stirring sound in grotto kitchen 2025-01-08 21:05:21 +01:00
Nadine Ganz 6128ae9982 Sounds and Ambi in Grotto Kueche + Essen 2025-01-08 14:14:55 +01:00
Nadine Ganz ab3345b106 Add Start + Stop looping sounds in NamedStudioEventEmitter 2025-01-08 14:14:10 +01:00
Nadine Ganz 2540747b86 Update Audio Grotto Kueche + Essen 2025-01-07 17:33:31 +01:00
Nadine Ganz 56f7eb0408 Add ChangeEvent() in FMOD Studio Event Emitter 2025-01-07 17:32:47 +01:00
Nadine Ganz 71fd8daad5 Update FMOD Banks 2025-01-07 17:32:16 +01:00
Dominik Gut f42bc18967 all Train scenes updated 2025-01-07 16:34:10 +01:00
Dominik Gut 9c70c30e1a Grotto Update 2025-01-07 15:20:11 +01:00
Dominik Gut 0bd29b6ca9 Train Update 2025-01-07 15:19:25 +01:00
Dominik Gut 7d6632c39c Train Update 2025-01-05 15:49:14 +01:00
Nadine Ganz 5de8652d62 Implemented Zwiebeln braten sound 2024-12-16 20:19:12 +01:00
Dominik Gut 87bf8a4fcb Start 2024-12-16 15:46:51 +01:00
Nadine Ganz 3e78857cdf BT FMOD function for looping sounds 2024-12-12 18:54:11 +01:00
Nadine Ganz 2fee855ece Grotto Kueche Socket Interaction 2024-12-10 19:50:53 +01:00
Nadine Ganz bf06480ab9 New version of SBB, updated SBB BT script 2024-12-10 10:54:15 +01:00
Nadine Ganz b5f24f5f68 Further implemented kitchen story and added audio 2024-12-05 17:35:06 +01:00
Nadine Ganz 01b3c4bf6b Grotto Story further implemented 2024-12-04 17:23:07 +01:00
Nadine Ganz 286ee2a59c Adapted Grotto BT to updated speech functions; add intents to german file 2024-11-28 17:24:33 +01:00
Nadine Ganz 869cb6a102 Updated FMOD Banks, add Audio scripts for grabbing + snaping 2024-11-28 16:48:25 +01:00
Nadine Ganz cfe8a86425 Reorganice gameobjects in grotto scene 2024-11-25 15:36:03 +01:00
Nadine Ganz 75d9662c08 Add audio and set language to IT 2024-11-21 21:29:58 +01:00
Nadine Ganz 3742a69a40 Add start of dialogue for demo 2024-11-20 21:02:10 +01:00
Nadine Ganz 3107aceb63 Add dialogue and interaction for demo 2024-11-19 21:45:47 +01:00
Nadine Ganz 675c57251d Add new Grotto Model and FMOD Banks 2024-11-15 20:24:44 +01:00
Nadine Ganz 22f560ceaf Update FMOD 2024-11-13 17:30:09 +01:00
Nadine Ganz 1930966955 Handling multiple sentences for one Intent ID; add json with intents 2024-11-12 20:26:38 +01:00
Nadine Ganz e307804713 BT Script Zwischenversion 2024-11-11 18:50:07 +01:00
Nadine Ganz 363812947a Fixes grotto scene 2024-11-08 17:29:50 +01:00
Nadine Ganz 7f170b31d1 Viagg-io/Assets/Plugins/FMOD/Cache/Editor.meta gelöscht 2024-10-23 16:34:20 +02:00
Nadine Ganz 6edb6a9ce5 Viagg-io/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset.meta gelöscht 2024-10-23 16:34:04 +02:00
Nadine Ganz 8220cbf289 Viagg-io/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset gelöscht 2024-10-23 16:33:59 +02:00
Nadine Ganz 3c3c4beb5c Add new 3D models of SBB and Grotto, deleted old ones 2024-10-23 16:23:44 +02:00
Nadine Ganz 4abcd80a5a SBB Enable Hand interaction 2024-10-18 17:09:00 +02:00
Nadine Ganz 13b8828e02 Add FMOD package 2024-10-18 16:04:50 +02:00
Nadine Ganz 6072f839ea Add new Grotto + SBB models 2024-10-14 17:16:44 +02:00
Nadine Ganz 0e84fcdd7c Intro scene SBB: handling speech input 2024-10-04 17:08:47 +02:00
Nadine Ganz 1524064f0b Add new version of afca package 2024-10-03 17:33:48 +02:00
Nadine Ganz ce2e67c5c0 Deactivated plants in grotto scene 2024-10-03 16:40:52 +02:00
Nadine Ganz 2d1aa51825 Beginning 1.0 SBB Introduction 2024-09-26 16:59:42 +02:00
Nadine Ganz 1ec43f1676 Bug Fixing in grotto kitchen scene 2024-09-24 17:33:08 +02:00
Nadine Ganz 2c3f796138 BT function for aborting events; Controller Input Handler for Speech 2024-09-23 17:11:21 +02:00
Nadine Ganz cf3ff5a5d1 Grotto scene added speech intents 2024-09-19 17:27:15 +02:00
Nadine Ganz eafeee13c5 Add SetSpeechRecognitionLanguage and InitializeSpeechManager functions 2024-09-18 16:48:09 +02:00
Nadine Ganz 9806af358f Speech Output Functions for BT 2024-09-17 17:10:28 +02:00
Nadine Ganz e6d0accd34 Intent Recognizer Function for clearing Intent dictionary 2024-09-17 14:44:02 +02:00
Nadine Ganz 2a0e72ec07 SpeechInput Features for BT implemented 2024-09-17 14:18:12 +02:00
Nadine Ganz 25116cb8ff Add ViaggioAI Package and BTC Tasks for Speech Handling 2024-09-16 20:37:29 +02:00
Nadine Ganz 47baa001ad Grotto Kapitel Parmigiano + AVPro Test Package 2024-09-05 16:43:17 +02:00
Nadine Ganz 1f7a3befdb Changes in BT Grotto kitchen, changed handlers 2024-08-21 17:15:24 +02:00
Nadine Ganz 90c7327946 Grotto Kitchen BT changes 2024-08-15 17:23:58 +02:00
Nadine Ganz ecd1404c29 Add select exit event handling 2024-08-14 17:33:21 +02:00
Nadine Ganz 87f398cac3 Add NamedSocketEvent, changed Grotto scene and BT 2024-08-12 14:16:00 +02:00
Nadine Ganz 8412807f4f Add Depthkit AVPro Package, add Graphy, deleted old Grotto model, changed Testscene 2024-08-12 10:44:53 +02:00
Nadine Ganz a2fc2e3f65 Add Sockets to grotto scene 2024-08-02 16:38:48 +02:00
Nadine Ganz dddf94aa0b Add Outline shader and NamedOutline Handler 2024-07-31 17:24:16 +02:00
Nadine Ganz c826479cc2 Worked on grotto kitchen scene 2024-07-30 17:25:03 +02:00
Nadine Ganz b7270fc07f New model for grotto, changed BT of grotto 2024-07-25 17:19:11 +02:00
Nadine Ganz 9a15e63d5e Added Depthkit Test Material 2024-07-24 17:17:14 +02:00
Nadine Ganz c821663849 Changed BT Script for scene 3.2 2024-07-19 19:56:36 +02:00
Nadine Ganz bef4508973 Add NamedGrabEvent Handler, modify NamedCollider, add dummy items 2024-07-17 17:51:49 +02:00
Nadine Ganz 0a54a65393 Beginning BT for Grotto kitchen scene 2024-07-17 10:56:22 +02:00
Nadine Ganz 0f161cc7fe Integrate hand tracking in Grotto Scene 2024-07-15 17:12:41 +02:00
Nadine Ganz e2a9832c80 Preview image of screenshot in handmenu 2024-07-15 15:55:13 +02:00
Nadine Ganz 5c49ff27bc Add screenshot feature as button in hand menu and controller grip button 2024-06-21 17:11:07 +02:00
Nadine Ganz d9060e6dc8 Add HandMenu 2024-06-19 14:45:01 +02:00
Nadine Ganz 83888ae7fa Add kitchen items to scene, made them grabbable 2024-06-18 13:42:28 +02:00
Nadine Ganz aec8429559 Hand Tracking Test Scene 2024-06-17 14:41:00 +02:00
Nadine Ganz e56b3e3d95 Add Unity XR Hands 2024-06-14 16:44:57 +02:00
Nadine Ganz 9226d51d15 Add scene loading with controller 2024-06-05 19:13:35 +02:00
Nadine Ganz 465dca9550 Added missing scenes 2024-06-05 16:23:48 +02:00
Nadine Ganz 66ad5d9e10 UI and button click functions for scene loading 2024-06-03 17:24:15 +02:00
Nadine Ganz 50eaf8804a Beginning UI for Scene loading 2024-05-24 16:28:16 +02:00
Nadine Ganz d7d9b00b27 Saved TestScene 2024-05-15 15:02:26 +02:00
Nadine Ganz b5dece3456 Made prefab for depthkit samples 2024-05-15 14:35:08 +02:00
Nadine Ganz d373f6d402 Working on Depthkit samples 2024-05-15 13:18:09 +02:00