Merge branch 'main' of https://gitlab.informatika.org/NerbFox/if3210-2024-unity-afk (401bc99b) · Commits · Nigel Sahl / IF3210-2024-Unity-AFK

Commit 401bc99b authored 1 year ago by

Hosea Nathanael Abetnego

Browse files

Merge branch 'main' of https://gitlab.informatika.org/NerbFox/if3210-2024-unity-afk

parents fb58059d bb8d6214

Branches

Tags

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

IF3210-2024-Unity-AFK/Assets/Art/Animations/BearAnimator.controller 2 additions, 2 deletions

...4-Unity-AFK/Assets/Art/Animations/BearAnimator.controller
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation.controller 532 additions, 0 deletions

...ity-AFK/Assets/Art/Animations/GeneralAnimation.controller
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation.controller.meta 8 additions, 0 deletions

...FK/Assets/Art/Animations/GeneralAnimation.controller.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation.meta 8 additions, 0 deletions

...024-Unity-AFK/Assets/Art/Animations/GeneralAnimation.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/draw sword 1.fbx 3 additions, 0 deletions

...K/Assets/Art/Animations/GeneralAnimation/draw sword 1.fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/draw sword 1.fbx.meta 940 additions, 0 deletions

...ets/Art/Animations/GeneralAnimation/draw sword 1.fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sheath sword 1.fbx 3 additions, 0 deletions

...Assets/Art/Animations/GeneralAnimation/sheath sword 1.fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sheath sword 1.fbx.meta 109 additions, 0 deletions

...s/Art/Animations/GeneralAnimation/sheath sword 1.fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack (2).fbx 3 additions, 0 deletions

...imations/GeneralAnimation/sword and shield attack (2).fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack (2).fbx.meta 940 additions, 0 deletions

...ons/GeneralAnimation/sword and shield attack (2).fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack (3).fbx 3 additions, 0 deletions

...imations/GeneralAnimation/sword and shield attack (3).fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack (3).fbx.meta 940 additions, 0 deletions

...ons/GeneralAnimation/sword and shield attack (3).fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack (4).fbx 3 additions, 0 deletions

...imations/GeneralAnimation/sword and shield attack (4).fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack (4).fbx.meta 940 additions, 0 deletions

...ons/GeneralAnimation/sword and shield attack (4).fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack.fbx 3 additions, 0 deletions

...t/Animations/GeneralAnimation/sword and shield attack.fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield attack.fbx.meta 940 additions, 0 deletions

...mations/GeneralAnimation/sword and shield attack.fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield block (2).fbx 3 additions, 0 deletions

...nimations/GeneralAnimation/sword and shield block (2).fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield block (2).fbx.meta 109 additions, 0 deletions

...ions/GeneralAnimation/sword and shield block (2).fbx.meta
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield block idle.fbx 3 additions, 0 deletions

...imations/GeneralAnimation/sword and shield block idle.fbx
IF3210-2024-Unity-AFK/Assets/Art/Animations/GeneralAnimation/sword and shield block idle.fbx.meta 138 additions, 0 deletions

...ons/GeneralAnimation/sword and shield block idle.fbx.meta

with 5630 additions and 2 deletions

Please register or to comment

Admin message

Merge branch 'main' of https://gitlab.informatika.org/NerbFox/if3210-2024-unity-afk