AgentSchmisch
|
8b14797adc
|
Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4
|
2025-06-17 15:41:08 +02:00 |
|
AgentSchmisch
|
483eeb54a8
|
✨ fixed issues in PlayerInteraction & PlayerMovement
|
2025-06-17 15:33:25 +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
|
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
|
80ba81f219
|
Old Wind removed
|
2025-06-17 11:11:50 +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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
9144907a10
|
ANGST
|
2025-06-12 18:45:34 +02:00 |
|
Florian
|
856df114f2
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 18:11:10 +02:00 |
|
Florian
|
aeccf7094b
|
Beach Scene sound (1/2)
|
2025-06-12 18:10:58 +02:00 |
|
Florian
|
44d41c7a68
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# blueberryPeak/Assets/StreamingAssets/Audio/GeneratedSoundBanks/ProjectInfo.json.meta
# blueberryPeak/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h.meta
|
2025-06-12 16:34:36 +02:00 |
|
Florian
|
9dd21bdf53
|
actually no clue why I need to commit rn
|
2025-06-12 16:32:19 +02:00 |
|
Xaver
|
d3df9e4b3b
|
dialog builder 3.0
|
2025-06-12 16:24:01 +02:00 |
|
AgentSchmisch
|
1753fd9ef1
|
✨ Scripts
|
2025-06-12 16:04:22 +02:00 |
|
Xaver
|
444ef63d70
|
audio listener off
|
2025-06-12 15:50:30 +02:00 |
|
Xaver
|
00b80a8064
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 15:00:34 +02:00 |
|
Xaver
|
5796ff1ad3
|
Beach
|
2025-06-12 15:00:21 +02:00 |
|
Florian
|
ebcf101b32
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 13:44:00 +02:00 |
|
Florian
|
57b461e4da
|
Npc Action.txt, NpcAction Sound, Wwise Integration of most sounds
|
2025-06-12 13:43:49 +02:00 |
|
Florian Schmid
|
705c389dba
|
✨ removed old models
|
2025-06-12 13:14:11 +02:00 |
|
Florian
|
334626de2f
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 10:38:28 +02:00 |
|
Florian
|
66d0f2b47c
|
music, ocean and wwise integration
|
2025-06-12 10:36:40 +02:00 |
|
Xaver
|
292390b28c
|
wheres my ac
|
2025-06-11 15:36:54 +02:00 |
|
Xaver
|
82161e3f5b
|
map + dialog builder
|
2025-06-11 11:23:52 +02:00 |
|
Xaver
|
8f09d10b36
|
terrain draft
|
2025-06-10 16:13:48 +02:00 |
|
Xaver
|
ef7093617c
|
water shader
|
2025-06-10 12:39:20 +02:00 |
|
Xaver
|
03f73195ce
|
restructure
|
2025-06-10 11:03:38 +02:00 |
|
Xaver
|
7e643f0704
|
pixelation filter
|
2025-06-10 10:55:47 +02:00 |
|
Xaver
|
194da95e6f
|
shader triplanar
|
2025-06-10 09:40:10 +02:00 |
|
|
|
1be26dc178
|
test
|
2025-06-09 20:55:49 +02:00 |
|
