Merge branch 'main' into chris-dev

tsi25 · Feb 5, 2023 · d6eed96 · d6eed96
2 parents d3d1380 + 9d89eb0
commit d6eed96
Show file tree

Hide file tree

Showing 12 changed files with 2,098 additions and 1,418 deletions.
diff --git a/Assets/GGJ 2023/Art/Sprites/MapSprites.meta b/Assets/GGJ 2023/Art/Sprites/MapSprites.meta
diff --git a/Assets/GGJ 2023/Art/Sprites/MapSprites/DirtMap.PNG b/Assets/GGJ 2023/Art/Sprites/MapSprites/DirtMap.PNG
diff --git a/Assets/GGJ 2023/Art/Sprites/MapSprites/DirtMap.PNG.meta b/Assets/GGJ 2023/Art/Sprites/MapSprites/DirtMap.PNG.meta
diff --git a/Assets/GGJ 2023/Art/Sprites/MapSprites/LavaMap.PNG b/Assets/GGJ 2023/Art/Sprites/MapSprites/LavaMap.PNG
diff --git a/Assets/GGJ 2023/Art/Sprites/MapSprites/LavaMap.PNG.meta b/Assets/GGJ 2023/Art/Sprites/MapSprites/LavaMap.PNG.meta
diff --git a/Assets/GGJ 2023/Art/Sprites/MapSprites/WetMap.PNG b/Assets/GGJ 2023/Art/Sprites/MapSprites/WetMap.PNG