mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-06 08:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,928 Commits 8 Branches 8 Tags 2.7 GiB
676482fa30
Commit Graph

1928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chacolay
676482fa30 Merge branch 'pr/333' 2024-04-29 12:06:09 -04:00
Chacolay
a32ba073d0 Merge branch 'pr/330' 2024-04-29 12:02:59 -04:00
Chacolay
681dc8e066 Merge branch 'pr/322' 2024-04-29 11:59:28 -04:00
Chacolay
83ff7e211b Merge branch 'pr/307' 2024-04-29 11:58:13 -04:00
Chacolay
331a88906f Merge branch 'pr/320' 2024-04-29 11:55:41 -04:00
Chacolay
0266d5b8c2 Merge branch 'pr/298' 2024-04-29 11:48:27 -04:00
Chacolay
2a604a6733 Merge branch 'pr/289' 2024-04-29 11:45:47 -04:00
Chacolay
0cfdcfaaad Merge branch 'pr/285' 2024-04-29 11:44:18 -04:00
Chacolay
9064ce89ec Merge branch 'pr/281' 2024-04-29 11:42:43 -04:00
Chacolay
352d3d5be0 Merge branch 'pr/272' 2024-04-29 11:40:15 -04:00
Chacolay
362e42e933 Merge branch 'pr/260' 2024-04-29 11:36:09 -04:00
Chacolay
95a5ba2349 Fix merge overwrite issues 2024-04-29 11:33:20 -04:00
Chacolay
53731e6bca Merge branch 'pr/259' 2024-04-29 11:31:23 -04:00
Chacolay
05913ae7b2 Merge branch 'pr/254' 2024-04-29 11:26:38 -04:00
Chacolay
8f079c858d Merge branch 'pr/246' 2024-04-29 11:23:48 -04:00
Thomas David
77bf8ae266
Merge branch 'pagefaultgames:main' into tutorial-localisation 2024-04-29 17:21:06 +02:00
Chacolay
9b881d74a3 Merge branch 'pr/243' 2024-04-29 11:17:14 -04:00
Chacolay
e1071615a3 Merge branch 'pr/241' 2024-04-29 11:16:15 -04:00
Chacolay
9dd806f775 Merge branch 'pr/240' 2024-04-29 11:15:24 -04:00
Chacolay
6ecddc4bc7 Merge branch 'pr/238' 2024-04-29 11:13:53 -04:00
Chacolay
28739c30fb Merge branch 'pr/235' 2024-04-29 11:10:18 -04:00
Chacolay
e45fb0419f Merge branch 'pr/232' 2024-04-29 11:09:36 -04:00
Thomas David
c69cbbd70b Add lines breaks in localisation files 2024-04-29 17:07:34 +02:00
Chacolay
e709074211 Merge branch 'pr/227' 2024-04-29 11:07:14 -04:00
Chacolay
6e26025a1c Merge branch 'pr/221' 2024-04-29 11:06:33 -04:00
Chacolay
87b2684328 Merge branch 'pr/205' 2024-04-29 10:59:50 -04:00
Chacolay
fab5d70ac9 Merge branch 'pr/202' 2024-04-29 10:58:42 -04:00
Chacolay
af32b54764 Merge branch 'pr/168' 2024-04-29 10:56:23 -04:00
Chacolay
58e9edd014 Merge branch 'pr/166' 2024-04-29 10:55:04 -04:00
Chacolay
9ddb9920c3 Merge branch 'pr/116' 2024-04-29 10:53:45 -04:00
Dario Krause
d93b6632c8 Gen 2, 3 de local 2024-04-29 10:00:42 -04:00
Dario Krause
116bf7ee18 Gen 1 de local 2024-04-29 08:38:07 -04:00
Justin Gourlay
d5624200b7
Merge branch 'pagefaultgames:main' into main 2024-04-29 08:05:31 -04:00
Madmadness65
b173000008 Implement Alcremie flavors 
...But not all evolution sweets. This way, you can get all the differently colored Alcremies without there being like ~60 different forms.
There currently is an unintended side-effect with Gigantamaxing, where the Alcremie flavor will always switch to Vanilla Cream when reverting to normal, but aside from that, it works fine.
 2024-04-29 01:42:02 -05:00
NxKarim
40f4858690
Merge branch 'main' into side 2024-04-28 23:58:40 -06:00
NxKarim
3731f943a8
Merge branch 'main' into main 2024-04-28 23:54:20 -06:00
AJ Fontaine
7050e0db6c Fixed Outrage etc. lasting 4 turns 2024-04-28 23:57:40 -04:00
lucfd
481d8e2796
removed redundant condition 2024-04-28 23:49:26 -04:00
Xavion3
696c31f3e2 Make grass types unable to be seeded 2024-04-28 23:33:13 -04:00
Flashfyre
891b18592e Disable source map in Vite config 2024-04-28 23:21:22 -04:00
Flashfyre
bc4d1207b9 Disable source map 2024-04-28 23:15:12 -04:00
Madmadness65
b72b4cffed Implement Furfrou forms 
They can be randomly encountered like many other multiple form Pokémon. Like canon, they do not have any statistical changes, just cosmetic.
 2024-04-28 21:58:55 -05:00
Silvestre Emmanuel
d697731018 Reverts adding CRIT as a BattleStat 2024-04-28 20:14:02 -06:00
Flashfyre
9641d77bba Re-add shiny override EXCEPT FALSE THIS TIME 2024-04-28 22:03:29 -04:00
Madmadness65
6f078f4645 Minor fix to Roughneck's possible names 2024-04-28 20:02:06 -05:00
Flashfyre
7115683274 Increment game version 2024-04-28 20:45:04 -04:00
Flashfyre
57ece2c1d7 Revert "Add shiny and variant debug override" 
This reverts commit 21482a641b.
 2024-04-28 20:41:38 -04:00
Flashfyre
0b438d0ff4 Revert "Add temporary double wild shiny chance" 
This reverts commit 4607782578.
 2024-04-28 20:30:12 -04:00
Flashfyre
21482a641b Add shiny and variant debug override 2024-04-28 20:30:03 -04:00
Chacolay
e1a1f32415 Replace touchpad with back button 
mapping multiple inputs to the same command does not seem to work properly(tested with ps5 and xbox controller), so flat replacing touchpad with back button.
 2024-04-28 19:43:14 -04:00