Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021

Move animation in to folder animations
2021-01-30 20:15:24 +01:00 · 2021-01-30 20:15:17 +01:00
13 changed files with 8 additions and 0 deletions
--- a/Assets/Animation.meta
+++ b/Assets/Animation.meta
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: 6a51b1d9bc73cb744b2aa60c288e4c4a
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Animation/Die.anim
+++ b/Assets/Animation/Die.anim
--- a/Assets/Animation/Die.anim.meta
+++ b/Assets/Animation/Die.anim.meta
--- a/Assets/Animation/Eat.anim
+++ b/Assets/Animation/Eat.anim
--- a/Assets/Animation/Eat.anim.meta
+++ b/Assets/Animation/Eat.anim.meta
--- a/Assets/Animation/Idle.anim
+++ b/Assets/Animation/Idle.anim
--- a/Assets/Animation/Idle.anim.meta
+++ b/Assets/Animation/Idle.anim.meta
--- a/Assets/Animation/Saw.anim
+++ b/Assets/Animation/Saw.anim
--- a/Assets/Animation/Saw.anim.meta
+++ b/Assets/Animation/Saw.anim.meta
--- a/Assets/Animation/Spikes.anim
+++ b/Assets/Animation/Spikes.anim
--- a/Assets/Animation/Spikes.anim.meta
+++ b/Assets/Animation/Spikes.anim.meta
--- a/Assets/Animation/Walk.anim
+++ b/Assets/Animation/Walk.anim
--- a/Assets/Animation/Walk.anim.meta
+++ b/Assets/Animation/Walk.anim.meta
Author	SHA1	Message	Date
haitem	7fd433d4e2	Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021	2021-01-30 20:15:24 +01:00
haitem	7a310806ec	Move animation in to folder animations	2021-01-30 20:15:17 +01:00