Commit Graph

  • 2ab4d49b7e Fix misplaced line NightKev 2024-11-02 08:08:49 -0700
  • c1359cb2ed Merge branch 'beta' into pokeSpeciesCleanup NightKev 2024-11-02 08:01:49 -0700
  • df3c3db5bd Use get/set for formIndex too NightKev 2024-11-02 08:00:57 -0700
  • ae264c5dd6
    Merge branch 'beta' into testsaveeggmoves Moka 2024-11-02 15:22:55 +0100
  • 7dd9fcb683
    Merge branch 'beta' into modifier-pool-fix Moka 2024-11-02 15:22:32 +0100
  • 29e414ddf1
    Apply suggestions from code review Moka 2024-11-02 15:17:06 +0100
  • 2d52b05b31 added source to damageAndUpdate and applyPostDamageAbAttrs, added Parental Bond logic + test, put applyPostDamageAbAttrs back in damageAndUpdate muscode13 2024-11-02 01:33:58 -0600
  • 8169760e1e
    [Bug] Prevent wild mons fleeing with U-turn, Flip Turn, Volt Switch (#4643) AJ Fontaine 2024-11-02 00:21:45 -0400
  • 38b7e6be68 moved applyPostDamageAbAttrs to pokemon.damage, added check for multi lens in pokemon.apply muscode13 2024-11-01 21:53:04 -0600
  • 45b5844084 Merge branch 'beta' into commander innerthunder 2024-11-01 18:56:44 -0700
  • 8f7d3cc4bc
    Merge branch 'beta' into namespaces-i18n-plugin Adrián T. 2024-11-01 20:09:25 -0400
  • 0bf1b8adbe Take weight into account when getting the tier of modifiers Moka 2024-11-02 00:35:34 +0100
  • ef7f55ca10 disable timed events in tests Moka 2024-11-02 00:25:36 +0100
  • 7625093ed9 Merge branch 'beta' into feat/export-settings prateau 2024-11-01 23:24:44 +0100
  • cdb1f27702 Merge remote-tracking branch 'upstream/beta' into beta Nayana Agrawal 2024-11-01 22:23:32 +0000
  • d73af4b914 added webkit autofill to css file so autofill username and password appear in white as intended Nayana Agrawal 2024-11-01 22:04:20 +0000
  • 81140e9638
    Merge branch 'beta' into camouflageFix Mumble 2024-11-01 14:17:37 -0700
  • 4141d6fa94
    Merge branch 'beta' into runHistoryLogging Mumble 2024-11-01 14:07:39 -0700
  • c3270cad51 run info fixes frutescens 2024-11-01 13:40:07 -0700
  • d8c54ff832 added multi-lens logic muscode13 2024-11-01 14:37:13 -0600
  • 95ce13fda0 lalal frutescens 2024-11-01 13:28:03 -0700
  • 3f6553bcf9 coommrent frutescens 2024-11-01 13:19:06 -0700
  • a62de05c38 fixing it up frutescens 2024-11-01 13:15:24 -0700
  • 611826122c lah frutescens 2024-11-01 13:14:29 -0700
  • 47083262e9 gdfafa frutescens 2024-11-01 12:44:53 -0700
  • 47087d7bad music pref frutescens 2024-11-01 12:30:37 -0700
  • ce58f2524d eslint cleanup frutescens 2024-11-01 12:26:41 -0700
  • 154347a61a
    Merge branch 'beta' into audioCleanUp Mumble 2024-11-01 12:20:35 -0700
  • 5b10745f3d Merge branch 'beta' into uturnfix NightKev 2024-11-01 11:40:27 -0700
  • bf8da089a2 Merge remote-tracking branch 'origin/beta' into ability/wimpout muscode13 2024-11-01 11:58:00 -0600
  • 699dbff763 add fix for multi hit move muscode13 2024-11-01 11:56:55 -0600
  • 142eb27fb2 lalal frutescens 2024-11-01 10:34:32 -0700
  • a11f30d999
    Update src/test/moves/camouflage.test.ts Mumble 2024-11-01 10:23:00 -0700
  • c8f8f6a9c2 moved aorund function frutescens 2024-11-01 10:21:44 -0700
  • 747108f5ef
    Merge pull request #1 from DayKev/wimpout-patch-1 muscode 2024-11-01 11:40:25 -0500
  • 80315d2451 fixed nested if issue, remove trapped tag removal muscode13 2024-11-01 11:41:07 -0600
  • 20ad144f52
    add public override to applyPostDamage muscode 2024-11-01 10:34:10 -0600
  • 844fbe3d3f
    simplify if statement muscode 2024-11-01 10:33:38 -0600
  • 809e710b87
    make applyPostDamage public muscode 2024-11-01 10:30:35 -0600
  • 0ff40e6b5b
    make getFailedText public muscode 2024-11-01 10:29:31 -0600
  • bad0494278
    make getSwitchOutCondition public muscode 2024-11-01 10:29:08 -0600
  • 6ef3003528
    make switchOutLogic public muscode 2024-11-01 10:28:41 -0600
  • 596a8b88a5
    make getFailedText public muscode 2024-11-01 10:27:54 -0600
  • e5a2a64d76
    fix whitespace muscode 2024-11-01 10:27:26 -0600
  • 34343a0941
    fix tsdocs muscode 2024-11-01 10:20:47 -0600
  • ce0305cf85
    fix tsdocs muscode 2024-11-01 10:20:19 -0600
  • c6e758ee78
    fix tsdocs muscode 2024-11-01 10:19:56 -0600
  • d57c800a88
    fix tsdocs muscode 2024-11-01 10:19:31 -0600
  • bb87a9a92b
    remove comment muscode 2024-11-01 10:18:57 -0600
  • 5761369ab6
    remove comment muscode 2024-11-01 10:18:35 -0600
  • 5df72ee5ef
    Update tsdocs muscode 2024-11-01 10:18:05 -0600
  • bd199664be
    remove extra comment muscode 2024-11-01 10:17:30 -0600
  • eb951f2508
    remove extra comment muscode 2024-11-01 10:17:05 -0600
  • fa79c19c30 Modify `wimp_out.test.ts` NightKev 2024-11-01 08:43:07 -0700
  • db7ca95be4 Add scene back to `fade[in|out]()` calls NightKev 2024-10-31 23:54:02 -0700
  • 710737baae Merge remote-tracking branch 'origin/beta' into move/fairylock muscode13 2024-10-31 19:09:50 -0600
  • 576650782a added more suggested tests muscode13 2024-10-31 19:08:59 -0600
  • 34d2a9c400
    Merge branch 'beta' into prabbydMirrorArmor PrabbyDD 2024-10-31 16:26:34 -0700
  • 25da81d4af beginnings of implementation of mirror armor PrabbyDD 2024-10-31 16:17:46 -0700
  • 2f641fee90 Modifying battle-scene.ts PsychedelicSeal 2024-10-31 16:00:42 -0600
  • 6a5f823bf8 Merge remote-tracking branch 'origin/beta' into move/fairylock muscode13 2024-10-31 15:23:46 -0600
  • 684fb93e39
    the fix (#4733) Mumble 2024-10-31 14:22:26 -0700
  • abc9264b3d
    [Localization] Spanish modification form es to es-ES (#4753) Lugiad 2024-10-31 21:54:05 +0100
  • 312c1717f4 update to latest locale commit Moka 2024-10-31 21:39:53 +0100
  • d86cabd6ff
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-31 20:24:30 +0100
  • 23bc1e8b47
    Merge branch 'beta' into refactor/api-requests flx-sta 2024-10-31 11:24:28 -0700
  • bbeee209ce
    Merge branch 'beta' into pr-illusion flx-sta 2024-10-31 08:26:13 -0700
  • 55d1b1402a Modify tests NightKev 2024-10-31 03:42:33 -0700
  • 7dc8f2427c Replace various `scene` pass-arounds with global scene variable NightKev 2024-10-31 01:28:45 -0700
  • 9193b9aceb
    Merge branch 'beta' into bugfix/FellStingerBadStatBoost bjparker1226 2024-10-31 02:24:09 -0400
  • 4fd35aaf4c
    Merge branch 'beta' into eviolite_weight_bug Amani H. 2024-10-31 01:14:53 -0400
  • 5755180279
    [Audio] Replace Graveyard BGM with Firel's custom BGM (#4765) Madmadness65 2024-10-30 20:48:09 -0500
  • c2293716b5 Attempt to fix merge conflicts Christopher Schmidt 2024-10-30 21:15:20 -0400
  • 77c9fb0daa Merge changes and resolve conflicts Christopher Schmidt 2024-10-30 21:02:51 -0400
  • 589aa0c914
    Merge branch 'beta' into rogue-ball-balance-fix NightKev 2024-10-30 17:49:01 -0700
  • 526499102d Replace Graveyard BGM with Firel's custom BGM Madmadness65 2024-10-30 19:20:45 -0500
  • b49fd7e855
    Update src/main.ts podar 2024-10-30 18:16:39 -0500
  • 10f87973af
    Merge branch 'beta' into local_development_and_offline podar 2024-10-30 18:16:18 -0500
  • 111fe68c25
    Merge branch 'beta' into refactor/api-requests flx-sta 2024-10-30 13:14:24 -0700
  • f60d66d2a2
    Merge branch 'pagefaultgames:beta' into linger-arena-trap-fix geeilhan 2024-10-30 20:12:49 +0100
  • cb0919ceeb added automated test case to arena trap test geeil-han 2024-10-30 20:04:25 +0100
  • 5b9dfe17ad
    [P2] Fix Own Tempo Rockruff not being able to evolve (#4762) PigeonBar 2024-10-30 13:15:11 -0400
  • b530971389 Merge branch 'bugfix/FellStingerBadStatBoost' of https://github.com/bjparker1226/pokerogue into bugfix/FellStingerBadStatBoost Benjamin 2024-10-30 02:33:11 -0400
  • 54338810c5 ensure `Pokemon.apply` does not trigger multiple faint phases Benjamin 2024-10-30 02:01:47 -0400
  • b9d6fee103 ensure `Pokemon.apply` does not trigger multiple faint phases Benjamin 2024-10-30 02:01:47 -0400
  • 5079f2aeb8
    Merge branch 'beta' into bugfix/FellStingerBadStatBoost bjparker1226 2024-10-30 01:25:06 -0400
  • 3299fc0307 implement unit tests Benjamin 2024-10-30 01:13:33 -0400
  • 9f433bcecb fix: if pokemon died to any move, now pass the source to faintPhase Benjamin 2024-10-30 01:12:32 -0400
  • f5e260bee4 Update pokemon.ts PsychedelicSeal 2024-10-29 22:17:32 -0600
  • b3a0ca9475
    [Misc] Update Donation Link (#4763) Mumble 2024-10-29 19:31:24 -0700
  • bd13eb5a29 link update frutescens 2024-10-29 19:18:15 -0700
  • 60a581074a made a test frutescens 2024-10-29 18:34:20 -0700
  • 3eef30b8b2 ughh frutescens 2024-10-29 18:15:00 -0700
  • 51a21d1261 [P2 Bug] Fix Own Tempo Rockruff not being able to evolve Michael Li 2024-10-29 21:01:33 -0400
  • 7990198206 the fix... will maybe write a test later frutescens 2024-10-29 17:53:55 -0700
  • d14a66f523 Replace all instances of `integer` with `number` Madmadness65 2024-10-29 17:40:08 -0500
  • 79f06289a4 Fix Linting Error xsn34kzx 2024-10-29 17:54:30 -0400
  • b1b1faf662
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-29 22:53:25 +0100
  • 398f8a58bd Merge `beta` xsn34kzx 2024-10-29 17:51:49 -0400
  • ee6dc525ce Update style for new lint standards AJ Fontaine 2024-10-29 17:46:54 -0400