Merge branch 'main' into feat/android
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- .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/CutsceneCanvas 2.controller 101 additions, 0 deletionsAssets/Animation/CutsceneCanvas 2.controller
- Assets/Animation/CutsceneCanvas 2.controller.meta 8 additions, 0 deletionsAssets/Animation/CutsceneCanvas 2.controller.meta
- Assets/Animation/CutsceneCanvas.controller 101 additions, 0 deletionsAssets/Animation/CutsceneCanvas.controller
- Assets/Animation/CutsceneCanvas.controller.meta 8 additions, 0 deletionsAssets/Animation/CutsceneCanvas.controller.meta
- Assets/Animation/CutsceneCanvasTimeline 2.controller 72 additions, 0 deletionsAssets/Animation/CutsceneCanvasTimeline 2.controller
- Assets/Animation/CutsceneCanvasTimeline 2.controller.meta 8 additions, 0 deletionsAssets/Animation/CutsceneCanvasTimeline 2.controller.meta
- Assets/Animation/CutsceneCanvasTimeline.controller 72 additions, 0 deletionsAssets/Animation/CutsceneCanvasTimeline.controller
- Assets/Animation/CutsceneCanvasTimeline.controller.meta 8 additions, 0 deletionsAssets/Animation/CutsceneCanvasTimeline.controller.meta
- Assets/Animation/GameOverClip.anim 942 additions, 401 deletionsAssets/Animation/GameOverClip.anim
- Assets/Audio/Lightning Zap.wav 0 additions, 0 deletionsAssets/Audio/Lightning Zap.wav
- Assets/Audio/Lightning Zap.wav.meta 19 additions, 0 deletionsAssets/Audio/Lightning Zap.wav.meta
- Assets/Audio/Music/ShadowsAndDust.mp3 0 additions, 0 deletionsAssets/Audio/Music/ShadowsAndDust.mp3
- Assets/Audio/Music/ShadowsAndDust.mp3.meta 23 additions, 0 deletionsAssets/Audio/Music/ShadowsAndDust.mp3.meta
- Assets/Black.mat 30 additions, 0 deletionsAssets/Black.mat
- Assets/Black.mat.meta 8 additions, 0 deletionsAssets/Black.mat.meta
- Assets/DogAnimationController.controller 159 additions, 0 deletionsAssets/DogAnimationController.controller
Please register or sign in to comment