|
|
fd294f60c3
|
Merge branch 'leveldesign'
|
2025-04-01 11:48:38 +02:00 |
|
Dominik Gut
|
4a51a65f92
|
Baeckerei Update
|
2025-04-01 10:57:11 +02:00 |
|
Dominik Gut
|
740eec6ac9
|
Baeckerei-Update Video-Metafiles
|
2025-04-01 10:40:57 +02:00 |
|
|
|
c932ce1e77
|
Merge branch 'leveldesign'
|
2025-04-01 10:02:59 +02:00 |
|
Dominik Gut
|
2ec156cd26
|
Geschaeft Update
|
2025-03-28 20:41:32 +01:00 |
|
Dominik Gut
|
ca710ba569
|
Merge branch 'master' into leveldesign
|
2025-03-28 20:32:55 +01:00 |
|
Dominik Gut
|
413f1f4969
|
Baeckerei-Videos
|
2025-03-28 20:18:11 +01:00 |
|
|
|
40a9ee122c
|
Merge branch 'programming'
|
2025-03-28 17:28:46 +01:00 |
|
|
|
74932b5828
|
Implement Ablauf Baeckerei
|
2025-03-28 17:27:33 +01:00 |
|
|
|
3dafa55b8f
|
Setup scene 2.0 + 2.1
|
2025-03-28 11:36:40 +01:00 |
|
Dominik Gut
|
3199d330a7
|
Replace Grotto-Videos "Nachfrage...4, 16, 22, 23"
|
2025-03-27 15:18:36 +01:00 |
|
|
|
b0cafc61f9
|
Merge branch 'programming'
|
2025-03-27 14:55:01 +01:00 |
|
|
|
2ba32ccc73
|
Merge branch 'master' into programming
|
2025-03-27 14:46:27 +01:00 |
|
|
|
fe36775a1b
|
Merge branch 'leveldesign'
|
2025-03-27 14:42:10 +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 |
|
|
|
bda97c2583
|
Destroy textures when slideshow is finished
|
2025-03-26 15:02:50 +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 |
|
|
|
72d14de335
|
Merge branch 'programming'
|
2025-03-18 17:23:48 +01:00 |
|
|
|
cdee6ca4f5
|
Add ParticleTrigger for parmesan, fixes (Schneidebrett, Pilze, Handmenu)
|
2025-03-18 17:22:36 +01:00 |
|
|
|
e50e4ba9a6
|
Update checkmarks + rotation of teller, add videos
|
2025-03-17 17:41:47 +01:00 |
|
|
|
53e30e174f
|
Merge branch 'master' into programming
|
2025-03-17 16:51:19 +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 |
|
Dominik Gut
|
0b91b07a67
|
Merge branch 'master' into leveldesign
# Conflicts:
# Viagg-io/Assets/Scenes/3.2-Grotto.unity
|
2025-03-17 16:31:20 +01:00 |
|
|
|
13e9747346
|
Merge branch 'programming'
|
2025-03-17 16:23:06 +01:00 |
|
|
|
9e9c878a4f
|
Merge branch 'leveldesign' into programming
# Conflicts:
# Viagg-io/Assets/Scenes/3.2-Grotto.unity
|
2025-03-17 15:53:09 +01:00 |
|
Dominik Gut
|
80ca7b22c6
|
Revert "Grotto Update (Parmesan, Rezept-Grafik und Checkmarks, Teller (hatten ein falsches Meshcollider-Mesh), Zusammen_Kochen.5.Kueche.png, Videos (hast Du schon separat erhalten), + deren PNGs)"
This reverts commit 0c5218d7ed9ec1f0dbd8eae1adc7cebce7b7a816.
|
2025-03-17 15:46:47 +01:00 |
|
|
|
a3bffa85b6
|
Made Glas Wasser readable for liquids
|
2025-03-17 14:51:18 +01:00 |
|
Dominik Gut
|
0c5218d7ed
|
Grotto Update (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 14:42:35 +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 |
|
|
|
341d3a19dc
|
Add more videos and checkmarks to 3.2
|
2025-03-14 17:22:38 +01:00 |
|
|
|
eb98e5278e
|
Add Particles Trigger for liquids (Wein, Bouillon), fix rotation of Salz+Pfeffer Socket
|
2025-03-14 16:03:04 +01:00 |
|
|
|
6d983533e1
|
Merge branch 'leveldesign' into programming
|
2025-03-14 14:03:20 +01:00 |
|
Dominik Gut
|
8dcd04656c
|
Update Grotto Fluids (Wein, Bouillon + Reis) + Checkmarks
|
2025-03-14 12:09:44 +01:00 |
|
|
|
06682d352c
|
Add Kuechen Videos
|
2025-03-13 17:47:40 +01:00 |
|
|
|
292120f265
|
Merge branch 'leveldesign' into programming
|
2025-03-13 15:38:28 +01:00 |
|
Dominik Gut
|
0d70d1f04a
|
Updatae Grotto Flüssigkeiten
|
2025-03-13 15:20:37 +01:00 |
|
Dominik Gut
|
84854d4290
|
Merge branch 'master' into leveldesign
|
2025-03-11 15:39:46 +01:00 |
|
Dominik Gut
|
0a227ddee8
|
Korrekturen 3.0-SBB (videosphere + static objects) + Photos file extensions
|
2025-03-11 15:35:44 +01:00 |
|
|
|
059b92b063
|
Finished Zwiebeln schneiden, Add all physics layers to controllers + hands
|
2025-03-11 15:05:08 +01:00 |
|
|
|
40f7978682
|
Update fmod banks
|
2025-03-11 09:50:25 +01:00 |
|
|
|
3a28c19bc1
|
Integrate Zwiebeln schneiden in 3.2 (wip)
|
2025-03-10 19:42:58 +01:00 |
|
|
|
8fe605216c
|
Add NamedParticle for detecting liquid particles in pan
|
2025-03-10 16:20:34 +01:00 |
|
Dominik Gut
|
536bbbe217
|
Merge branch 'master' into leveldesign
# Conflicts:
# Viagg-io/ProjectSettings/EditorBuildSettings.asset
|
2025-03-07 17:55:35 +01:00 |
|
Dominik Gut
|
68cb452973
|
Android SDK Update to Level 34
|
2025-03-07 17:46:46 +01:00 |
|
|
|
de10219b74
|
Update 3.2
|
2025-03-07 17:37:10 +01:00 |
|
|
|
b5e85b30ec
|
Merge branch 'leveldesign'
|
2025-03-07 17:20:16 +01:00 |
|
