Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Sprite] Hotfix cut off Binacle sprite #4741

Merged
merged 10 commits into from
Oct 27, 2024
Merged

[Sprite] Hotfix cut off Binacle sprite #4741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b101eb7
Trim 688.json duration
chaosgrimmon Oct 27, 2024
e19a1c6
Trim 688.json duration
chaosgrimmon Oct 27, 2024
e954dbb
Fix cut off Binacle back
chaosgrimmon Oct 27, 2024
bdacbe1
Fix cut off shiny Binacle back
chaosgrimmon Oct 27, 2024
23f0a28
Bump version
chaosgrimmon Oct 27, 2024
4bb8cfb
Bump version
chaosgrimmon Oct 27, 2024
f6a444e
Revert cutting off hair
chaosgrimmon Oct 27, 2024
40024df
Revert cutting off hair
chaosgrimmon Oct 27, 2024
67677cf
Remove trailing comma
chaosgrimmon Oct 27, 2024
d817879
Remove trailing comma
chaosgrimmon Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pokemon-rogue-battle",
"private": true,
"version": "1.1.3",
"version": "1.1.4",
"type": "module",
"scripts": {
"start": "vite",
Expand Down
3 changes: 1 addition & 2 deletions public/images/pokemon/688.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 63 },
"sourceSize": { "w": 64, "h": 63 },
"duration": 100
"sourceSize": { "w": 64, "h": 63 }
}
],
"meta": {
Expand Down
58 changes: 18 additions & 40 deletions public/images/pokemon/back/688.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,19 @@
{
"textures": [
{
"image": "688.png",
"format": "RGBA8888",
"size": {
"w": 52,
"h": 52
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 41,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 41,
"h": 52
},
"frame": {
"x": 0,
"y": 0,
"w": 41,
"h": 52
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:ea462f2b1b46327e3b8fcb7ec5e44f08:2d2598cc03dec73182dbea237ad83b34:176060351d0044923af938ba7932a6ef$"
}
{ "frames": [
{
"filename": "0001.png",
"frame": { "x": 0, "y": 0, "w": 51, "h": 65 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 51, "h": 65 },
"sourceSize": { "w": 51, "h": 65 }
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3.7-dev",
"image": "688.png",
"format": "I8",
"size": { "w": 51, "h": 65 },
"scale": "1"
}
}
58 changes: 18 additions & 40 deletions public/images/pokemon/back/shiny/688.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,19 @@
{
"textures": [
{
"image": "688.png",
"format": "RGBA8888",
"size": {
"w": 52,
"h": 52
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 41,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 41,
"h": 52
},
"frame": {
"x": 0,
"y": 0,
"w": 41,
"h": 52
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:0261b6c9242bba728fcfbfc515875b27:de0d9ddceed9311b33ae50ba86e969d1:176060351d0044923af938ba7932a6ef$"
}
{ "frames": [
{
"filename": "0001.png",
"frame": { "x": 0, "y": 0, "w": 51, "h": 65 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 51, "h": 65 },
"sourceSize": { "w": 51, "h": 65 }
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3.7-dev",
"image": "688.png",
"format": "I8",
"size": { "w": 51, "h": 65 },
"scale": "1"
}
}
3 changes: 1 addition & 2 deletions public/images/pokemon/shiny/688.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 63 },
"sourceSize": { "w": 64, "h": 63 },
"duration": 100
"sourceSize": { "w": 64, "h": 63 }
}
],
"meta": {
Expand Down
Loading