Commit f94cc40

committed

Merge branch 'develop' of https://github.com/umasteeringgroup/UMA into develop

2 parents e8907f1 + 45a17a3 commit f94cc40Copy full SHA for f94cc40

13 files changed

+5968

-268

lines changed

UMAProject/Assets
- ExpressionTest.controller
- New Animation.anim
- UMA
  - Content/UMA_Core
    - HumanFemale/MechanimTemplates
      - DefaultFemaleAvatar.asset
      - DefaultFemaleAvatar.asset.meta
    - HumanMale/MechanimTemplates
      - DefaultMaleAvatar.asset
      - DefaultMaleAvatar.asset.meta
  - Core
    - Extensions/DynamicCharacterSystem/Scripts
      - DynamicCharacterAvatar.cs
    - StandardAssets/UMA/Scripts
  - Examples/DynamicCharacterSystem Examples
    - UMA DCS Demo - Simple Setup.unity

13 files changed

+5968

-268

lines changed

`‎UMAProject/Assets/ExpressionTest.controller`

-41

This file was deleted.

`‎UMAProject/Assets/New Animation.anim`

-97

This file was deleted.

Comments

(0)