-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove screen inversion if move animations are off * [Sprite] Shiny Minior Fixes (#2876) * [Sprite] Shiny Meteor Minior not in shell Taken from non-shiny sprite and animation. * [Sprite] Back shiny Meteor Minior not in shell Taken from non-shiny sprite and animation. * [Sprite] Shiny exp Minior Cores wrong colours * [Sprite] Shiny exp Minior Core backs wrong colours * Change some voucher icons in achievements (#2616) * [Bug] Fix hard press bp and pp (#2441) * Fix hard press bp and pp * Hard Press should have a max bp of 100 * Fix typo for acc * Add test * [Localization] Implement pokemon forms localization (#1685) * Implement Pokemon forms localization * Update French pokemon-form.ts * Update French pokemon-form.ts * Update pokemon-form.ts * Add battle forms korean translation from returntoice Co-authored-by: returntoice <dieandbecome@gmail.com> * Add cosplay forms korean translation from returntoice Co-authored-by: returntoice <dieandbecome@gmail.com> * Add pichu form korean translation from returntoice Co-authored-by: returntoice <dieandbecome@gmail.com> * Add castform forms korean translation by returntoice Co-authored-by: returntoice <dieandbecome@gmail.com> * Add remaining forms korean translation by returntoice Co-authored-by: returntoice <dieandbecome@gmail.com> * French typo corrections pokemon-form.ts * Update Korean pokemon-form.ts * Modify froakiBattleBond like rockruff of OwnTempo case, it is froakie, not greninja. * Modify zygardePc Power construct is more important information Switch its position to 50% or 10% to avoid overlapping with the sprite * Modify mispelling * Added german forms * Changed Gigadynamax and Unendynamax so it fits at all * Add partner pikachu and eevee form localization * Add mimikyu forms localization * Partner Pikachu, Partner Evoli und Mimikyu Formen hinzugefügt * Update pokemon-form.ts * Update partners * Fix conflicts * Fix useless ? by flx-sta Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Fix switch use by flx-sta * Fix conflicts * Please work !!!!!!! * Update src/locales/fr/pokemon-form.ts Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr> * Update src/locales/fr/pokemon-form.ts Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr> * Add pt_br primal localization Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Add pt_br pikachu localization Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Add pt_br castform localization Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Add pt_br 3g localization Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Add zh_cn localization Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Add pt_br other localization Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Add es castform localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es burmy localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es shellos localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es rotom localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es basculin localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es deerling localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es froakie localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es scatterbug localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es furfrou localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es xerneas localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es zygarde localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es pumpkaboo localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es flabebe localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es oricorio localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es minior localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es magearna localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es marshadow localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es sinistea ocalization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es eiscue localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es indeedee localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es rockruff localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es mimikyu localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es zarude localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es squawkabilly localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es tatsugiri localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es gimmighoul localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es poltchageit localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es paldeaTauros localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es primal localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es pikachu localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Add es partner localization Co-authored-by: InnocentGameDev <asdargmng@gmail.com> * Fix typedocs error * Fix typedocs error * cn form prefix added Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Fix german translate error * Fix typo Zh_CN Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com> * Update src/locales/es/pokemon-form.ts Co-authored-by: InnocentGameDev <asdargmng@gmail.com> --------- Co-authored-by: Lugiad <adrien.grivel@hotmail.fr> Co-authored-by: returntoice <dieandbecome@gmail.com> Co-authored-by: Mr.WaterT <water.t.works@gmail.com> Co-authored-by: MrWaterT <87186129+MrWaterT@users.noreply.github.com> Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Benjamin Odom <bennybroseph@gmail.com> Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> Co-authored-by: InnocentGameDev <asdargmng@gmail.com> Co-authored-by: EnochG1 <enoch.jwsong@gmail.com> Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com> * fix description of REVIVER_SEED to contain direct-hit detail (#2813) * fix en & de description of REVIVER_SEED. add todo for other languages * Update src/locales/fr/modifier-type.ts Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr> * Update src/locales/pt_BR/modifier-type.ts Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> * Update src/locales/zh_CN/modifier-type.ts Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Update src/locales/zh_TW/modifier-type.ts Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * remove trailing spaces in zh_TW/_CN * Update src/locales/de/modifier-type.ts Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/de/modifier-type.ts * Update src/locales/es/modifier-type.ts Co-authored-by: ReneGV <renegv94@gmail.com> * Update src/locales/ko/modifier-type.ts Co-authored-by: Enoch <enoch.jwsong@gmail.com> * remove trailing spaces * Update src/locales/it/modifier-type.ts --------- Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr> Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com> Co-authored-by: ReneGV <renegv94@gmail.com> Co-authored-by: Enoch <enoch.jwsong@gmail.com> * modify wrong config path (ko) (#2895) * Revert (#2895) and (#1685) (#2896) * Revert "modify wrong config path (ko) (#2895)" This reverts commit 40a31b1. * Revert "[Localization] Implement pokemon forms localization (#1685)" This reverts commit 41c05bf. * This should prevent gym leaders appear as doubles (marnie & piers) when they arent fixed battles --------- Co-authored-by: Temps Ray <temps.ray@gmail.com> Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com> Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt> Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com> Co-authored-by: Kiriox <66013753+Kiriox94@users.noreply.github.com> Co-authored-by: Lugiad <adrien.grivel@hotmail.fr> Co-authored-by: returntoice <dieandbecome@gmail.com> Co-authored-by: Mr.WaterT <water.t.works@gmail.com> Co-authored-by: MrWaterT <87186129+MrWaterT@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Benjamin Odom <bennybroseph@gmail.com> Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> Co-authored-by: InnocentGameDev <asdargmng@gmail.com> Co-authored-by: EnochG1 <enoch.jwsong@gmail.com> Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com> Co-authored-by: ReneGV <renegv94@gmail.com> Co-authored-by: Dmitriy K <kagno.dmitriy@gmail.com>
- Loading branch information
1 parent
7486290
commit 2f2c8ba
Showing
32 changed files
with
211 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,41 @@ | ||
{ | ||
"textures": [ | ||
{ | ||
"image": "774.png", | ||
"format": "RGBA8888", | ||
"size": { | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"scale": 1, | ||
"frames": [ | ||
{ | ||
"filename": "0001.png", | ||
"rotated": false, | ||
"trimmed": false, | ||
"sourceSize": { | ||
"w": 37, | ||
"h": 35 | ||
}, | ||
"spriteSourceSize": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 35 | ||
}, | ||
"frame": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 35 | ||
} | ||
} | ||
] | ||
} | ||
], | ||
"meta": { | ||
"app": "https://www.codeandweb.com/texturepacker", | ||
"version": "3.0", | ||
"smartupdate": "$TexturePacker:SmartUpdate:fa61a53a0684a1d00e0ed5d6737743af:3e6463caf33bbb58cfba4bd9c20890aa:37281ac0aa1e619ef385b889b64064b7$" | ||
} | ||
} | ||
{ | ||
"textures": [ | ||
{ | ||
"image": "774.png", | ||
"format": "RGBA8888", | ||
"size": { | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"scale": 1, | ||
"frames": [ | ||
{ | ||
"filename": "0001.png", | ||
"rotated": false, | ||
"trimmed": false, | ||
"sourceSize": { | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"spriteSourceSize": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"frame": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 37 | ||
} | ||
} | ||
] | ||
} | ||
], | ||
"meta": { | ||
"app": "https://www.codeandweb.com/texturepacker", | ||
"version": "3.0", | ||
"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$" | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,41 @@ | ||
{ | ||
"textures": [ | ||
{ | ||
"image": "774.png", | ||
"format": "RGBA8888", | ||
"size": { | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"scale": 1, | ||
"frames": [ | ||
{ | ||
"filename": "0001.png", | ||
"rotated": false, | ||
"trimmed": false, | ||
"sourceSize": { | ||
"w": 37, | ||
"h": 35 | ||
}, | ||
"spriteSourceSize": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 35 | ||
}, | ||
"frame": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 35 | ||
} | ||
} | ||
] | ||
} | ||
], | ||
"meta": { | ||
"app": "https://www.codeandweb.com/texturepacker", | ||
"version": "3.0", | ||
"smartupdate": "$TexturePacker:SmartUpdate:29265d2eed2689ecb95874383b7e7da7:1339971def468ab6d7c93a72472c7b3d:37281ac0aa1e619ef385b889b64064b7$" | ||
} | ||
} | ||
{ | ||
"textures": [ | ||
{ | ||
"image": "774.png", | ||
"format": "RGBA8888", | ||
"size": { | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"scale": 1, | ||
"frames": [ | ||
{ | ||
"filename": "0001.png", | ||
"rotated": false, | ||
"trimmed": false, | ||
"sourceSize": { | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"spriteSourceSize": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 37 | ||
}, | ||
"frame": { | ||
"x": 0, | ||
"y": 0, | ||
"w": 37, | ||
"h": 37 | ||
} | ||
} | ||
] | ||
} | ||
], | ||
"meta": { | ||
"app": "https://www.codeandweb.com/texturepacker", | ||
"version": "3.0", | ||
"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$" | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.