Commit Graph

47 Commits

Author SHA1 Message Date
Xaver
f72f5d9d73 idk 2025-06-18 14:56:34 +02:00
Xaver
8ab888334a Hand Animation 2025-06-18 13:26:13 +02:00
Xaver
033d260d26 prefab colliders 2025-06-18 11:38:15 +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
6f19e025f9 edit stick to be saveable 2025-06-18 09:53:15 +02:00
AgentSchmisch
eb79eb37ae added TwigInteraction 2025-06-18 09:36:09 +02:00
6d6c88a8af wind+better dialog+reorganization 2025-06-17 23:11:42 +02:00
Xaver
6b2bdb510e push 2025-06-17 18:01:40 +02:00
Xaver
8977018353 inviswalls and colliders 2025-06-17 17:44:17 +02:00
Xaver
9d1c1e2abf garden 2025-06-17 16:13:08 +02:00
Xaver
aca1ef7298 nicer switching 2025-06-17 15:52:47 +02:00
Xaver
0f14c069aa Beach Scene House fix + Scene Switch Prefab Beautified 2025-06-17 14:34:01 +02:00
AgentSchmisch
72d6a08df3 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-17 14:25:33 +02:00
AgentSchmisch
ae9fd8a087 added SceneSwitcher 2025-06-17 14:19:55 +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
Xaver
eb1a9aa8bd changed some weird stuff 2025-06-16 10:21:46 +02:00
Xaver
88c084dea8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-16 10:06:02 +02:00
Xaver
d17b3a4a1e forest 2025-06-16 10:04:38 +02:00
AgentSchmisch
2c9aca5cb6 updated MarketStands 2025-06-16 07:10:06 +02:00
AgentSchmisch
3f5f40832b added FoxHouse 2025-06-13 18:41:42 +02:00
AgentSchmisch
6725663da7 added DialogContainer, finished DialogSystem 2025-06-13 17:15:00 +02:00
Florian
b6816602ed Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-13 16:04:07 +02:00
Florian
31fe3972bf Market with Sound 2025-06-13 16:00:09 +02:00
Xaver
7b4e435220 beacer,json+beaver+forest 2025-06-13 15:17:42 +02:00
Xaver
12f0274894 market 0.5 2025-06-13 11:13:07 +02:00
AgentSchmisch
9fbcf3d566 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-13 10:14:01 +02:00
AgentSchmisch
14110da522 🎨 created Prefabs, finished BushInteraction 2025-06-13 10:13:53 +02:00
Xaver
109d0ac3fb idk 2025-06-13 10:00:53 +02:00
Xaver
a8fcab2fc6 animations 2025-06-12 21:56:02 +02:00
Florian
8e53bf0d16 Everything works 2025-06-12 19:30:41 +02:00
AgentSchmisch
1753fd9ef1 Scripts 2025-06-12 16:04:22 +02:00
Xaver
d3df9e4b3b dialog builder 3.0 2025-06-12 16:24:01 +02:00
Xaver
5796ff1ad3 Beach 2025-06-12 15:00:21 +02:00
Xaver
292390b28c wheres my ac 2025-06-11 15:36:54 +02:00
Xaver
8f09d10b36 terrain draft 2025-06-10 16:13:48 +02:00