HaeinLEE
|
5daf8c4577
|
Merge branch 'main' into DEG-77-튜토리얼-구현
# Conflicts:
# Assets/LIN/Scripts/DailyRoutine/InteractionController.cs
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Cartoon_Preview.mp3
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Foley & Impact_Preview.mp3
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/GUN_Preview.mp3
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Magic_Preview.mp3
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Open & Close_Preview.mp3
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Sci-Fi_SpaceShip_Signal_Preview.mp3
# Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Whoosh_Cinematic_Preview.mp3
# Assets/StoreAssets/RPG Tiny Hero Duo/Prefab/MaleCharacterPBR.prefab
# Assets/UnityTechnologies/Basic Asset Pack Interior/Materials/Grey.mat
|
2025-05-07 13:59:43 +09:00 |
|
HaeinLEE
|
5d17b2ba60
|
main pull
|
2025-05-07 13:47:30 +09:00 |
|
Sehyeon
|
57419f5c01
|
DEG-118 [Remove] 안쓰는 에셋 정리
|
2025-04-30 09:27:39 +09:00 |
|
Sehyeon
|
341be0aa7e
|
DEG-21 [Save] 혹시 모를 중간 저장
|
2025-04-24 13:49:52 +09:00 |
|
99jamin
|
7c807e12cc
|
Add LFS tracking for large files
|
2025-04-16 13:23:38 +09:00 |
|
99jamin
|
ded0c4b58f
|
StroeAssets 폴더로 이동
|
2025-04-16 12:18:34 +09:00 |
|