vuong dinh hoang e0cbc4c302 Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill ...

# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_BundledAssetGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_BundledAssetGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_ContentUpdateGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_ContentUpdateGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/music.asset
#	Assets/AddressableAssetsData/AssetGroups/music.asset.meta

2026-04-21 17:35:08 +07:00

..

Animations

add missing models

2026-04-21 11:29:24 +07:00

Gfx

update models

2026-04-13 17:33:06 +07:00

Materials

add Bong Minh Dong a69 map

2026-03-07 20:11:25 +07:00

Models

update tool change prefabs

2026-04-21 14:43:26 +07:00

music

add music

2026-04-21 17:11:00 +07:00

Music

add a temporary background music system. To be replaced later.

2026-04-21 17:32:01 +07:00

Scripts

…

sfx

add sfx to addressable and fix their path names

2026-04-16 15:52:50 +07:00

Shaders

add Bong Minh Dong a69 map

2026-03-07 20:11:25 +07:00

Sky

vfx attack

2025-12-29 17:16:43 +07:00

Terrain

Merge 4

2026-04-01 18:01:11 +07:00

Textures

add missing models

2026-04-21 11:29:24 +07:00

Animations.meta

…

Gfx.meta

…

Materials.meta

…

Models.meta

…

music.meta

Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill

2026-04-21 17:35:08 +07:00

Music.meta

add a temporary background music system. To be replaced later.

2026-04-21 17:32:01 +07:00

Scripts.meta

…

sfx.meta

done gfx sound

2026-04-10 16:35:07 +07:00

Shaders.meta

…

Sky.meta

vfx attack

2025-12-29 17:16:43 +07:00

Terrain.meta

save terrain mesh to asset

2026-02-26 20:52:00 +07:00

Textures.meta

…