iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
358 Commits 4 Branches 0 Tags 3.1 GiB
C# 79.3%
GLSL 19.9%
ShaderLab 0.4%
HLSL 0.3%
23775fa660
Go to file
NTG_DESKTOP 23775fa660 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_npc 
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset
#	Assets/AddressableAssetsData/AssetGroups/Group.asset
#	Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset
#	Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset
#	Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset
#	Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset
#	Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset
2025-08-12 02:30:58 +09:00
Assets 에셋 변경 2025-08-12 02:27:48 +09:00
Packages DDD-61 현지화 시스템 기본 구성 중 2025-07-17 12:32:31 +09:00
ProjectSettings 에셋 변경 2025-08-11 23:42:26 +09:00
ServerData/StandaloneWindows64 re-index all files: apply corrected LFS tracking 2025-07-08 19:46:31 +09:00
.editorconfig re-index all files: apply corrected LFS tracking 2025-07-08 19:46:31 +09:00
.gitattributes 렌더링 세팅 변경 2025-08-07 20:02:01 +09:00
.gitignore fixed gitignore 2025-08-06 17:45:49 +09:00
.vsconfig re-index all files: apply corrected LFS tracking 2025-07-08 19:46:31 +09:00
ProjectDDD.sln.DotSettings re-index all files: apply corrected LFS tracking 2025-07-08 19:46:31 +09:00