Florian
|
2e55548530
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# blueberryPeak/Assets/Materials/Material.mat.meta
# blueberryPeak/Assets/Textures/FoxHouse.meta
# blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
|
2025-06-16 10:28:48 +02:00 |
|
Florian
|
e3f39057f8
|
Market and beach with steps Sound
|
2025-06-16 10:26:32 +02:00 |
|
Xaver
|
b27982de01
|
Merge remote-tracking branch 'origin/main'
|
2025-06-16 10:21:52 +02:00 |
|
Xaver
|
eb1a9aa8bd
|
changed some weird stuff
|
2025-06-16 10:21:46 +02:00 |
|
Florian
|
0319e8e99d
|
Merge remote-tracking branch 'origin/main'
|
2025-06-16 10:09:42 +02:00 |
|
Florian
|
2d634f7560
|
Merge remote-tracking branch 'origin/main'
|
2025-06-16 10:09:03 +02:00 |
|
Florian
|
ae505cadad
|
for the merge
|
2025-06-16 10:08:51 +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 |
|
|
|
da63ca32f0
|
added textured models: apples, diamonds, fish + Filled market stands with products
|
2025-06-16 00:27:02 +02:00 |
|
AgentSchmisch
|
3f5f40832b
|
✨ added FoxHouse
|
2025-06-13 18:41:42 +02:00 |
|
|
|
71b6b8831a
|
fixed x6 fox house
|
2025-06-13 18:21:54 +02:00 |
|
|
|
7bd80ddbf0
|
fixed x5 fox house
|
2025-06-13 18:13:47 +02:00 |
|
|
|
90a58258ac
|
fixed x4 fox house
|
2025-06-13 18:10:11 +02:00 |
|
|
|
0508a55ba4
|
fixed x3 fox house
|
2025-06-13 17:59:59 +02:00 |
|
|
|
745eaae804
|
fixed x2 fox house
|
2025-06-13 17:54:18 +02:00 |
|
|
|
bc1676fb49
|
fixed fox house
|
2025-06-13 17:47:22 +02:00 |
|
|
|
086b8773e7
|
Textured fox house
|
2025-06-13 17:39:51 +02:00 |
|
AgentSchmisch
|
6725663da7
|
✨ added DialogContainer, finished DialogSystem
|
2025-06-13 17:15:00 +02:00 |
|
AgentSchmisch
|
7828020734
|
Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4
|
2025-06-13 16:46:56 +02:00 |
|
AgentSchmisch
|
6a51629359
|
✨ Updated dialogbuilder to make speaker names bold
|
2025-06-13 16:39:38 +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
|
d71df2437e
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 15:17:55 +02:00 |
|
Xaver
|
7b4e435220
|
beacer,json+beaver+forest
|
2025-06-13 15:17:42 +02:00 |
|
Florian
|
0922973442
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 13:37:42 +02:00 |
|
Florian
|
9a1f2ded67
|
Background Music added to BeachScene
|
2025-06-13 13:37:27 +02:00 |
|
|
|
8f4a194e10
|
bakery with window
|
2025-06-13 12:26:33 +02:00 |
|
|
|
25ad8395e4
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 12:18:44 +02:00 |
|
|
|
5c13fd3585
|
bakery fully textured
|
2025-06-13 12:18:35 +02:00 |
|
Xaver
|
d25991420e
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 11:13:44 +02:00 |
|
Xaver
|
12f0274894
|
market 0.5
|
2025-06-13 11:13:07 +02:00 |
|
Florian
|
4a8b19f344
|
Berry & Bush sounds in wwise
|
2025-06-13 11:09:41 +02:00 |
|
Florian
|
a58288893b
|
Berry and Bush sounds
|
2025-06-13 11:08:15 +02:00 |
|
Florian
|
01a5a487e8
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 11:05:56 +02:00 |
|
Florian
|
57306c498d
|
StepSound for player, beach Scene sound updated
|
2025-06-13 11:05:22 +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 |
|
|
|
c414b2f906
|
same blue market stand
|
2025-06-13 10:09:11 +02:00 |
|
Florian
|
6103868ef1
|
Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4
|
2025-06-13 10:03:12 +02:00 |
|
Xaver
|
512e86a53c
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 10:01:01 +02:00 |
|
Xaver
|
109d0ac3fb
|
idk
|
2025-06-13 10:00:53 +02:00 |
|
Florian
|
406fd59dff
|
Merge remote-tracking branch 'origin/main'
|
2025-06-13 09:58:19 +02:00 |
|
Florian
|
92456c0e59
|
beach scene unneccessary commit (but git wants it)
|
2025-06-13 09:58:10 +02:00 |
|
|
|
1acb19bcee
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 22:06:32 +02:00 |
|
|
|
584e49d9cb
|
Not fully textured bakery
|
2025-06-12 22:06:27 +02:00 |
|
Xaver
|
e8793a122b
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# blender/Models/Fox_Animation.fbx
|
2025-06-12 21:56:32 +02:00 |
|
Xaver
|
a8fcab2fc6
|
animations
|
2025-06-12 21:56:02 +02:00 |
|
|
|
c225b6b881
|
Fbx fox
|
2025-06-12 19:55:47 +02:00 |
|
