Merge branch 'feat/pet' into 'dev' (e6beca51) · Commits · IF3210-2024-02-04 / IF3210-2024-Unity-SON

Commit e6beca51 authored 11 months ago by

Akhmad Setiawan

Merge branch 'feat/pet' into 'dev'

Feat/pet

See merge request !7

parents 1e595177 4e6fd7eb

1 merge request!7Feat/pet

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Hovl Studio/Magic effects pack/Prefabs/Character auras/Healing.prefab 95 additions, 17 deletions

...Magic effects pack/Prefabs/Character auras/Healing.prefab
Assets/Prefabs/Player.prefab 137 additions, 2 deletions

Assets/Prefabs/Player.prefab
Assets/Quirky Series Ultimate.meta 8 additions, 0 deletions

Assets/Quirky Series Ultimate.meta
Assets/Quirky Series Ultimate/FREE.meta 8 additions, 0 deletions

Assets/Quirky Series Ultimate/FREE.meta
Assets/Quirky Series Ultimate/FREE/Animations.meta 8 additions, 0 deletions

Assets/Quirky Series Ultimate/FREE/Animations.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Colobus.controller 1339 additions, 0 deletions

...rky Series Ultimate/FREE/Animations/AC_Colobus.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Colobus.controller.meta 8 additions, 0 deletions

...eries Ultimate/FREE/Animations/AC_Colobus.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Gecko.controller 1315 additions, 0 deletions

...uirky Series Ultimate/FREE/Animations/AC_Gecko.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Gecko.controller.meta 8 additions, 0 deletions

... Series Ultimate/FREE/Animations/AC_Gecko.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Herring.controller 1176 additions, 0 deletions

...rky Series Ultimate/FREE/Animations/AC_Herring.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Herring.controller.meta 8 additions, 0 deletions

...eries Ultimate/FREE/Animations/AC_Herring.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Muskrat.controller 1205 additions, 0 deletions

...rky Series Ultimate/FREE/Animations/AC_Muskrat.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Muskrat.controller.meta 8 additions, 0 deletions

...eries Ultimate/FREE/Animations/AC_Muskrat.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Pudu.controller 1205 additions, 0 deletions

...Quirky Series Ultimate/FREE/Animations/AC_Pudu.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Pudu.controller.meta 8 additions, 0 deletions

...y Series Ultimate/FREE/Animations/AC_Pudu.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Sparrow.controller 2297 additions, 0 deletions

...rky Series Ultimate/FREE/Animations/AC_Sparrow.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Sparrow.controller.meta 8 additions, 0 deletions

...eries Ultimate/FREE/Animations/AC_Sparrow.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Squid.controller 1176 additions, 0 deletions

...uirky Series Ultimate/FREE/Animations/AC_Squid.controller
Assets/Quirky Series Ultimate/FREE/Animations/AC_Squid.controller.meta 8 additions, 0 deletions

... Series Ultimate/FREE/Animations/AC_Squid.controller.meta
Assets/Quirky Series Ultimate/FREE/Animations/AC_Taipan.controller 1205 additions, 0 deletions

...irky Series Ultimate/FREE/Animations/AC_Taipan.controller

with 11230 additions and 19 deletions

Please register or to comment

Admin message

Merge branch 'feat/pet' into 'dev'