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

Commit ab8d1d24 authored 3 years ago by

Jesica

Merge branch 'boss' into 'main'

Boss

See merge request !2

parents 8dc70de9 3da6df60

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Additional Mobs.meta 8 additions, 0 deletions

Assets/Additional Mobs.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart.meta 8 additions, 0 deletions

Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations.meta 9 additions, 0 deletions

...onal Mobs/Mini Legion Lich PBR HP Polyart/Animations.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich.meta 9 additions, 0 deletions

...Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Attack01.fbx 3 additions, 0 deletions

...i Legion Lich PBR HP Polyart/Animations/Lich/Attack01.fbx
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Attack01.fbx.meta 475 additions, 0 deletions

...ion Lich PBR HP Polyart/Animations/Lich/Attack01.fbx.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Attack02.fbx 3 additions, 0 deletions

...i Legion Lich PBR HP Polyart/Animations/Lich/Attack02.fbx
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Attack02.fbx.meta 475 additions, 0 deletions

...ion Lich PBR HP Polyart/Animations/Lich/Attack02.fbx.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Die.fbx 3 additions, 0 deletions

...s/Mini Legion Lich PBR HP Polyart/Animations/Lich/Die.fbx
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Die.fbx.meta 475 additions, 0 deletions

...i Legion Lich PBR HP Polyart/Animations/Lich/Die.fbx.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/GetHit.fbx 3 additions, 0 deletions

...ini Legion Lich PBR HP Polyart/Animations/Lich/GetHit.fbx
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/GetHit.fbx.meta 475 additions, 0 deletions

...egion Lich PBR HP Polyart/Animations/Lich/GetHit.fbx.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Idle.fbx 3 additions, 0 deletions

.../Mini Legion Lich PBR HP Polyart/Animations/Lich/Idle.fbx
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Idle.fbx.meta 475 additions, 0 deletions

... Legion Lich PBR HP Polyart/Animations/Lich/Idle.fbx.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Lich.controller 481 additions, 0 deletions

...egion Lich PBR HP Polyart/Animations/Lich/Lich.controller
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Lich.controller.meta 7 additions, 0 deletions

... Lich PBR HP Polyart/Animations/Lich/Lich.controller.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/LichAOC.overrideController 17 additions, 0 deletions

...PBR HP Polyart/Animations/Lich/LichAOC.overrideController
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/LichAOC.overrideController.meta 8 additions, 0 deletions

...P Polyart/Animations/Lich/LichAOC.overrideController.meta
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Run.fbx 3 additions, 0 deletions

...s/Mini Legion Lich PBR HP Polyart/Animations/Lich/Run.fbx
Assets/Additional Mobs/Mini Legion Lich PBR HP Polyart/Animations/Lich/Run.fbx.meta 475 additions, 0 deletions

...i Legion Lich PBR HP Polyart/Animations/Lich/Run.fbx.meta

with 3415 additions and 0 deletions

Please register or to comment

Admin message

Merge branch 'boss' into 'main'