|
|
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 |
|
|
|
5275a1560b
|
Merge branch 'programming'
|
2025-03-07 17:13:54 +01:00 |
|
|
|
3899960b5c
|
Fix memory bug in looping videos
|
2025-03-07 17:13:21 +01:00 |
|
Dominik Gut
|
636a5f0d4c
|
Fluids implemented (olivenoel + kochtopf)
|
2025-03-07 16:56:41 +01:00 |
|
|
|
2b8fab7d24
|
Update slideshows 3.1 + 3.5
|
2025-03-07 15:58:31 +01:00 |
|
|
|
dd45a2900f
|
Add Idle Loop in SBB, change NamedDepthkitPlayer for handling looping videos
|
2025-03-07 14:27:58 +01:00 |
|
|
|
52832e5b5a
|
Add Idle nonna in 3.2 Scene
|
2025-03-07 13:28:59 +01:00 |
|
|
|
850f0a0dba
|
Merge commit '5538a347c8a19855b0a755bacff1dfb30e1c7f37' into programming
|
2025-03-07 13:10:03 +01:00 |
|
Dominik Gut
|
5538a347c8
|
Grotto Francesca Nonna phone idle loop
|
2025-03-07 13:04:29 +01:00 |
|
|
|
ed07e593ce
|
Merge branch 'master' into programming
|
2025-03-07 12:02:20 +01:00 |
|
|
|
d360d02fce
|
Merge branch 'leveldesign'
|
2025-03-07 12:01:38 +01:00 |
|
|
|
14e9ad9bad
|
Merge branch 'programming'
|
2025-03-07 12:00:28 +01:00 |
|
|
|
1f4b43f782
|
Add videos to grotto intro
|
2025-03-07 11:58:52 +01:00 |
|
Dominik Gut
|
c408ec556d
|
Merge remote-tracking branch 'origin/programming' into leveldesign
|
2025-03-07 11:22:44 +01:00 |
|
|
|
79d7330753
|
Merge branch 'master' into programming
|
2025-03-07 09:37:15 +01:00 |
|
|
|
a3b4907e48
|
Merge branch 'leveldesign'
|
2025-03-07 09:36:26 +01:00 |
|
Dominik Gut
|
c1065ffda4
|
SBB Francesca book idle loop
|
2025-03-07 06:15:03 +01:00 |
|
Dominik Gut
|
4e7f2271c2
|
Grotto update (trees, lighting, background) + SBB video-background
|
2025-03-06 17:59:49 +01:00 |
|
|
|
cdef186ec6
|
Merge branch 'programming'
|
2025-03-06 17:46:11 +01:00 |
|
|
|
99b8e3ae7b
|
Add videos in 3.0 SBB
|
2025-03-06 17:45:08 +01:00 |
|
|
|
0dd798319e
|
Update videos in 1.0 SBB
|
2025-03-06 16:22:16 +01:00 |
|
