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
..
Beach.unity	StepSound for player, beach Scene sound updated	2025-06-13 11:05:22 +02:00
Beach.unity.meta	Beach	2025-06-12 15:00:21 +02:00
flo_s_scene.unity	✨ added FoxHouse	2025-06-13 18:41:42 +02:00
flo_s_scene.unity.meta	✨ Scripts	2025-06-12 16:04:22 +02:00
Forest.unity	beacer,json+beaver+forest	2025-06-13 15:17:42 +02:00
Forest.unity.meta	beacer,json+beaver+forest	2025-06-13 15:17:42 +02:00
Garden.unity	changed some weird stuff	2025-06-16 10:21:46 +02:00
Garden.unity.meta	changed some weird stuff	2025-06-16 10:21:46 +02:00
Market.unity	Merge remote-tracking branch 'origin/main'	2025-06-16 10:28:48 +02:00
Market.unity.meta	dialog builder 3.0	2025-06-12 16:24:01 +02:00
xaver.unity	✨ Scripts	2025-06-12 16:04:22 +02:00
xaver.unity.meta	test	2025-06-09 20:55:49 +02:00