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

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

Commit 21fdbc51 authored 1 year ago by

Chiquita Ahsanunnisa

Merge branch 'feat/orbs' into 'dev'

feat/orbs

See merge request !27

parents 094baa55 e020f76a

1 merge request!27feat/orbs

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Resources/Prefabs/Collectibles/Orb.meta 8 additions, 0 deletions

Assets/Resources/Prefabs/Collectibles/Orb.meta
Assets/Resources/Prefabs/Collectibles/Orb/IncreaseDamageOrb.meta 8 additions, 0 deletions

...Resources/Prefabs/Collectibles/Orb/IncreaseDamageOrb.meta
Assets/Resources/Prefabs/Collectibles/Orb/IncreaseDamageOrb/IncreaseDamageOrb.prefab 189 additions, 0 deletions

...llectibles/Orb/IncreaseDamageOrb/IncreaseDamageOrb.prefab
Assets/Resources/Prefabs/Collectibles/Orb/IncreaseDamageOrb/IncreaseDamageOrb.prefab.meta 7 additions, 0 deletions

...ibles/Orb/IncreaseDamageOrb/IncreaseDamageOrb.prefab.meta
Assets/Resources/Prefabs/Collectibles/Orb/IncreaseSpeedOrb.meta 8 additions, 0 deletions

.../Resources/Prefabs/Collectibles/Orb/IncreaseSpeedOrb.meta
Assets/Resources/Prefabs/Collectibles/Orb/IncreaseSpeedOrb/IncreaseSpeedOrb.prefab 176 additions, 0 deletions

...Collectibles/Orb/IncreaseSpeedOrb/IncreaseSpeedOrb.prefab
Assets/Resources/Prefabs/Collectibles/Orb/IncreaseSpeedOrb/IncreaseSpeedOrb.prefab.meta 7 additions, 0 deletions

...ctibles/Orb/IncreaseSpeedOrb/IncreaseSpeedOrb.prefab.meta
Assets/Resources/Prefabs/Collectibles/Orb/RestoreHealthOrb.meta 8 additions, 0 deletions

.../Resources/Prefabs/Collectibles/Orb/RestoreHealthOrb.meta
Assets/Resources/Prefabs/Collectibles/Orb/RestoreHealthOrb/RestoreHealthOrb.prefab 164 additions, 0 deletions

...Collectibles/Orb/RestoreHealthOrb/RestoreHealthOrb.prefab
Assets/Resources/Prefabs/Collectibles/Orb/RestoreHealthOrb/RestoreHealthOrb.prefab.meta 7 additions, 0 deletions

...ctibles/Orb/RestoreHealthOrb/RestoreHealthOrb.prefab.meta
Assets/_Resources/Models/Collectibles/Orb.meta 8 additions, 0 deletions

Assets/_Resources/Models/Collectibles/Orb.meta
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue.meta 8 additions, 0 deletions

Assets/_Resources/Models/Collectibles/Orb/CrystalBlue.meta
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlue.controller 12 additions, 0 deletions

...odels/Collectibles/Orb/CrystalBlue/CrystalBlue.controller
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlue.controller.meta 8 additions, 0 deletions

.../Collectibles/Orb/CrystalBlue/CrystalBlue.controller.meta
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlue.fbx 0 additions, 0 deletions

...urces/Models/Collectibles/Orb/CrystalBlue/CrystalBlue.fbx
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlue.fbx.meta 146 additions, 0 deletions

.../Models/Collectibles/Orb/CrystalBlue/CrystalBlue.fbx.meta
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlueMat.mat 139 additions, 0 deletions

...es/Models/Collectibles/Orb/CrystalBlue/CrystalBlueMat.mat
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlueMat.mat.meta 8 additions, 0 deletions

...dels/Collectibles/Orb/CrystalBlue/CrystalBlueMat.mat.meta
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlueTex.png 0 additions, 0 deletions

...es/Models/Collectibles/Orb/CrystalBlue/CrystalBlueTex.png
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlueTex.png.meta 114 additions, 0 deletions

...dels/Collectibles/Orb/CrystalBlue/CrystalBlueTex.png.meta

with 1025 additions and 0 deletions

Please register or to comment

Admin message

Merge branch 'feat/orbs' into 'dev'