Commit Graph

225 Commits

Author SHA1 Message Date
62cc8782a8 fish animations 2025-06-19 22:09:03 +02:00
0d9594b48f deer animations 2025-06-19 21:25:40 +02:00
26e1d6d213 beaver animations 2025-06-19 20:42:44 +02:00
Xaver
f86abb3997 fix 2025-06-19 19:44:07 +02:00
Xaver
f9daf36d1c char anim 2025-06-19 19:27:36 +02:00
AgentSchmisch
fb3fefc267 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-19 01:07:46 +02:00
AgentSchmisch
3f66591822 Save state across scenes & finished Quest interactions 2025-06-19 01:07:40 +02:00
7f3cc47d69 textured cake model 2025-06-19 00:54:25 +02:00
2fc7d5061b beaver rigged, but rigify is messed up 2025-06-18 19:04:07 +02:00
4b3691fc6f bird animations 2025-06-18 18:43:24 +02:00
Xaver
ac2b89a5ff Squirrel Working 2025-06-18 17:38:50 +02:00
f21737f819 squirrel animations 2025-06-18 17:33:00 +02:00
Xaver
194fb96498 talk it like i walk it 2025-06-18 16:00:24 +02:00
9d138c54a8 Merge remote-tracking branch 'origin/main' 2025-06-18 15:32:17 +02:00
1150709ddb fox and mom fox combined animations 2025-06-18 15:32:11 +02:00
Xaver
03b4129c96 Merge remote-tracking branch 'origin/main' 2025-06-18 14:58:45 +02:00
Xaver
07e40c7824 . 2025-06-18 14:58:37 +02:00
Xaver
f72f5d9d73 idk 2025-06-18 14:56:34 +02:00
b3b9b385d1 Merge remote-tracking branch 'origin/main' 2025-06-18 14:55:57 +02:00
1163a1bff6 all fox animations in one file 2025-06-18 14:55:51 +02:00
Florian
892b0fd246 Merge remote-tracking branch 'origin/main' 2025-06-18 14:15:35 +02:00
Florian
a0bf148b2c Garden SceneChanger 2025-06-18 14:15:16 +02:00
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