Merge branch 'dev' into feat/dev/saveload
Showing
- .vscode/extensions.json 5 additions, 0 deletions.vscode/extensions.json
- .vscode/launch.json 10 additions, 0 deletions.vscode/launch.json
- .vscode/settings.json 55 additions, 0 deletions.vscode/settings.json
- Assets/Animation/EnemyAnimatorController.controller 32 additions, 25 deletionsAssets/Animation/EnemyAnimatorController.controller
- Assets/Animation/PlayerAnimatorController.controller 80 additions, 60 deletionsAssets/Animation/PlayerAnimatorController.controller
- Assets/Animation/ZomBossAnimatorController.controller 194 additions, 0 deletionsAssets/Animation/ZomBossAnimatorController.controller
- Assets/Animation/ZomBossAnimatorController.controller.meta 8 additions, 0 deletionsAssets/Animation/ZomBossAnimatorController.controller.meta
- Assets/Animation/ZomBossDeadAnimatorController.controller 72 additions, 0 deletionsAssets/Animation/ZomBossDeadAnimatorController.controller
- Assets/Animation/ZomBossDeadAnimatorController.controller.meta 8 additions, 0 deletions...s/Animation/ZomBossDeadAnimatorController.controller.meta
- Assets/Audio/Music/Ghost Manifestation 2.wav 0 additions, 0 deletionsAssets/Audio/Music/Ghost Manifestation 2.wav
- Assets/Audio/Music/Ghost Manifestation 2.wav.meta 23 additions, 0 deletionsAssets/Audio/Music/Ghost Manifestation 2.wav.meta
- Assets/FollowPlayer.cs 21 additions, 0 deletionsAssets/FollowPlayer.cs
- Assets/FollowPlayer.cs.meta 11 additions, 0 deletionsAssets/FollowPlayer.cs.meta
- Assets/Free Pack.meta 8 additions, 0 deletionsAssets/Free Pack.meta
- Assets/Free Pack/Autocannon - Shot 1.wav 0 additions, 0 deletionsAssets/Free Pack/Autocannon - Shot 1.wav
- Assets/Free Pack/Autocannon - Shot 1.wav.meta 23 additions, 0 deletionsAssets/Free Pack/Autocannon - Shot 1.wav.meta
- Assets/Free Pack/Bloody punch.wav 0 additions, 0 deletionsAssets/Free Pack/Bloody punch.wav
- Assets/Free Pack/Bloody punch.wav.meta 23 additions, 0 deletionsAssets/Free Pack/Bloody punch.wav.meta
- Assets/Free Pack/Bullet Impact 14.wav 0 additions, 0 deletionsAssets/Free Pack/Bullet Impact 14.wav
- Assets/Free Pack/Bullet Impact 14.wav.meta 23 additions, 0 deletionsAssets/Free Pack/Bullet Impact 14.wav.meta
Please register or sign in to comment