• Joined on 2023-01-19
mika synced commits to refs/pull/3938/head at mika/pokerogue from mirror 2024-09-11 20:32:37 +02:00
a30523c2e4 Merge pull request #4170 from ben-lear/mystery-encounters-feedback
2816062d90 merge latest from beta
c9d6995f58 stash PR feedback and bugfixes
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
Compare 31 commits »
mika synced commits to refs/pull/3938/merge at mika/pokerogue from mirror 2024-09-11 20:32:37 +02:00
a30523c2e4 Merge pull request #4170 from ben-lear/mystery-encounters-feedback
2816062d90 merge latest from beta
c9d6995f58 stash PR feedback and bugfixes
abb133e253 Merge pull request #4167 from DayKev/beta
Compare 25 commits »
mika synced commits to refs/pull/3975/merge at mika/pokerogue from mirror 2024-09-11 20:32:37 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
bd4729b4c5 [Hotfix] Fix Lapsing Modifiers Not Rolling (#4152)
Compare 20 commits »
mika synced commits to refs/pull/4019/merge at mika/pokerogue from mirror 2024-09-11 20:32:37 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
Compare 21 commits »
mika synced commits to refs/pull/4063/merge at mika/pokerogue from mirror 2024-09-11 20:32:37 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
Compare 23 commits »
mika synced commits to refs/pull/4099/merge at mika/pokerogue from mirror 2024-09-11 20:32:37 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
Compare 23 commits »
mika synced and deleted reference refs/tags/refs/pull/4122/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
mika synced commits to beta at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
bd4729b4c5 [Hotfix] Fix Lapsing Modifiers Not Rolling (#4152)
7dd1832072 [Hotfix] fix UI transition causing unusual freezes after egg summary shown (#4126)
Compare 19 commits »
mika synced commits to mystery-encounters at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
a30523c2e4 Merge pull request #4170 from ben-lear/mystery-encounters-feedback
2816062d90 merge latest from beta
c9d6995f58 stash PR feedback and bugfixes
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
Compare 31 commits »
mika synced commits to refs/pull/1831/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
Compare 21 commits »
mika synced commits to refs/pull/2200/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
Compare 21 commits »
mika synced commits to refs/pull/2559/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
bd4729b4c5 [Hotfix] Fix Lapsing Modifiers Not Rolling (#4152)
Compare 20 commits »
mika synced commits to refs/pull/2658/head at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
06e4994b8a Merge remote-tracking branch 'upstream/beta' into move-power-trick
1d7d6166ac update tsdoc
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
5c46fa1095 apply power trick with battler tag way
Compare 54 commits »
mika synced commits to refs/pull/2658/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
06e4994b8a Merge remote-tracking branch 'upstream/beta' into move-power-trick
1d7d6166ac update tsdoc
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
Compare 25 commits »
mika synced commits to refs/pull/2746/head at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
0157eba750 Merge branch 'beta' into implSynchronize
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
e17bf592c2 [Bug] Use silent mode during tests (unless debugging!) + test workflow optimization (#4154)
14ace40634 [Misc] eslint rule to prevent .js imports (#4160)
d1b058fe3e [UI] fix candy upgrade icon not updating after purchasing eggs (#4153)
Compare 30 commits »
mika synced commits to refs/pull/2746/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
0157eba750 Merge branch 'beta' into implSynchronize
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
Compare 27 commits »
mika synced commits to refs/pull/3105/merge at mika/pokerogue from mirror 2024-09-11 20:32:36 +02:00
abb133e253 Merge pull request #4167 from DayKev/beta
9f82d796d3 Merge branch 'main' into beta
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
4808c07cf9 [Hotfix] Fix System Data Conversion Failure 2 (#4159)
Compare 36 commits »
mika synced commits to refs/pull/3975/head at mika/pokerogue from mirror 2024-09-11 12:22:31 +02:00
d2a2527e3d move sourceTeraType closer to where it's used
74bd2e6fe1 Merge branch 'beta' into simulated-damage-calc
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
e17bf592c2 [Bug] Use silent mode during tests (unless debugging!) + test workflow optimization (#4154)
14ace40634 [Misc] eslint rule to prevent .js imports (#4160)
Compare 32 commits »
mika synced commits to refs/pull/3975/merge at mika/pokerogue from mirror 2024-09-11 12:22:31 +02:00
d2a2527e3d move sourceTeraType closer to where it's used
74bd2e6fe1 Merge branch 'beta' into simulated-damage-calc
e657322294 [Enhancement] Update instruction for gamepad in run history UI (#4053)
e17bf592c2 [Bug] Use silent mode during tests (unless debugging!) + test workflow optimization (#4154)
Compare 27 commits »
mika synced commits to refs/pull/4019/merge at mika/pokerogue from mirror 2024-09-11 12:22:31 +02:00
e17bf592c2 [Bug] Use silent mode during tests (unless debugging!) + test workflow optimization (#4154)
14ace40634 [Misc] eslint rule to prevent .js imports (#4160)
Compare 3 commits »