Xaver
|
5f50ca7f8e
|
faster talk
|
2025-06-18 10:40:56 +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 |
|
|
|
6d6c88a8af
|
wind+better dialog+reorganization
|
2025-06-17 23:11:42 +02:00 |
|
