Merge branch 'boss' into 'main' (eca226d8) · Commits · Jesica / IF3210-2022-Unity-55

Commit eca226d8 authored 3 years ago by

Jesica

Merge branch 'boss' into 'main'

Boss

See merge request !3

parents ab8d1d24 e7a8a46f

Branches

1 merge request!3Boss

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Additional Mobs/Toon Zombie S.meta 8 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S.meta
Assets/Additional Mobs/Toon Zombie S/Materials.meta 8 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Materials.meta
Assets/Additional Mobs/Toon Zombie S/Materials/eye.mat 58 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Materials/eye.mat
Assets/Additional Mobs/Toon Zombie S/Materials/eye.mat.meta 8 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Materials/eye.mat.meta
Assets/Additional Mobs/Toon Zombie S/Materials/zombe green.mat 57 additions, 0 deletions

...s/Additional Mobs/Toon Zombie S/Materials/zombe green.mat
Assets/Additional Mobs/Toon Zombie S/Materials/zombe green.mat.meta 8 additions, 0 deletions

...itional Mobs/Toon Zombie S/Materials/zombe green.mat.meta
Assets/Additional Mobs/Toon Zombie S/Materials/zombe green2.mat 47 additions, 0 deletions

.../Additional Mobs/Toon Zombie S/Materials/zombe green2.mat
Assets/Additional Mobs/Toon Zombie S/Materials/zombe green2.mat.meta 8 additions, 0 deletions

...tional Mobs/Toon Zombie S/Materials/zombe green2.mat.meta
Assets/Additional Mobs/Toon Zombie S/Model.meta 8 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Model.meta
Assets/Additional Mobs/Toon Zombie S/Model/Materials.meta 8 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Model/Materials.meta
Assets/Additional Mobs/Toon Zombie S/Model/Materials/Material_001__zombe_green2_png_003.mat 47 additions, 0 deletions

... S/Model/Materials/Material_001__zombe_green2_png_003.mat
Assets/Additional Mobs/Toon Zombie S/Model/Materials/Material_001__zombe_green2_png_003.mat.meta 8 additions, 0 deletions

...del/Materials/Material_001__zombe_green2_png_003.mat.meta
Assets/Additional Mobs/Toon Zombie S/Model/Materials/eye.mat 33 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Model/Materials/eye.mat
Assets/Additional Mobs/Toon Zombie S/Model/Materials/eye.mat.meta 8 additions, 0 deletions

...dditional Mobs/Toon Zombie S/Model/Materials/eye.mat.meta
Assets/Additional Mobs/Toon Zombie S/Model/Materials/zombe green2.mat 47 additions, 0 deletions

...ional Mobs/Toon Zombie S/Model/Materials/zombe green2.mat
Assets/Additional Mobs/Toon Zombie S/Model/Materials/zombe green2.mat.meta 8 additions, 0 deletions

... Mobs/Toon Zombie S/Model/Materials/zombe green2.mat.meta
Assets/Additional Mobs/Toon Zombie S/Model/death01.anim 49711 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Model/death01.anim
Assets/Additional Mobs/Toon Zombie S/Model/death01.anim.meta 8 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Model/death01.anim.meta
Assets/Additional Mobs/Toon Zombie S/Model/zombie anime.fbx 3 additions, 0 deletions

Assets/Additional Mobs/Toon Zombie S/Model/zombie anime.fbx
Assets/Additional Mobs/Toon Zombie S/Model/zombie anime.fbx.meta 1428 additions, 0 deletions

...Additional Mobs/Toon Zombie S/Model/zombie anime.fbx.meta

with 51519 additions and 0 deletions

Please register or to comment

Admin message

Merge branch 'boss' into 'main'