 Nadine Ganz
|
4652e1c4f0
|
Fix merge conflict and add audio to Test Scene Grotto
|
2025-01-31 17:04:46 +01:00 |
|
Nadine Ganz
|
6710135c34
|
Merge branch 'master' into programming
# Conflicts:
# Viagg-io/Assets/Resources/BuildDateTime.txt
# Viagg-io/ProjectSettings/EditorBuildSettings.asset
|
2025-01-31 14:27:26 +01:00 |
|
Nadine Ganz
|
c0379fb11a
|
Merge branch 'leveldesign'
# Conflicts:
# Viagg-io/Assets/Resources/BuildDateTime.txt
# Viagg-io/ProjectSettings/EditorBuildSettings.asset
|
2025-01-31 14:16:12 +01:00 |
|
Nadine Ganz
|
54f8f9871d
|
Save status
|
2025-01-31 14:09:46 +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 |
|
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 |
|
Nadine Ganz
|
847dc17ccb
|
Merge branch 'programming'
|
2025-01-21 15:56:13 +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 |
|
Nadine Ganz
|
9fb35fc9b3
|
Merge branch 'programming'
|
2025-01-10 11:33:36 +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
|
2cbd840880
|
Merge branch 'dev'
|
2024-12-16 14:55:36 +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
|
8692f10e86
|
Merge branch 'dev'
|
2024-11-28 19:20:53 +01:00 |