Merge branch 'feature/animated-katana' into 'develop'
Feature/animated katana See merge request !20
Showing
- Assets/Animation/PlayerAC.controller 87 additions, 0 deletionsAssets/Animation/PlayerAC.controller
- Assets/Models/Weapons/flash.mat 147 additions, 0 deletionsAssets/Models/Weapons/flash.mat
- Assets/Models/Weapons/flash.mat.meta 8 additions, 0 deletionsAssets/Models/Weapons/flash.mat.meta
- Assets/Models/Weapons/slash.mat 147 additions, 0 deletionsAssets/Models/Weapons/slash.mat
- Assets/Models/Weapons/slash.mat.meta 8 additions, 0 deletionsAssets/Models/Weapons/slash.mat.meta
- Assets/Textures/Weapons/flash.png 0 additions, 0 deletionsAssets/Textures/Weapons/flash.png
- Assets/Textures/Weapons/flash.png.meta 123 additions, 0 deletionsAssets/Textures/Weapons/flash.png.meta
- Assets/Textures/Weapons/slash.png 0 additions, 0 deletionsAssets/Textures/Weapons/slash.png
- Assets/Textures/Weapons/slash.png.meta 123 additions, 0 deletionsAssets/Textures/Weapons/slash.png.meta
- Assets/_CompletedAssets/Prefabs/Player.prefab 94 additions, 13 deletionsAssets/_CompletedAssets/Prefabs/Player.prefab
- Assets/_CompletedAssets/Prefabs/Weapons/katana.prefab 4890 additions, 1 deletionAssets/_CompletedAssets/Prefabs/Weapons/katana.prefab
- Assets/_CompletedAssets/Prefabs/Weapons/slash VFX.prefab 14646 additions, 0 deletionsAssets/_CompletedAssets/Prefabs/Weapons/slash VFX.prefab
- Assets/_CompletedAssets/Prefabs/Weapons/slash VFX.prefab.meta 7 additions, 0 deletions...ts/_CompletedAssets/Prefabs/Weapons/slash VFX.prefab.meta
- Assets/_CompletedAssets/Scripts/Weapons/Katana.cs 23 additions, 4 deletionsAssets/_CompletedAssets/Scripts/Weapons/Katana.cs
Please register or sign in to comment