diff --git a/.gitattributes b/.gitattributes index 1eefc82..eee4bb4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,38 +8,30 @@ *.blend filter=lfs diff=lfs merge=lfs -text *.3ds filter=lfs diff=lfs merge=lfs -text *.stl filter=lfs diff=lfs merge=lfs -text - # Textures & Images -*.png filter=lfs diff=lfs merge=lfs -text *.tga filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text -*.jpg filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text *.exr filter=lfs diff=lfs merge=lfs -text *.bmp filter=lfs diff=lfs merge=lfs -text - # 2D / Pixel Art -*.ase filter=lfs diff=lfs merge=lfs -text -*.aseprite filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text - # Audio *.wav filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text *.flac filter=lfs diff=lfs merge=lfs -text *.mp3 filter=lfs diff=lfs merge=lfs -text - # Video / Cutscenes *.mp4 filter=lfs diff=lfs merge=lfs -text *.mov filter=lfs diff=lfs merge=lfs -text *.avi filter=lfs diff=lfs merge=lfs -text *.webm filter=lfs diff=lfs merge=lfs -text - # Unity / Engine Files *.unity filter=lfs diff=lfs merge=lfs -text *.unitypackage filter=lfs diff=lfs merge=lfs -text - # Archives & Packages *.zip filter=lfs diff=lfs merge=lfs -text *.rar filter=lfs diff=lfs merge=lfs -text *.7z filter=lfs diff=lfs merge=lfs -text +*.png !text !filter !merge !diff +*.ase !text !filter !merge !diff +*.aseprite !text !filter !merge !diff diff --git a/Assets/Materials/trunk.mat b/Assets/Materials/trunk.mat index ba3e0e4..aec35c9 100644 --- a/Assets/Materials/trunk.mat +++ b/Assets/Materials/trunk.mat @@ -20,7 +20,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 61e94e3..1434ed5 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16865e980281209c176e411404a84cfff17229b8ec22f866699dd49fe00acc22 -size 194785 +oid sha256:1e1003c51cda3d341e62a5105b7c007291fd0c7f8993784e1f4c72b1df066aa8 +size 194777 diff --git a/Assets/Sprites/ParticleCloudWhite.png b/Assets/Sprites/ParticleCloudWhite.png index f05e1b3..7ba1fe3 100644 Binary files a/Assets/Sprites/ParticleCloudWhite.png and b/Assets/Sprites/ParticleCloudWhite.png differ diff --git a/Assets/Sprites/circledither1.aseprite b/Assets/Sprites/circledither1.aseprite index 6581432..a265c1b 100644 Binary files a/Assets/Sprites/circledither1.aseprite and b/Assets/Sprites/circledither1.aseprite differ diff --git a/Assets/Sprites/grassGround.png b/Assets/Sprites/grassGround.png index 3b553ad..2eedd6f 100644 Binary files a/Assets/Sprites/grassGround.png and b/Assets/Sprites/grassGround.png differ diff --git a/Assets/Sprites/grassUp.png b/Assets/Sprites/grassUp.png index a1df7ea..a483a6b 100644 Binary files a/Assets/Sprites/grassUp.png and b/Assets/Sprites/grassUp.png differ diff --git a/Assets/Sprites/health.aseprite b/Assets/Sprites/health.aseprite index c514248..941c7a7 100644 Binary files a/Assets/Sprites/health.aseprite and b/Assets/Sprites/health.aseprite differ diff --git a/Assets/Sprites/presents.aseprite b/Assets/Sprites/presents.aseprite index e6ba914..b616447 100644 Binary files a/Assets/Sprites/presents.aseprite and b/Assets/Sprites/presents.aseprite differ diff --git a/Assets/Sprites/presentsVignette.aseprite b/Assets/Sprites/presentsVignette.aseprite index 1847ff9..3bebb48 100644 Binary files a/Assets/Sprites/presentsVignette.aseprite and b/Assets/Sprites/presentsVignette.aseprite differ diff --git a/Assets/Sprites/shit hobo happy.aseprite b/Assets/Sprites/shit hobo happy.aseprite index 1b1b8a1..fd8f00c 100644 Binary files a/Assets/Sprites/shit hobo happy.aseprite and b/Assets/Sprites/shit hobo happy.aseprite differ diff --git a/Assets/Sprites/vignetteffect.aseprite b/Assets/Sprites/vignetteffect.aseprite index 697d866..6f5238f 100644 Binary files a/Assets/Sprites/vignetteffect.aseprite and b/Assets/Sprites/vignetteffect.aseprite differ diff --git a/Assets/Sprites/whiteCircle.aseprite b/Assets/Sprites/whiteCircle.aseprite index 08da6a9..9cf2bb4 100644 Binary files a/Assets/Sprites/whiteCircle.aseprite and b/Assets/Sprites/whiteCircle.aseprite differ diff --git a/Assets/Sprites/whiteCircleOutline.aseprite b/Assets/Sprites/whiteCircleOutline.aseprite index a8ae48a..c149348 100644 Binary files a/Assets/Sprites/whiteCircleOutline.aseprite and b/Assets/Sprites/whiteCircleOutline.aseprite differ diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.png b/Assets/TextMesh Pro/Sprites/EmojiOne.png index 63e49d0..c0de66d 100644 Binary files a/Assets/TextMesh Pro/Sprites/EmojiOne.png and b/Assets/TextMesh Pro/Sprites/EmojiOne.png differ diff --git a/Assets/TutorialInfo/Icons/URP.png b/Assets/TutorialInfo/Icons/URP.png index bdbf408..6194a80 100644 Binary files a/Assets/TutorialInfo/Icons/URP.png and b/Assets/TutorialInfo/Icons/URP.png differ diff --git a/Assets/models/NPC/mothClose.png b/Assets/models/NPC/mothClose.png index 0a5132e..0902c76 100644 Binary files a/Assets/models/NPC/mothClose.png and b/Assets/models/NPC/mothClose.png differ diff --git a/Assets/models/NPC/mouthClosed.png b/Assets/models/NPC/mouthClosed.png index 40a8558..b41d37a 100644 Binary files a/Assets/models/NPC/mouthClosed.png and b/Assets/models/NPC/mouthClosed.png differ diff --git a/Assets/models/NPC/mouthOpemn.png b/Assets/models/NPC/mouthOpemn.png index f513a8e..09535d0 100644 Binary files a/Assets/models/NPC/mouthOpemn.png and b/Assets/models/NPC/mouthOpemn.png differ