Merge branch 'art' into dev

Browse Source

# Conflicts:
#	Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta
#	Gameton-06/Assets/Gameton/Scenes/Personal Scenes/map_scene/MapReferenceScene.unity
#	Gameton-06/ProjectSettings/TagManager.asset

...

This commit is contained in:

aube.lee

2025-02-13 11:28:53 +09:00

parent 636160f492 f985e5f40c

commit eb371d10ea

36 changed files with 862309 additions and 302 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Gameton-06/ProjectSettings/TagManager.asset LFS

Binary file not shown.