Merge branch 'animation' into 'main' (b1f7f5f5) · Commits · ADAM ANTHONY / baguetteRPG · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

baguetteRPG
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

ADAM ANTHONY
baguetteRPG
Commits
b1f7f5f5

Commit b1f7f5f5 authored 3 years ago by

ADAM ANTHONY

Downloads
- Plain Diff

Merge branch 'animation' into 'main'

Set Hit and Die Animation

See merge request !5

parents a9f92912 596ecd91

Branches

Tags

1 merge request!5Set Hit and Die Animation

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Scenes/Scene.unity 24 additions, 7 deletions

Assets/Scenes/Scene.unity
Assets/Scripts/GoblinController.cs 2 additions, 2 deletions

Assets/Scripts/GoblinController.cs
Assets/Scripts/PlayerMovement.cs 45 additions, 12 deletions

Assets/Scripts/PlayerMovement.cs
Assets/Store/Cartoon Heroes/Female/3D/Animation Skeleton/Female_Animation_Skeleton_Default.controller 206 additions, 12 deletions

...ion Skeleton/Female_Animation_Skeleton_Default.controller
Assets/Store/InventoryMaster/Scripts/ExampleScript/PlayerInventory.cs 8 additions, 0 deletions

.../InventoryMaster/Scripts/ExampleScript/PlayerInventory.cs

with 285 additions and 33 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment