progtime/ZoFo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixeeeees

Browse source
This commit is contained in:
polten0 2024-08-18 14:44:38 +03:00
parent d0db438d37
commit 0d34a8e8cd
22 changed files with 3 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ZoFo/Content/Content.mgcb
View file

@ -362,8 +362,7 @@
/processorParam:ResizeToPowerOfTwo=False /processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False /processorParam:MakeSquare=False
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
<<<<<<< HEAD
=======
/build:Textures/GUI/switch.png /build:Textures/GUI/switch.png
#begin Textures/icons/12.png #begin Textures/icons/12.png
@ -496,7 +495,7 @@
/processorParam:ResizeToPowerOfTwo=False /processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False /processorParam:MakeSquare=False
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
>>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
/build:Textures/Test/pickaxe.webp /build:Textures/Test/pickaxe.webp
#begin Textures/Test/rock.jpg #begin Textures/Test/rock.jpg
@ -535,11 +534,8 @@
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Textures/Test/wood.jpg /build:Textures/Test/wood.jpg
<<<<<<< HEAD
#begin Textures/TileSetImages/Pipes.png #begin Textures/TileSetImages/Pipes.png
=======
#begin Textures/TileSets/Tilelist1.png
>>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255 /processorParam:ColorKeyColor=255,0,255,255
@ -549,11 +545,9 @@
/processorParam:ResizeToPowerOfTwo=False /processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False /processorParam:MakeSquare=False
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Textures/TileSetImages/Pipes.png /build:Textures/TileSetImages/Pipes.png
#begin Textures/TileSetImages/Tilelist1.png #begin Textures/TileSetImages/Tilelist1.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255 /processorParam:ColorKeyColor=255,0,255,255
@ -563,14 +557,10 @@
/processorParam:ResizeToPowerOfTwo=False /processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False /processorParam:MakeSquare=False
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
<<<<<<< HEAD
/build:Textures/TileSetImages/Tilelist1.png /build:Textures/TileSetImages/Tilelist1.png
#begin Textures/TileSetImages/Tilelist2.png #begin Textures/TileSetImages/Tilelist2.png
=======
/build:Textures/TileSets/Tilelist2.png
#begin Textures/TileSets/Tilelist3.png
/importer:TextureImporter /importer:TextureImporter
/processor:TextureProcessor /processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255 /processorParam:ColorKeyColor=255,0,255,255
@ -580,44 +570,7 @@
/processorParam:ResizeToPowerOfTwo=False /processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False /processorParam:MakeSquare=False
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Textures/TileSets/Tilelist3.png
#begin Textures/TileSets/Tilelist4.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Textures/TileSets/Tilelist4.png
#begin Textures/TileSets/TilesetFloor.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:Textures/TileSets/TilesetFloor.png
#begin Textures/TileSets/TilesetFloor.png
>>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
<<<<<<< HEAD
/build:Textures/TileSetImages/Tilelist2.png /build:Textures/TileSetImages/Tilelist2.png
#begin Textures/TileSetImages/Tilelist3.png #begin Textures/TileSetImages/Tilelist3.png
@ -835,7 +788,4 @@
/processorParam:MakeSquare=False /processorParam:MakeSquare=False
/processorParam:TextureFormat=Color /processorParam:TextureFormat=Color
/build:Textures/TileSetImages/TilesetWater.png /build:Textures/TileSetImages/TilesetWater.png
=======
/build:Textures/TileSets/TilesetFloor.png
>>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d

0
ZoFo/Content/Textures/TileSets/Pipes.png → ZoFo/Content/Textures/TileSetImages/Pipes.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
ZoFo/Content/Textures/TileSets/Tilelist1.png → ZoFo/Content/Textures/TileSetImages/Tilelist1.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 769 KiB

After

Width:  |  Height:  |  Size: 769 KiB

0
ZoFo/Content/Textures/TileSets/Tilelist2.png → ZoFo/Content/Textures/TileSetImages/Tilelist2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 578 KiB

After

Width:  |  Height:  |  Size: 578 KiB

0
ZoFo/Content/Textures/TileSets/Tilelist3.png → ZoFo/Content/Textures/TileSetImages/Tilelist3.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

0
ZoFo/Content/Textures/TileSets/Tilelist4.png → ZoFo/Content/Textures/TileSetImages/Tilelist4.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

0
ZoFo/Content/Textures/TileSets/TilesetDesert.png → ZoFo/Content/Textures/TileSetImages/TilesetDesert.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
ZoFo/Content/Textures/TileSets/TilesetDungeon.png → ZoFo/Content/Textures/TileSetImages/TilesetDungeon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
ZoFo/Content/Textures/TileSets/TilesetElement.png → ZoFo/Content/Textures/TileSetImages/TilesetElement.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
ZoFo/Content/Textures/TileSets/TilesetField.png → ZoFo/Content/Textures/TileSetImages/TilesetField.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
ZoFo/Content/Textures/TileSets/TilesetFloor.png → ZoFo/Content/Textures/TileSetImages/TilesetFloor.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
ZoFo/Content/Textures/TileSets/TilesetFloorB.png → ZoFo/Content/Textures/TileSetImages/TilesetFloorB.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

0
ZoFo/Content/Textures/TileSets/TilesetFloorDetail.png → ZoFo/Content/Textures/TileSetImages/TilesetFloorDetail.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
ZoFo/Content/Textures/TileSets/TilesetHole.png → ZoFo/Content/Textures/TileSetImages/TilesetHole.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
ZoFo/Content/Textures/TileSets/TilesetHouse.png → ZoFo/Content/Textures/TileSetImages/TilesetHouse.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

0
ZoFo/Content/Textures/TileSets/TilesetLogic.png → ZoFo/Content/Textures/TileSetImages/TilesetLogic.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
ZoFo/Content/Textures/TileSets/TilesetNature.png → ZoFo/Content/Textures/TileSetImages/TilesetNature.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

0
ZoFo/Content/Textures/TileSets/TilesetRelief.png → ZoFo/Content/Textures/TileSetImages/TilesetRelief.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
ZoFo/Content/Textures/TileSets/TilesetReliefDetail.png → ZoFo/Content/Textures/TileSetImages/TilesetReliefDetail.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 6 KiB

0
ZoFo/Content/Textures/TileSets/TilesetTowers.png → ZoFo/Content/Textures/TileSetImages/TilesetTowers.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
ZoFo/Content/Textures/TileSets/TilesetVillageAbandoned.png → ZoFo/Content/Textures/TileSetImages/TilesetVillageAbandoned.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
ZoFo/Content/Textures/TileSets/TilesetWater.png → ZoFo/Content/Textures/TileSetImages/TilesetWater.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB