merge with main

2021-12-08 23:06:13 -06:00
parent 8d119ff0c9 b4f9118ff8
commit eef06ebd8f
106 changed files with 1735 additions and 1277 deletions
--- a/Sprites/Levels/Interactables/icekey.png.import
+++ b/Sprites/Levels/Interactables/icekey.png.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false