ccl4/blueberryPeak/Assets
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
..
HDRPDefaultResources Npc Action.txt, NpcAction Sound, Wwise Integration of most sounds 2025-06-12 13:43:49 +02:00
Materials dialog builder 3.0 2025-06-12 16:24:01 +02:00
Models dialog builder 3.0 2025-06-12 16:24:01 +02:00
Prefabs dialog builder 3.0 2025-06-12 16:24:01 +02:00
QuickOutline wheres my ac 2025-06-11 15:36:54 +02:00
Scenes dialog builder 3.0 2025-06-12 16:24:01 +02:00
Scripts map + dialog builder 2025-06-11 11:23:52 +02:00
Settings pixelation filter 2025-06-10 10:55:47 +02:00
Shaders audio listener off 2025-06-12 15:50:30 +02:00
StreamingAssets actually no clue why I need to commit rn 2025-06-12 16:32:19 +02:00
Terrain Beach 2025-06-12 15:00:21 +02:00
Textures dialog builder 3.0 2025-06-12 16:24:01 +02:00
Wwise audio listener off 2025-06-12 15:50:30 +02:00
HDRPDefaultResources.meta Npc Action.txt, NpcAction Sound, Wwise Integration of most sounds 2025-06-12 13:43:49 +02:00
InputSystem_Actions.inputactions test 2025-06-09 20:55:49 +02:00
InputSystem_Actions.inputactions.meta test 2025-06-09 20:55:49 +02:00
Materials.meta test 2025-06-09 20:55:49 +02:00
Models.meta terrain draft 2025-06-10 16:13:48 +02:00
Prefabs.meta terrain draft 2025-06-10 16:13:48 +02:00
QuickOutline.meta wheres my ac 2025-06-11 15:36:54 +02:00
Scenes.meta test 2025-06-09 20:55:49 +02:00
Scripts.meta pixelation filter 2025-06-10 10:55:47 +02:00
Settings.meta test 2025-06-09 20:55:49 +02:00
Shaders.meta test 2025-06-09 20:55:49 +02:00
StreamingAssets.meta music, ocean and wwise integration 2025-06-12 10:36:40 +02:00
Terrain.meta terrain draft 2025-06-10 16:13:48 +02:00
Textures.meta terrain draft 2025-06-10 16:13:48 +02:00
Wwise.meta music, ocean and wwise integration 2025-06-12 10:36:40 +02:00
WwiseSettings.xml audio listener off 2025-06-12 15:50:30 +02:00
WwiseSettings.xml.meta music, ocean and wwise integration 2025-06-12 10:36:40 +02:00