Merge branch 'feat/pet' into 'dev' (5352c270) · Commits · Muhamad Aji Wibisono / IF3210-2024-Unity-PIP

Commit 5352c270 authored 1 year ago by

Chiquita Ahsanunnisa

Merge branch 'feat/pet' into 'dev'

feat/pet

See merge request !43

parents 56f4789e c41ea40d

1 merge request!43feat/pet

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Resources/Data/Entity/CompanionData/AttackingCompanionData.asset 16 additions, 0 deletions

...es/Data/Entity/CompanionData/AttackingCompanionData.asset
Assets/Resources/Data/Entity/CompanionData/AttackingCompanionData.asset.meta 8 additions, 0 deletions

...ta/Entity/CompanionData/AttackingCompanionData.asset.meta
Assets/Resources/Data/Entity/CompanionData/BuffCompanionData.asset 16 additions, 0 deletions

...sources/Data/Entity/CompanionData/BuffCompanionData.asset
Assets/Resources/Data/Entity/CompanionData/BuffCompanionData.asset.meta 8 additions, 0 deletions

...es/Data/Entity/CompanionData/BuffCompanionData.asset.meta
Assets/Resources/Prefabs/Pets/AttackingCompanion.meta 8 additions, 0 deletions

Assets/Resources/Prefabs/Pets/AttackingCompanion.meta
Assets/Resources/Prefabs/Pets/AttackingCompanion/AttackingCompanion.prefab 256 additions, 0 deletions

...Prefabs/Pets/AttackingCompanion/AttackingCompanion.prefab
Assets/Resources/Prefabs/Pets/AttackingCompanion/AttackingCompanion.prefab.meta 7 additions, 0 deletions

...bs/Pets/AttackingCompanion/AttackingCompanion.prefab.meta
Assets/Resources/Prefabs/Pets/BuffCompanion.meta 8 additions, 0 deletions

Assets/Resources/Prefabs/Pets/BuffCompanion.meta
Assets/Resources/Prefabs/Pets/BuffCompanion/BuffCompanion.prefab 253 additions, 0 deletions

...Resources/Prefabs/Pets/BuffCompanion/BuffCompanion.prefab
Assets/Resources/Prefabs/Pets/BuffCompanion/BuffCompanion.prefab.meta 7 additions, 0 deletions

...rces/Prefabs/Pets/BuffCompanion/BuffCompanion.prefab.meta
Assets/Resources/Prefabs/Pets/HealingCompanion/HealingCompanion.prefab 112 additions, 7 deletions

...ces/Prefabs/Pets/HealingCompanion/HealingCompanion.prefab
Assets/_Resources/Models/Collectibles/Orb/CrystalBlue/CrystalBlue.controller 61 additions, 1 deletion

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

Assets/_Resources/Models/Pet.meta
Assets/_Resources/Models/Pet/fire-slime.meta 8 additions, 0 deletions

Assets/_Resources/Models/Pet/fire-slime.meta
Assets/_Resources/Models/Pet/fire-slime/source.meta 8 additions, 0 deletions

Assets/_Resources/Models/Pet/fire-slime/source.meta
Assets/_Resources/Models/Pet/fire-slime/source/FireSlime.fbx 0 additions, 0 deletions

Assets/_Resources/Models/Pet/fire-slime/source/FireSlime.fbx
Assets/_Resources/Models/Pet/fire-slime/source/FireSlime.fbx.meta 122 additions, 0 deletions

...Resources/Models/Pet/fire-slime/source/FireSlime.fbx.meta
Assets/_Resources/Models/Pet/fire-slime/textures.meta 8 additions, 0 deletions

Assets/_Resources/Models/Pet/fire-slime/textures.meta
Assets/_Resources/Models/Pet/fire-slime/textures/FireSlimeBody.mat 136 additions, 0 deletions

...esources/Models/Pet/fire-slime/textures/FireSlimeBody.mat
Assets/_Resources/Models/Pet/fire-slime/textures/FireSlimeBody.mat.meta 8 additions, 0 deletions

...ces/Models/Pet/fire-slime/textures/FireSlimeBody.mat.meta

with 1058 additions and 8 deletions

Please register or to comment

Admin message

Merge branch 'feat/pet' into 'dev'