Commit Graph

74 Commits

Author SHA1 Message Date
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
7b4e435220 beacer,json+beaver+forest 2025-06-13 15:17:42 +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
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
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
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
5796ff1ad3 Beach 2025-06-12 15:00:21 +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
7e643f0704 pixelation filter 2025-06-10 10:55:47 +02:00
1be26dc178 test 2025-06-09 20:55:49 +02:00