Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

2020-02-01 09:55:35 -05:00
parent 2e29aa91a2 96e7318a91
commit bc7d2eb08b
16 changed files with 15577 additions and 168 deletions
--- a/Assets/Sprites/Controls.meta
+++ b/Assets/Sprites/Controls.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 394b12e250ac73549b5a1bd20b0c4910
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Square.png.meta
+++ b/Assets/Sprites/Square.png.meta
@@ -45,7 +45,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 2
+  spritePixelsToUnits: 4
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1