Commit Graph

158 Commits

Author SHA1 Message Date
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
Florian
f373cbc258 random commit cause fork wants it (and im scared of fork/git) 2025-06-17 16:14:24 +02:00
Xaver
9d1c1e2abf garden 2025-06-17 16:13:08 +02:00
Xaver
181b18cc6a flo == "AgentSchmisch" 2025-06-17 16:03:38 +02:00
Xaver
c600908d1c fixed flo's foolish mistakes 2025-06-17 16:01:15 +02:00
Xaver
1b49b0dceb Merge remote-tracking branch 'origin/main' 2025-06-17 15:53:31 +02:00
Xaver
aca1ef7298 nicer switching 2025-06-17 15:52:47 +02:00
8bea500a08 textured squirrel 2025-06-17 15:49:06 +02:00
Florian
6a6a360ce3 idk 2025-06-17 15:32:56 +02:00
Florian
45f2ee871a snowSteps added to wwise 2025-06-17 15:32:40 +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
AgentSchmisch
72d6a08df3 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-17 14:25:33 +02:00
AgentSchmisch
4464383a4d altered BushInteraction.cs 2025-06-17 14:25:18 +02:00
AgentSchmisch
ae9fd8a087 added SceneSwitcher 2025-06-17 14:19:55 +02:00
Florian
1e68c0350c Merge remote-tracking branch 'origin/main' 2025-06-17 14:11:41 +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
fb055af381 Dialog 2025-06-17 14:05:38 +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
92f5491d49 textured fish character 2025-06-17 11:57:10 +02:00
d9f45dd791 Merge remote-tracking branch 'origin/main' 2025-06-17 11:25:17 +02:00
cf94886d44 textured bird, modifiers applied to deer 2025-06-17 11:25:05 +02:00
Florian
80ba81f219 Old Wind removed 2025-06-17 11:11:50 +02:00
Florian
60ce611813 Merge remote-tracking branch 'origin/main' 2025-06-17 11:10:38 +02:00
Florian
73f4a7aa91 Fox Prefab with windscript, Wind in market 2025-06-17 11:10:18 +02:00
Xaver
9c00a525f1 beaver xaxa 2025-06-17 10:46:41 +02:00
9f91322343 not textured bird 2025-06-16 23:44:44 +02:00
247ca0c7df textured deer 2025-06-16 20:20:15 +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
945a91abaa textured beaver 2025-06-16 15:16:55 +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