Merge branch 'level-design/ilya-af/carret-misfortune' into MVP/April

latarm · May 1, 2020 · 16d168b · 16d168b
2 parents 68dea36 + 504ee21
commit 16d168b
Show file tree

Hide file tree

Showing 1,192 changed files with 1,074,811 additions and 75,792 deletions.
diff --git a/.vs/BeastHunter/v15/Server/sqlite3/storage.ide b/.vs/BeastHunter/v15/Server/sqlite3/storage.ide
diff --git a/.vs/BeastHunter/v15/Server/sqlite3/storage.ide-shm b/.vs/BeastHunter/v15/Server/sqlite3/storage.ide-shm
diff --git a/.vs/VanHelsing/v16/Server/sqlite3/storage.ide b/.vs/VanHelsing/v16/Server/sqlite3/storage.ide
diff --git a/Assets/Animations.meta → Assets/AdditiveAssets/Animations.meta b/Assets/Animations.meta → Assets/AdditiveAssets/Animations.meta
diff --git a/Assets/Animations/Animation.meta → .../AdditiveAssets/Animations/Animation.meta b/Assets/Animations/Animation.meta → .../AdditiveAssets/Animations/Animation.meta
diff --git a/...imations/Animation/HumanoidIdleJumpUp.fbx → ...imations/Animation/HumanoidIdleJumpUp.fbx b/...imations/Animation/HumanoidIdleJumpUp.fbx → ...imations/Animation/HumanoidIdleJumpUp.fbx
diff --git a/...ons/Animation/HumanoidIdleJumpUp.fbx.meta → ...ons/Animation/HumanoidIdleJumpUp.fbx.meta b/...ons/Animation/HumanoidIdleJumpUp.fbx.meta → ...ons/Animation/HumanoidIdleJumpUp.fbx.meta
diff --git a/Assets/Animations/BattleMode.meta → ...AdditiveAssets/Animations/BattleMode.meta b/Assets/Animations/BattleMode.meta → ...AdditiveAssets/Animations/BattleMode.meta
diff --git a/.../Animations/BattleMode/HumanoidCrouch.fbx → .../Animations/BattleMode/HumanoidCrouch.fbx b/.../Animations/BattleMode/HumanoidCrouch.fbx → .../Animations/BattleMode/HumanoidCrouch.fbx
diff --git a/...ations/BattleMode/HumanoidCrouch.fbx.meta → ...ations/BattleMode/HumanoidCrouch.fbx.meta b/...ations/BattleMode/HumanoidCrouch.fbx.meta → ...ations/BattleMode/HumanoidCrouch.fbx.meta
diff --git a/Assets/Animations/Controllers.meta → ...dditiveAssets/Animations/Controllers.meta b/Assets/Animations/Controllers.meta → ...dditiveAssets/Animations/Controllers.meta
diff --git a/Assets/AdditiveAssets/Animations/Controllers/CharacterBattleAnimator.controller b/Assets/AdditiveAssets/Animations/Controllers/CharacterBattleAnimator.controller
diff --git a/Assets/AdditiveAssets/Animations/Controllers/CharacterBattleAnimator.controller.meta b/Assets/AdditiveAssets/Animations/Controllers/CharacterBattleAnimator.controller.meta