Commit Graph

79 Commits

Author SHA1 Message Date
Xaver
f9daf36d1c char anim 2025-06-19 19:27:36 +02:00
AgentSchmisch
3f66591822 Save state across scenes & finished Quest interactions 2025-06-19 01:07:40 +02:00
Xaver
ac2b89a5ff Squirrel Working 2025-06-18 17:38:50 +02:00
Xaver
194fb96498 talk it like i walk it 2025-06-18 16:00:24 +02:00
Xaver
07e40c7824 . 2025-06-18 14:58:37 +02:00
Xaver
f72f5d9d73 idk 2025-06-18 14:56:34 +02:00
Xaver
8ab888334a Hand Animation 2025-06-18 13:26:13 +02:00
Florian
bef43e2c98 UI sounds added to mainmenu scene 2025-06-18 11:56:26 +02:00
Florian
177586801c Merge remote-tracking branch 'origin/main' 2025-06-18 11:42:02 +02:00
Florian
7119ea46bf Peak wind and music 2025-06-18 11:41:29 +02:00
Xaver
05380a3060 main menu 2025-06-18 10:32:34 +02:00
Xaver
f8c9f6d50a Merge remote-tracking branch 'origin/main' 2025-06-18 10:31:04 +02:00
Xaver
72f5ac7941 Main Menu 2025-06-18 10:30:42 +02:00
Florian
b268752b0c Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-18 10:24:02 +02:00
Florian
6c1e5d826e StickPickUp Sound 2025-06-18 10:22:01 +02:00
Xaver
6c690177c0 fixes 2025-06-18 09:56:04 +02:00
Xaver
463529633a baker talking bug fix on talk and rotated levels 2025-06-18 09:50:57 +02:00
6d6c88a8af wind+better dialog+reorganization 2025-06-17 23:11:42 +02:00
Xaver
3e8481d6ea tried some stuff 2025-06-17 21:38:14 +02:00
Florian
4dd6e7bf2c Beach, forest, garden, market Sounds are in structured Folder in Scenes 2025-06-17 18:10:38 +02:00
Xaver
4c1a1e3b84 Merge remote-tracking branch 'origin/main' 2025-06-17 18:02:28 +02:00
Xaver
6b2bdb510e push 2025-06-17 18:01:40 +02:00
Florian
83266127c7 Gardening sound 2025-06-17 17:59:21 +02:00
Xaver
c665ae3082 Merge remote-tracking branch 'origin/main' 2025-06-17 17:44:26 +02:00
Xaver
8977018353 inviswalls and colliders 2025-06-17 17:44:17 +02:00
Florian
3168d261e5 Wind in Garden 2025-06-17 17:39:24 +02:00
Xaver
9d1c1e2abf garden 2025-06-17 16:13:08 +02:00
Xaver
c600908d1c fixed flo's foolish mistakes 2025-06-17 16:01:15 +02:00
Xaver
aca1ef7298 nicer switching 2025-06-17 15:52:47 +02:00
Florian
21423930ce Music Mix, Market with right soundBank 2025-06-17 15:28:51 +02:00
Xaver
78c8391c3c stuff idk 2025-06-17 15:19:46 +02:00
Xaver
a8923a343e SceneSwitch working :) 2025-06-17 15:02:22 +02:00
Florian
0a5cc619b6 Merge remote-tracking branch 'origin/main' 2025-06-17 14:56:19 +02:00
Florian
581ca8f7bc Potentially fixed wwise errors 2025-06-17 14:55:01 +02:00
Xaver
0f14c069aa Beach Scene House fix + Scene Switch Prefab Beautified 2025-06-17 14:34:01 +02:00
Florian
54d00a62e6 Merge remote-tracking branch 'origin/main' 2025-06-17 14:10:51 +02:00
Florian
77aa51400f BirdsSounds in wwise and much more :) 2025-06-17 14:10:23 +02:00
Xaver
cc52c25054 Merge remote-tracking branch 'origin/main' 2025-06-17 13:25:33 +02:00
Xaver
76cc17e446 stick and bober 2025-06-17 13:25:24 +02:00
Florian
73f4a7aa91 Fox Prefab with windscript, Wind in market 2025-06-17 11:10:18 +02:00
Florian
6cb1a8d6ad Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-16 16:41:52 +02:00
Florian
df3e077c55 Wind Sound in Market 2025-06-16 16:41:07 +02:00
Xaver
e0c86ec09d peak done 2025-06-16 14:19:02 +02:00
Xaver
b9c51dda26 Merge remote-tracking branch 'origin/main' 2025-06-16 11:40:03 +02:00
Xaver
43c4d547e8 market textures and garden scene 2025-06-16 11:39:57 +02:00
Florian
59ef777dda BirdSounds in market, Listener on Fox Prefab optimized 2025-06-16 11:21:56 +02:00
Florian
cdb0ef2a3b safety 2025-06-16 10:29:56 +02:00
Florian
2e55548530 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Materials/Material.mat.meta
#	blueberryPeak/Assets/Textures/FoxHouse.meta
#	blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-16 10:28:48 +02:00
Florian
e3f39057f8 Market and beach with steps Sound 2025-06-16 10:26:32 +02:00
Xaver
b27982de01 Merge remote-tracking branch 'origin/main' 2025-06-16 10:21:52 +02:00