Merge remote-tracking branch 'upstream/main' into mist-fix

This commit is contained in:
innerthunder 2024-10-27 19:34:41 -07:00
commit cf7bf78e91
8 changed files with 144 additions and 320 deletions

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658-ash.png", "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 79, "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
"h": 79 "sourceSize": { "w": 79, "h": 74 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 79, "h": 74 },
"w": 79, "scale": "1"
"h": 74 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 79,
"h": 74
},
"frame": {
"x": 0,
"y": 0,
"w": 79,
"h": 74
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:936f62fa49ba4d6e402bb2e2eaf2afd0:ed00ba047a44b4bf1309bc147dd000e3:bfbf521a5c7bd80bcd95a96d9789c0dd$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658.png", "frame": { "x": 0, "y": 0, "w": 85, "h": 67 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 75, "spriteSourceSize": { "x": 0, "y": 0, "w": 85, "h": 67 },
"h": 75 "sourceSize": { "w": 85, "h": 67 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 85, "h": 67 },
"w": 75, "scale": "1"
"h": 65 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 75,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 75,
"h": 65
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:e0b10df331bd4ce6760edab61dee144b:061561c45beff89a92bf0158d065204f:5affcab976148657d36bf4ff3410f92d$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658-ash.png", "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 73, "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
"h": 73 "sourceSize": { "w": 73, "h": 73 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 73, "h": 73 },
"w": 73, "scale": "1"
"h": 69 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 73,
"h": 69
},
"frame": {
"x": 0,
"y": 0,
"w": 73,
"h": 69
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:4f38801bb3afeda5faff04bdcf6a666f:0c78ce2715e7510bf55da0a92b42661c:bfbf521a5c7bd80bcd95a96d9789c0dd$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658.png", "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 77, "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
"h": 77 "sourceSize": { "w": 77, "h": 77 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 77, "h": 77 },
"w": 77, "scale": "1"
"h": 65 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 77,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 77,
"h": 65
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:acdb9925f3f23b947504eec7cc28c92d:1a13d9d418f6c107bb9e5d621d9154bb:5affcab976148657d36bf4ff3410f92d$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658-ash.png", "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 73, "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
"h": 73 "sourceSize": { "w": 73, "h": 73 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 73, "h": 73 },
"w": 73, "scale": "1"
"h": 69 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 73,
"h": 69
},
"frame": {
"x": 0,
"y": 0,
"w": 73,
"h": 69
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:d474b821316a87dfe09b397bdc2db5ef:497de0c2ec59ceba163e870b3226c76c:bfbf521a5c7bd80bcd95a96d9789c0dd$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658.png", "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 77, "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
"h": 77 "sourceSize": { "w": 77, "h": 77 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 77, "h": 77 },
"w": 77, "scale": "1"
"h": 65 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 77,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 77,
"h": 65
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:5891f87a78022cde3402e7d9714cc7bf:756360084290e39c139e3fef91c81759:5affcab976148657d36bf4ff3410f92d$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658-ash.png", "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 79, "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
"h": 79 "sourceSize": { "w": 79, "h": 74 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 79, "h": 74 },
"w": 79, "scale": "1"
"h": 74 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 79,
"h": 74
},
"frame": {
"x": 0,
"y": 0,
"w": 79,
"h": 74
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:3dd081ba5490f090a73de8423aac2f6b:f088fafaea755476f2abf488e7340cab:bfbf521a5c7bd80bcd95a96d9789c0dd$"
}
} }

View File

@ -1,41 +1,19 @@
{ { "frames": [
"textures": [ {
{ "filename": "0001.png",
"image": "658.png", "frame": { "x": 0, "y": 0, "w": 85, "h": 67 },
"format": "RGBA8888", "rotated": false,
"size": { "trimmed": false,
"w": 75, "spriteSourceSize": { "x": 0, "y": 0, "w": 85, "h": 67 },
"h": 75 "sourceSize": { "w": 85, "h": 67 },
}, "duration": 100
"scale": 1, }
"frames": [ ],
{ "meta": {
"filename": "0001.png", "app": "https://www.aseprite.org/",
"rotated": false, "version": "1.3.7-x64",
"trimmed": false, "format": "I8",
"sourceSize": { "size": { "w": 85, "h": 67 },
"w": 75, "scale": "1"
"h": 65 }
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 75,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 75,
"h": 65
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:be07c062265a19e890f1e2d2d1b5527d:ad4583a5a0498c496e9a93574c55ee03:5affcab976148657d36bf4ff3410f92d$"
}
} }