Commit Graph

Select branches

Hide Pull Requests

btc_debug

depthkit_samples

dev

interaction

leveldesign

master

programming

scene_loading

story_process

Mono Color

• 1ea6211b8b Deactivate second oil + wine programming Nadine Ganz 2025-02-12 16:51:15 +0100
• 5af4d33d3b Story Grotto Essen bestellen Nadine Ganz 2025-02-12 15:09:05 +0100
• 99d1d4897f Update story grotto kueche outro Nadine Ganz 2025-02-12 13:57:35 +0100
• 8321b89e0c Update Grotto story Parmigiano Nadine Ganz 2025-02-12 11:27:08 +0100
• c55e456702 Handmenu: make Screenshot without rendering hands + smartphone; fix positioning Nadine Ganz 2025-02-11 11:57:17 +0100
• 3bec521669 Merge branch 'leveldesign' into programming Nadine Ganz 2025-02-10 13:30:15 +0100
• 3803f347ce Update FMOD banks and add plugin resonance master Nadine Ganz 2025-02-10 13:25:52 +0100
• d482d4244c Zwiebeln schneiden (Test-Scene-Nick2) leveldesign Dominik Gut 2025-02-06 14:20:52 +0100
• 4daec2ac0b _HANDMENU new Dominik Gut 2025-02-06 07:33:52 +0100
• b5f5a4e44c Merge remote-tracking branch 'origin/programming' into leveldesign Dominik Gut 2025-02-05 16:59:59 +0100
• 283c2b6962 Settings Nadine Ganz 2025-02-05 16:57:56 +0100
• 19ce56e75a Merge remote-tracking branch 'origin/programming' into leveldesign Dominik Gut 2025-02-05 16:28:38 +0100
• ffe0a61ead Rename "Test-Scene-Grotto" to "3.2-Grotto" Nadine Ganz 2025-02-05 16:12:40 +0100
• 8385329fa2 Grotto collider fixes Nadine Ganz 2025-02-05 16:04:27 +0100
• 503bc45102 Merge remote-tracking branch 'origin/programming' into leveldesign Dominik Gut 2025-02-05 15:45:26 +0100
• 131be78ed1 Grotto fixes Nadine Ganz 2025-02-05 14:49:48 +0100
• 545896b0b4 Grotto Sockets Positioning fixes Nadine Ganz 2025-02-05 14:16:26 +0100
• 15f570bb1d Merge branch 'master' into programming Nadine Ganz 2025-02-05 09:28:29 +0100
• 3892093844 update Grotto Lighting Settings Dominik Gut 2025-02-04 16:40:46 +0100
• 088ac2e78c _Handmenu testings Dominik Gut 2025-02-04 16:39:11 +0100
• de02e91fec update Test-Scene-Grotto (interactables, sockets, colliders, lighting) Dominik Gut 2025-02-04 11:59:00 +0100
• 4ca252568e Implementing story B kueche Nadine Ganz 2025-02-03 17:40:54 +0100
• 4652e1c4f0 Fix merge conflict and add audio to Test Scene Grotto Nadine Ganz 2025-01-31 17:04:46 +0100
• 6710135c34 Merge branch 'master' into programming Nadine Ganz 2025-01-31 14:27:26 +0100
• c0379fb11a Merge branch 'leveldesign' Nadine Ganz 2025-01-31 14:16:12 +0100
• 54f8f9871d Save status Nadine Ganz 2025-01-31 14:09:46 +0100
• a1b3171ea0 Update Test Scene Grotto (interactables sounds assignments corrected, interactables in own folder, materials with gpu instancing, camera occlusion, and more minor changes) Dominik Gut 2025-01-28 22:28:14 +0100
• 9a35dae878 Update 3.2 story Nadine Ganz 2025-01-27 17:31:53 +0100
• 51b58383f5 Update Next buttons Nadine Ganz 2025-01-27 16:13:40 +0100
• be178e4478 Updated 3.2 Grotto story Nadine Ganz 2025-01-27 14:58:23 +0100
• d133d306e9 Update 3.5 Scene Nadine Ganz 2025-01-27 10:41:35 +0100
• 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.) Dominik Gut 2025-01-24 10:43:25 +0100
• c1e68a68f0 Transfer 3.2-Grotto --> Test-Scene-Grotto (wip) Dominik Gut 2025-01-23 10:06:20 +0100
• e61d80f2aa Handling speech errors Nadine Ganz 2025-01-22 15:45:15 +0100
• 2bb1202530 Update SpeechPackage Nadine Ganz 2025-01-22 13:33:28 +0100
• ed7c9b24e8 Merge branch 'leveldesign' Dominik Gut 2025-01-21 17:00:13 +0100
• 1f5cae44d2 Grotto_v2 importsettings Dominik Gut 2025-01-21 16:58:11 +0100
• 847dc17ccb Merge branch 'programming' Nadine Ganz 2025-01-21 15:56:13 +0100
• f254593d57 update Grotto leveldesign with lightmapping Dominik Gut 2025-01-21 14:44:20 +0100
• 2ae3489c8f Add italian alternative sentences for story B Nadine Ganz 2025-01-20 16:56:42 +0100
• 12a3ea2d6d update Grotto leveldesign wip Dominik Gut 2025-01-18 23:12:00 +0100
• 01eb01a0d9 Transitions in story B Nadine Ganz 2025-01-17 17:26:41 +0100
• 4154304e96 Implemented 3.0 SBB Nadine Ganz 2025-01-16 17:31:46 +0100
• 62e667bd8e Implemented 1.0-SBB Intro Nadine Ganz 2025-01-16 16:15:09 +0100
• be9c3c5033 Update fmod banks Nadine Ganz 2025-01-15 11:36:10 +0100
• 0848f5072d update Grotto leveldesign wip Dominik Gut 2025-01-15 10:51:44 +0100
• 121de1df33 Merge commit 'e404ec8d5dbce74693d231ff719733573dab716a' Nadine Ganz 2025-01-15 09:45:10 +0100
• e404ec8d5d update grotto prefabs Dominik Gut 2025-01-10 15:12:01 +0100
• dbc718c004 update train with floor and wall coliders Dominik Gut 2025-01-10 15:10:48 +0100
• 428d7a1e0b Merge commit '73bc53619d9bc822f99df75068fe022973d1d1c3' Nadine Ganz 2025-01-10 11:34:01 +0100
• 9fb35fc9b3 Merge branch 'programming' Nadine Ganz 2025-01-10 11:33:36 +0100
• 73bc53619d Update train colliders on interactables Dominik Gut 2025-01-10 11:29:16 +0100
• 7a66f72aa8 Add SetParameter function in NamedStudioEventEmitter Nadine Ganz 2025-01-08 21:05:50 +0100
• 75d6785dc6 Stirring sound in grotto kitchen Nadine Ganz 2025-01-08 21:05:21 +0100
• 6128ae9982 Sounds and Ambi in Grotto Kueche + Essen Nadine Ganz 2025-01-08 14:14:55 +0100
• ab3345b106 Add Start + Stop looping sounds in NamedStudioEventEmitter Nadine Ganz 2025-01-08 14:14:10 +0100
• 2540747b86 Update Audio Grotto Kueche + Essen Nadine Ganz 2025-01-07 17:33:31 +0100
• 56f7eb0408 Add ChangeEvent() in FMOD Studio Event Emitter Nadine Ganz 2025-01-07 17:32:47 +0100
• 71fd8daad5 Update FMOD Banks Nadine Ganz 2025-01-07 17:32:16 +0100
• f42bc18967 all Train scenes updated Dominik Gut 2025-01-07 16:34:10 +0100
• 9c70c30e1a Grotto Update Dominik Gut 2025-01-07 15:20:11 +0100
• 0bd29b6ca9 Train Update Dominik Gut 2025-01-07 15:19:25 +0100
• 7d6632c39c Train Update Dominik Gut 2025-01-05 15:49:14 +0100
• 5de8652d62 Implemented Zwiebeln braten sound Nadine Ganz 2024-12-16 20:19:12 +0100
• 87bf8a4fcb Start Dominik Gut 2024-12-16 15:46:51 +0100
• 2cbd840880 Merge branch 'dev' Nadine Ganz 2024-12-16 14:55:36 +0100
• 3e78857cdf BT FMOD function for looping sounds dev Nadine Ganz 2024-12-12 18:54:11 +0100
• 2fee855ece Grotto Kueche Socket Interaction Nadine Ganz 2024-12-10 19:50:53 +0100
• bf06480ab9 New version of SBB, updated SBB BT script Nadine Ganz 2024-12-10 10:54:15 +0100
• b5f24f5f68 Further implemented kitchen story and added audio Nadine Ganz 2024-12-05 17:35:06 +0100
• 01b3c4bf6b Grotto Story further implemented Nadine Ganz 2024-12-04 17:23:07 +0100
• 8692f10e86 Merge branch 'dev' Nadine Ganz 2024-11-28 19:20:53 +0100
• 286ee2a59c Adapted Grotto BT to updated speech functions; add intents to german file Nadine Ganz 2024-11-28 17:24:33 +0100
• 869cb6a102 Updated FMOD Banks, add Audio scripts for grabbing + snaping Nadine Ganz 2024-11-28 16:48:25 +0100
• c9b4833543 Merge branch 'dev' Nadine Ganz 2024-11-25 16:56:09 +0100
• cfe8a86425 Reorganice gameobjects in grotto scene Nadine Ganz 2024-11-25 15:36:03 +0100
• 75d9662c08 Add audio and set language to IT Nadine Ganz 2024-11-21 21:29:58 +0100
• 3742a69a40 Add start of dialogue for demo Nadine Ganz 2024-11-20 21:02:10 +0100
• 3107aceb63 Add dialogue and interaction for demo Nadine Ganz 2024-11-19 21:45:47 +0100
• 675c57251d Add new Grotto Model and FMOD Banks Nadine Ganz 2024-11-15 20:24:44 +0100
• 22f560ceaf Update FMOD Nadine Ganz 2024-11-13 17:30:09 +0100
• 1930966955 Handling multiple sentences for one Intent ID; add json with intents Nadine Ganz 2024-11-12 20:26:38 +0100
• e307804713 BT Script Zwischenversion Nadine Ganz 2024-11-11 18:50:07 +0100
• 363812947a Fixes grotto scene Nadine Ganz 2024-11-08 17:29:50 +0100
• f0702dde0c Viagg-io/fmod_editor.log gelöscht Nadine Ganz 2024-10-23 16:35:36 +0200
• 7f170b31d1 Viagg-io/Assets/Plugins/FMOD/Cache/Editor.meta gelöscht Nadine Ganz 2024-10-23 16:34:20 +0200
• 6edb6a9ce5 Viagg-io/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset.meta gelöscht Nadine Ganz 2024-10-23 16:34:04 +0200
• 8220cbf289 Viagg-io/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset gelöscht Nadine Ganz 2024-10-23 16:33:59 +0200
• 3c3c4beb5c Add new 3D models of SBB and Grotto, deleted old ones Nadine Ganz 2024-10-23 16:23:44 +0200
• 4abcd80a5a SBB Enable Hand interaction Nadine Ganz 2024-10-18 17:09:00 +0200
• 13b8828e02 Add FMOD package Nadine Ganz 2024-10-18 16:04:50 +0200
• 6072f839ea Add new Grotto + SBB models Nadine Ganz 2024-10-14 17:16:44 +0200
• 0e84fcdd7c Intro scene SBB: handling speech input Nadine Ganz 2024-10-04 17:08:47 +0200
• 1524064f0b Add new version of afca package Nadine Ganz 2024-10-03 17:33:48 +0200
• 902b0c3794 Merge branch 'dev' Nadine Ganz 2024-10-03 16:43:51 +0200
• ce2e67c5c0 Deactivated plants in grotto scene Nadine Ganz 2024-10-03 16:40:52 +0200
• 2d1aa51825 Beginning 1.0 SBB Introduction Nadine Ganz 2024-09-26 16:59:42 +0200
• 1ec43f1676 Bug Fixing in grotto kitchen scene Nadine Ganz 2024-09-24 17:33:08 +0200
• 2c3f796138 BT function for aborting events; Controller Input Handler for Speech Nadine Ganz 2024-09-23 17:11:21 +0200
• cf3ff5a5d1 Grotto scene added speech intents Nadine Ganz 2024-09-19 17:27:15 +0200