maru
382f1a8d78
Styling changes
2024-04-25 04:01:00 -04:00
NxKarim
5163774fa6
Merge branch 'main' into side
2024-04-25 00:04:24 -06:00
NxKarim
413591ce70
Merge branch 'main' into main
2024-04-24 23:58:12 -06:00
Flashfyre
7032f383ea
Fix battle sprite losing shininess in battle animations
2024-04-25 01:49:06 -04:00
Tempoanon
230c2bf983
Fix Moody and Quark Drive ( #284 )
...
* Fix Quark Drive and Moody
* Telepathy still unimplemented
* more merge conflict stuff
2024-04-25 01:23:45 -04:00
Silvestre Emmanuel
ab8b9f0bfa
Added a way to see the pokemon stats in the Learn Move Phase ( #286 )
...
* Added the move category icon to the fight ui
* Added a way to see the pokemon stats in the Learn Move Phase
-Pressing Button.LEFT now shows the stats summary page
-Pressing Button.RIGHT goes back to move selection page
* Minor nitpicks
---------
Co-authored-by: Silvestre Emmanuel <silvestre.ramirez@wundertec.com>
Co-authored-by: Flashfyre <flashfireex@gmail.com>
2024-04-25 01:18:23 -04:00
lucfd
a762101f64
fixing merge conflicts
2024-04-25 01:07:08 -04:00
Flashfyre
e1800e6040
Fix URLs in index
2024-04-25 01:03:21 -04:00
lucfd
8d0a868dbe
Merge branch 'main' into quickdraw
2024-04-25 01:00:23 -04:00
Madmadness65
608a9d9400
Merge pull request #242 from EggMuncherSupreme/main
...
Added the triageMove() flag to Bouncy Bubble
2024-04-24 23:18:46 -05:00
John Martin
145267c9a6
Fixed leftover text re-corrections. ( #283 )
...
* Minor text corrections to item descriptions.
* Update modifier-type.ts; minor text correction updates
* Update modifier-type.ts; further text re-corrections.
* Update modifier-type.ts; leftover re-corrections.
* Minor text corrections in modifier menu.
2024-04-24 23:29:47 -04:00
maru
7ff82440bc
Add checksum to rsync in deploy job
2024-04-24 23:10:16 -04:00
Luc
a7579745ee
fixed jungle healing only curing the user's status
2024-04-24 23:09:53 -04:00
maru
ac15c653d6
Add no-times to rsync in deploy job
2024-04-24 23:06:42 -04:00
Temps Ray
1bfd601f4c
More merge conflict grrrrrr
2024-04-24 23:06:03 -04:00
Temps Ray
e88b4a216a
merge
2024-04-24 23:04:51 -04:00
Temps Ray
0a5160d029
Merge branch 'main' into misc2
2024-04-24 23:04:34 -04:00
Temps Ray
ffae8cc1fa
Merge branch 'main' into misc2
2024-04-24 22:58:30 -04:00
Luc
c5605c8db1
reduced whitespace
2024-04-24 22:50:13 -04:00
Flashfyre
a0311f4b0f
Fix partial and unimplemented indicators not showing on abilities
2024-04-24 22:42:09 -04:00
Luc
341dd834e3
reduced whitespace
2024-04-24 22:28:30 -04:00
Luc
b084d1f400
jungle healing
2024-04-24 22:26:48 -04:00
Luc
1bbfb354e6
refactor ppreducemoveattr, add to eerie spell
2024-04-24 22:26:07 -04:00
Flashfyre
095667c7c9
Merge branch 'main' of https://github.com/pagefaultgames/pokerogue
2024-04-24 21:24:47 -04:00
Flashfyre
269db12436
Add missing URI component encoding on login
2024-04-24 21:21:28 -04:00
Pablo González
7055ea49c7
Support localization of Pokémon abilities ( #271 )
...
* Support localization of Pokemon abilities
* Reload ability localization when language is changed
* Add Spanish localization for abilities
* Add missing French abilities localization
* Add missing localize call on abilities
---------
Co-authored-by: Flashfyre <flashfireex@gmail.com>
2024-04-24 21:10:09 -04:00
Silvestre Emmanuel
ebad76c335
Added the move category icon to the fight ui
2024-04-24 21:02:56 -04:00
Luc
3a7a103685
implemented poltergeist
2024-04-24 20:07:20 -04:00
Flashfyre
e00ebb49ca
Merge branch 'main' of https://github.com/pagefaultgames/pokerogue
2024-04-24 19:26:13 -04:00
Flashfyre
97218be59c
Add back missing authorization headers
2024-04-24 19:26:04 -04:00
Edralo
dc575d44a3
Implement localisation for pokemon stats & add french locale
2024-04-24 19:12:26 -04:00
Flashfyre
ad818aa314
Add new API url with fallback
2024-04-24 19:08:02 -04:00
lucfd
f42c1dee2d
Merge branch 'main' into main
2024-04-24 17:15:14 -04:00
lucfd
5a3b1657b8
removed UNKNOWN RGB
2024-04-24 17:13:46 -04:00
Luc
2e0cd6faa7
changed to UNKNOWN implementation
2024-04-24 16:59:42 -04:00
arColm
fe38670271
Implement Grassy Glide
2024-04-24 15:24:17 -04:00
Temps Ray
d8bb221eff
Remove unnecessary ohko flag
2024-04-24 15:13:05 -04:00
Flashfyre
d5e462ba7d
Temporarily remove Flamigo from exp sprites
2024-04-24 14:52:05 -04:00
Madmadness65
6b3442a260
Update stone evolution Pokémon's learnsets
...
Moves that are relearned in the official games are now level 1 moves for these Pokémon, as they have paltry movesets otherwise.
2024-04-24 13:40:59 -05:00
Dakurei
37266a7a5d
Fixing typo (fr locales) + Add missing i18n ( #270 )
...
* Fix typo
* Missing usage of i18n
2024-04-24 14:38:46 -04:00
Madmadness65
d88a177915
Fix crash with trainer Mantykes
...
the first evolution method was causing a crash due to a conflict, so it was removed for now.
2024-04-24 12:54:34 -05:00
Madmadness65
4173f87a70
Add easier method of evolving Mantyke
...
There is now an alternate easier evolution method for Mantyke into Mantine, that being having Remoraid simply being registered as caught and be level 32.
2024-04-24 11:58:37 -05:00
Flashfyre
69eec95960
Add missing female Bidoof line variants
2024-04-24 12:56:56 -04:00
Flashfyre
cf3a7dca35
Comment out variant data fix to prevent ability data corruption
2024-04-24 09:26:46 -04:00
Edralo
4ea67976b9
Fix password input types for languages other than english
2024-04-24 08:36:58 -04:00
Flashfyre
adc383a8f9
Add UI support for 2 additional save slots
2024-04-24 01:51:30 -04:00
Juan-Lucas
1b1578d266
command-ui: add i18n for command ui handler and add i18n for fr ( #258 )
...
* command-ui: add i18n for command ui handler and add i18n for fr
* Add missing Spanish file
* Add additional missing localization references
---------
Co-authored-by: Flashfyre <flashfireex@gmail.com>
2024-04-24 00:36:07 -04:00
John Martin
ea40bd18f5
Minor text corrections to item descriptions. ( #255 )
...
* Minor text corrections to item descriptions.
* Update modifier-type.ts; minor text correction updates
* Update modifier-type.ts; further text re-corrections.
2024-04-24 00:28:48 -04:00
arColm
6066d2e47e
Implement Flying Press
2024-04-24 00:26:41 -04:00
Samuel H
9024eeb990
Aggregate Stat Changes ( #266 )
...
* Add stat change aggregation
* Minor fixes to stat change aggregation
2024-04-24 00:25:01 -04:00
