• Joined on 2023-01-19
mika synced and deleted reference refs/tags/refs/pull/3474/merge at mika/pokerogue from mirror 2024-09-12 12:52:31 +02:00
mika synced commits to mystery-encounters at mika/pokerogue from mirror 2024-09-12 12:52:31 +02:00
cfcfa84e72 Merge pull request #4189 from ben-lear/mystery-encounters
2ca4581fc4 resolve conflicts with beta branch
7ed7fec808 [BUG][UI/UX] Correction of errors when `` Save & Quit` and ` Log out`` (#3105)
28012b8d85 [Bug] Fixes Freezy Frost visual bug when attacking ally, and Freezy Frost not applying effects when fainting a target (#3753)
6decd918e5 [Enhancement] Implement Tera-based form changes (Ogerpon and Terapagos) (#4147)
Compare 14 commits »
mika synced commits to beta at mika/pokerogue from mirror 2024-09-12 12:52:31 +02:00
2f0a53ba46 [Sprite] Added default head spots to spinda (#4188)
0af59bbb14 [Refactor] Fix linter issue (#4191)
7ed7fec808 [BUG][UI/UX] Correction of errors when `` Save & Quit` and ` Log out`` (#3105)
Compare 3 commits »
mika synced commits to refs/pull/4168/merge at mika/pokerogue from mirror 2024-09-12 04:42:43 +02:00
b33d86a1db [BUG] Make Tate & Liza have seeded randomness #4175
ce9a75f074 Replace vi.fn() with () => null whenenver possible (#4182)
89dac46dfc [Localization] Localization batch - [Not meant to be merged until last minute] (#4127)
Compare 4 commits »
mika synced commits to refs/pull/4113/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
d4cd74c8b7 [P2 Bug] Baddy Bad shouldn't activate Reflect if the target uses Protect, make gravity and water/mud sport ignore protect(#4180)
Compare 30 commits »
mika synced commits to refs/pull/4063/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
6decd918e5 [Enhancement] Implement Tera-based form changes (Ogerpon and Terapagos) (#4147)
8195373824 [Move] Add Retaliate double damage condition (#1831)
91d266ea74 [Bug] Burning Bulwark, King's Shield, Obstruct and Silk Trap no longer protect against status moves. (#4106)
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
Compare 14 commits »
mika synced commits to refs/pull/4071/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
Compare 33 commits »
mika synced commits to refs/pull/4082/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
Compare 30 commits »
mika synced commits to refs/pull/4106/head at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
1cf4b28051 List relevant moves in tsdocs
38b4d3ddc8 Add tsdocs for new/modified classes
8fd0496ffa Merge branch 'beta' into fix-obstruct
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
18dc1029b7 [Misc] Update issue/feature template (#4148)
Compare 63 commits »
mika synced commits to refs/pull/4127/head at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
fa66917a7b Update pokemon-info.json
ee3470be1e Update pokemon-summary.json
e872310735 Update party-ui-handler.json
8f18b9c190 Update modifier-type.json
5e643e6b3c Update dialogue.json
Compare 95 commits »
mika synced commits to refs/pull/4137/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
d4cd74c8b7 [P2 Bug] Baddy Bad shouldn't activate Reflect if the target uses Protect, make gravity and water/mud sport ignore protect(#4180)
Compare 29 commits »
mika synced commits to refs/pull/4145/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
d4cd74c8b7 [P2 Bug] Baddy Bad shouldn't activate Reflect if the target uses Protect, make gravity and water/mud sport ignore protect(#4180)
Compare 29 commits »
mika synced commits to refs/pull/4164/head at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
8ede41fa6c Merge branch 'beta' into prabbyd-bug3984SecondBranch
50a7500561 [Sprite] Fix animated Cursola (#4186)
77ad55470a Merge branch 'prabbyd-bug3984SecondBranch' of github.com:PrabbyDD/pokerogue into prabbyd-bug3984SecondBranch
62cd24c00b Cleaned up more code and added case for double shock
8f8d23729f Merge branch 'beta' into prabbyd-bug3984SecondBranch
Compare 28 commits »
mika synced commits to refs/pull/4164/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
6decd918e5 [Enhancement] Implement Tera-based form changes (Ogerpon and Terapagos) (#4147)
8195373824 [Move] Add Retaliate double damage condition (#1831)
91d266ea74 [Bug] Burning Bulwark, King's Shield, Obstruct and Silk Trap no longer protect against status moves. (#4106)
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
Compare 19 commits »
mika synced commits to refs/pull/4165/head at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
ef8696fd5b Update src/ui/move-info-overlay.ts
mika synced commits to refs/pull/4165/merge at mika/pokerogue from mirror 2024-09-12 04:42:42 +02:00
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
Compare 12 commits »
mika synced commits to refs/pull/3974/merge at mika/pokerogue from mirror 2024-09-12 04:42:41 +02:00
47730cc5fc Merge 8e82dfae45515cd6df8e0e386749accdbd05c016 into 6decd918e5
8e82dfae45 Merge branch 'beta' into refactor-move-phase
6decd918e5 [Enhancement] Implement Tera-based form changes (Ogerpon and Terapagos) (#4147)
8195373824 [Move] Add Retaliate double damage condition (#1831)
91d266ea74 [Bug] Burning Bulwark, King's Shield, Obstruct and Silk Trap no longer protect against status moves. (#4106)
Compare 38 commits »
mika synced commits to refs/pull/4056/merge at mika/pokerogue from mirror 2024-09-12 04:42:41 +02:00
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
18dc1029b7 [Misc] Update issue/feature template (#4148)
f294f034aa [Bug] Run History displays Pokemon that have their natures changed during the run (#4149)
fec218b747 [Refactor] setTypeIcons explicitly handles null, mark it as such (#4155)
Compare 35 commits »
mika synced commits to refs/pull/4054/merge at mika/pokerogue from mirror 2024-09-12 04:42:41 +02:00
8195373824 [Move] Add Retaliate double damage condition (#1831)
91d266ea74 [Bug] Burning Bulwark, King's Shield, Obstruct and Silk Trap no longer protect against status moves. (#4106)
951b568590 [Documentation] Add some tsdocs to move.ts, mark rollout and iceball (P) (#4099)
18dc1029b7 [Misc] Update issue/feature template (#4148)
Compare 79 commits »
mika synced commits to refs/pull/4019/merge at mika/pokerogue from mirror 2024-09-12 04:42:41 +02:00
28012b8d85 [Bug] Fixes Freezy Frost visual bug when attacking ally, and Freezy Frost not applying effects when fainting a target (#3753)
6decd918e5 [Enhancement] Implement Tera-based form changes (Ogerpon and Terapagos) (#4147)
8195373824 [Move] Add Retaliate double damage condition (#1831)
91d266ea74 [Bug] Burning Bulwark, King's Shield, Obstruct and Silk Trap no longer protect against status moves. (#4106)
Compare 15 commits »