Commit Graph

203 Commits

Author SHA1 Message Date
d9426499ae fox idle with all transforms 2025-06-18 14:12:23 +02:00
f51d71a3fd mom fox talking animation thumb fix 2025-06-18 13:54:04 +02:00
7272c6a8b7 mom fox talking animation with all transforms 2025-06-18 13:45:40 +02:00
7f66a55e51 mom fox talking animation 2025-06-18 13:43:42 +02:00
3775df7115 mom fox idle animation 2025-06-18 13:29:53 +02:00
Xaver
8ab888334a Hand Animation 2025-06-18 13:26:13 +02:00
4529cdce02 fox talking animation 2025-06-18 12:00:17 +02:00
Florian
6f3db8bbf9 Merge remote-tracking branch 'origin/main' 2025-06-18 11:56:38 +02:00
Florian
bef43e2c98 UI sounds added to mainmenu scene 2025-06-18 11:56:26 +02:00
Xaver
1fce8903c7 Merge remote-tracking branch 'origin/main' 2025-06-18 11:43:59 +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
033d260d26 prefab colliders 2025-06-18 11:38:15 +02:00
158c5d64cf fox walking animation 2025-06-18 10:52:33 +02:00
Xaver
5f50ca7f8e faster talk 2025-06-18 10:40:56 +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
47f549b1b1 TypeSound on CameraHolder Prefab 2025-06-18 10:30:18 +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
AgentSchmisch
29bb16f901 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-18 09:58:43 +02:00
AgentSchmisch
af7e6f40d9 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-18 09:56:10 +02:00
Xaver
6c690177c0 fixes 2025-06-18 09:56:04 +02:00
AgentSchmisch
6f19e025f9 edit stick to be saveable 2025-06-18 09:53:15 +02:00
Xaver
1903523be2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Scripts/Player/PlayerInteraction.cs
2025-06-18 09:52:09 +02:00
Xaver
463529633a baker talking bug fix on talk and rotated levels 2025-06-18 09:50:57 +02:00
Florian
77a1b194b4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu
2025-06-18 09:49:44 +02:00
Florian
99403fdb08 DialogManager has sound event 2025-06-18 09:48:07 +02:00
AgentSchmisch
eb79eb37ae added TwigInteraction 2025-06-18 09:36:09 +02:00
AgentSchmisch
ae0137770d Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-18 09:17:11 +02:00
AgentSchmisch
9f48b79907 updated PlayerInteraction 2025-06-18 09:11:23 +02:00
4ae5858dd8 Merge remote-tracking branch 'origin/main' 2025-06-17 23:46:07 +02:00
8fad765964 started walking animation 2025-06-17 23:46:03 +02:00
e208a0dc07 Merge remote-tracking branch 'origin/main' 2025-06-17 23:11:48 +02:00
6d6c88a8af wind+better dialog+reorganization 2025-06-17 23:11:42 +02:00
73ca7a522d fox idle animation 2025-06-17 23:01:15 +02:00
Xaver
3e8481d6ea tried some stuff 2025-06-17 21:38:14 +02:00
Xaver
2870632864 Merge remote-tracking branch 'origin/main' 2025-06-17 18:24:15 +02:00
Xaver
f999361fe2 build err fix 2025-06-17 18:24:05 +02:00
Florian
4dd6e7bf2c Beach, forest, garden, market Sounds are in structured Folder in Scenes 2025-06-17 18:10:38 +02:00
Florian
3bbf488f32 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Scenes/Beach.unity
2025-06-17 18:04:33 +02:00
Florian
e4b8b81b9a Beach Sound File Structure in Unity 2025-06-17 18:03:33 +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
Florian
fb17260213 Merge remote-tracking branch 'origin/main' 2025-06-17 16:14:30 +02:00