Merge branch 'dev' into feat/orbs (e020f76a) · Commits · Muhamad Aji Wibisono / IF3210-2024-Unity-PIP

There was an error fetching the commit references. Please try again later.

Commit e020f76a authored 1 year ago by

Chiquita Ahsanunnisa

Browse files

Merge branch 'dev' into feat/orbs

parents 6381efd7 094baa55

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset 335 additions, 61 deletions

... Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
Assets/Timeline.playable 220 additions, 495 deletions

Assets/Timeline.playable
Assets/_Resources/Models/Characters/Amber.meta 8 additions, 0 deletions

Assets/_Resources/Models/Characters/Amber.meta
Assets/_Resources/Models/Characters/Amber/Amber.prefab 8166 additions, 0 deletions

Assets/_Resources/Models/Characters/Amber/Amber.prefab
Assets/_Resources/Models/Characters/Amber/Amber.prefab.meta 7 additions, 0 deletions

Assets/_Resources/Models/Characters/Amber/Amber.prefab.meta
Assets/_Resources/Models/Characters/Amber/Animations.meta 8 additions, 0 deletions

Assets/_Resources/Models/Characters/Amber/Animations.meta
Assets/_Resources/Models/Characters/Amber/Animations/AmberModel.controller 1898 additions, 0 deletions

.../Models/Characters/Amber/Animations/AmberModel.controller
Assets/_Resources/Models/Characters/Amber/Animations/AmberModel.controller.meta 8 additions, 0 deletions

...ls/Characters/Amber/Animations/AmberModel.controller.meta
Assets/_Resources/Models/Characters/Amber/Animations/Death.anim 34868 additions, 0 deletions

.../_Resources/Models/Characters/Amber/Animations/Death.anim
Assets/_Resources/Models/Characters/Amber/Animations/Death.anim.meta 8 additions, 0 deletions

...ources/Models/Characters/Amber/Animations/Death.anim.meta
Assets/_Resources/Models/Characters/Amber/Animations/Facepalm.anim 58511 additions, 0 deletions

...esources/Models/Characters/Amber/Animations/Facepalm.anim
Assets/_Resources/Models/Characters/Amber/Animations/Facepalm.anim.meta 8 additions, 0 deletions

...ces/Models/Characters/Amber/Animations/Facepalm.anim.meta
Assets/_Resources/Models/Characters/Amber/Animations/Handup.anim 69077 additions, 0 deletions

..._Resources/Models/Characters/Amber/Animations/Handup.anim
Assets/_Resources/Models/Characters/Amber/Animations/Handup.anim.meta 8 additions, 0 deletions

...urces/Models/Characters/Amber/Animations/Handup.anim.meta
Assets/_Resources/Models/Characters/Amber/Animations/Hit.anim 21827 additions, 0 deletions

...ts/_Resources/Models/Characters/Amber/Animations/Hit.anim
Assets/_Resources/Models/Characters/Amber/Animations/Hit.anim.meta 8 additions, 0 deletions

...esources/Models/Characters/Amber/Animations/Hit.anim.meta
Assets/_Resources/Models/Characters/Amber/Animations/Idle.anim 27794 additions, 0 deletions

...s/_Resources/Models/Characters/Amber/Animations/Idle.anim
Assets/_Resources/Models/Characters/Amber/Animations/Idle.anim.meta 8 additions, 0 deletions

...sources/Models/Characters/Amber/Animations/Idle.anim.meta
Assets/_Resources/Models/Characters/Amber/Animations/Jumping.anim 15203 additions, 0 deletions

...Resources/Models/Characters/Amber/Animations/Jumping.anim
Assets/_Resources/Models/Characters/Amber/Animations/Jumping.anim.meta 8 additions, 0 deletions

...rces/Models/Characters/Amber/Animations/Jumping.anim.meta

with 237978 additions and 556 deletions

Please register or to comment

Admin message

Merge branch 'dev' into feat/orbs