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 |
|
Florian
|
cdb0ef2a3b
|
safety
|
2025-06-16 10:29:56 +02:00 |
|
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 |
|
