ccl4/blueberryPeak/Assets
Florian 77a1b194b4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu
2025-06-18 09:49:44 +02:00
..
Animations animations 2025-06-12 21:56:02 +02:00
HDRPDefaultResources Npc Action.txt, NpcAction Sound, Wwise Integration of most sounds 2025-06-12 13:43:49 +02:00
Input added DialogContainer, finished DialogSystem 2025-06-13 17:15:00 +02:00
Materials wind+better dialog+reorganization 2025-06-17 23:11:42 +02:00
Models stick and bober 2025-06-17 13:25:24 +02:00
Prefabs added TwigInteraction 2025-06-18 09:36:09 +02:00
QuickOutline wheres my ac 2025-06-11 15:36:54 +02:00
Scenes wind+better dialog+reorganization 2025-06-17 23:11:42 +02:00
Scripts Merge remote-tracking branch 'origin/main' 2025-06-18 09:49:44 +02:00
Settings pixelation filter 2025-06-10 10:55:47 +02:00
Shaders market 0.5 2025-06-13 11:13:07 +02:00
StreamingAssets Gardening sound 2025-06-17 17:59:21 +02:00
TextMesh Pro added DialogContainer, finished DialogSystem 2025-06-13 17:15:00 +02:00
Textures peak done 2025-06-16 14:19:02 +02:00
Wwise DialogManager has sound event 2025-06-18 09:48:07 +02:00
Animations.meta animations 2025-06-12 21:56:02 +02:00
HDRPDefaultResources.meta Npc Action.txt, NpcAction Sound, Wwise Integration of most sounds 2025-06-12 13:43:49 +02:00
Input.meta Scripts 2025-06-12 16:04:22 +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
TextMesh Pro.meta added FoxHouse 2025-06-13 18:41:42 +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 Everything works 2025-06-12 19:30:41 +02:00
WwiseSettings.xml.meta music, ocean and wwise integration 2025-06-12 10:36:40 +02:00