74 Commits

Author SHA1 Message Date
c0aeff4c33 Merge commit 'e8168d67747a31dba6d0a19946d4d23aec63dd14' 2025-04-10 17:24:20 +02:00
Dominik Gut
e8168d6774 Chatbot Timelines 2025-04-10 15:26:53 +02:00
Dominik Gut
7478b5e928 Chatbot 2025-04-10 09:37:37 +02:00
aadb3c3622 Add menu button to Handmenu 2025-04-09 16:48:14 +02:00
Dominik Gut
23eaae33d8 Scene 0.0-Menu added 2025-04-08 16:57:01 +02:00
3e50d37694 Castello story 2025-04-04 17:24:59 +02:00
Dominik Gut
54e7d7d532 Merge branch 'master' into leveldesign 2025-04-03 13:47:45 +02:00
9ed948fe1a Update 2.2 und 3.2 2025-04-03 12:00:28 +02:00
Dominik Gut
d705c17000 Castello Update 2025-04-03 02:10:54 +02:00
Dominik Gut
4a51a65f92 Baeckerei Update 2025-04-01 10:57:11 +02:00
Dominik Gut
2ec156cd26 Geschaeft Update 2025-03-28 20:41:32 +01:00
3dafa55b8f Setup scene 2.0 + 2.1 2025-03-28 11:36:40 +01:00
2ba32ccc73 Merge branch 'master' into programming 2025-03-27 14:46:27 +01:00
171763e3ba Update XR Hands, add custom gesture, add feature to skip intro in 1.0 SBB 2025-03-27 14:40:43 +01:00
Dominik Gut
026995ca06 Geschaeft Update 2025-03-27 10:48:09 +01:00
c97ccef80c Add function to rotate XR Origin, add rotations in BT 2025-03-26 13:30:49 +01:00
a8ff9dcf22 Add videos to Im_Grotto_Essen 2025-03-25 17:22:16 +01:00
Dominik Gut
34862ea67d Geschaeft Update 2025-03-24 07:53:48 +01:00
cdee6ca4f5 Add ParticleTrigger for parmesan, fixes (Schneidebrett, Pilze, Handmenu) 2025-03-18 17:22:36 +01:00
Dominik Gut
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) 2025-03-17 16:44:48 +01:00
e1941e5322 Add Speech Alarm audio to handmenu; hide Idle Nonna Video in 3.2 2025-03-17 14:39:02 +01:00
d6151b0008 Update fmod banks 2025-03-17 10:21:06 +01:00
Dominik Gut
8dcd04656c Update Grotto Fluids (Wein, Bouillon + Reis) + Checkmarks 2025-03-14 12:09:44 +01:00
Dominik Gut
0d70d1f04a Updatae Grotto Flüssigkeiten 2025-03-13 15:20:37 +01:00
Dominik Gut
636a5f0d4c Fluids implemented (olivenoel + kochtopf) 2025-03-07 16:56:41 +01:00
Dominik Gut
4e7f2271c2 Grotto update (trees, lighting, background) + SBB video-background 2025-03-06 17:59:49 +01:00
81f5c02933 Merge commit 'b4e5cd0204e2093cbd57712e7b234b55af671531' 2025-03-05 17:50:24 +01:00
Dominik Gut
ad3c8687c1 new Depthkits 4/4 2025-03-05 17:29:12 +01:00
3ea44e476f Update Handmenu: add audio, (de)activate buttons in BT 2025-03-05 13:45:15 +01:00
Dominik Gut
d098275f47 Merge branch 'master' into leveldesign
# Conflicts:
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset
2025-02-17 15:56:06 +01:00
caca42663e Update FMOD Banks + Story 2025-02-17 14:50:15 +01:00
Dominik Gut
ce3bc5abe9 Test-Scene with new Prefabs (Gerichte, Getränke, Topfuntersetzer, Tazzin, Pfeffer und Salz) 2025-02-14 14:16:11 +01:00
Dominik Gut
fc0b04739f model-warnings corrected + lightmap corrections 2025-02-14 11:37:25 +01:00
8321b89e0c Update Grotto story Parmigiano 2025-02-12 11:27:08 +01:00
c55e456702 Handmenu: make Screenshot without rendering hands + smartphone; fix positioning 2025-02-11 11:57:17 +01:00
Dominik Gut
d482d4244c Zwiebeln schneiden (Test-Scene-Nick2) 2025-02-06 14:20:52 +01:00
Dominik Gut
4daec2ac0b _HANDMENU new 2025-02-06 07:33:52 +01:00
Dominik Gut
088ac2e78c _Handmenu testings 2025-02-04 16:39:11 +01:00
Dominik Gut
de02e91fec update Test-Scene-Grotto (interactables, sockets, colliders, lighting) 2025-02-04 11:59:00 +01:00
c0379fb11a Merge branch 'leveldesign'
# Conflicts:
#	Viagg-io/Assets/Resources/BuildDateTime.txt
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset
2025-01-31 14:16:12 +01:00
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
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
Dominik Gut
ed7c9b24e8 Merge branch 'leveldesign' 2025-01-21 17:00:13 +01:00
Dominik Gut
f254593d57 update Grotto leveldesign with lightmapping 2025-01-21 14:44:20 +01:00
Dominik Gut
12a3ea2d6d update Grotto leveldesign wip 2025-01-18 23:12:00 +01:00
4154304e96 Implemented 3.0 SBB 2025-01-16 17:31:46 +01:00
Dominik Gut
0848f5072d update Grotto leveldesign wip 2025-01-15 10:51:44 +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