Commit Graph

  • 1b2426ab45 Merge branch 'beta' into commander innerthunder 2024-11-02 23:28:24 -0700
  • f0ae36de6c
    [Ability] Implement Wimp Out and Emergency Exit (#4701) muscode 2024-11-03 01:04:20 -0500
  • b17b1d6e7e
    [P1] Fixing crash that can occur when failing to loading variant sprites. (#4315) podar 2024-11-03 00:33:48 -0500
  • f16309fd06
    [P2] Plus, Minus, Beads/Sword of Ruin not ignorable. Shield Dust and Armoa Veil ignorable (#4778) Mumble 2024-11-02 22:22:40 -0700
  • 63ed8dee66
    Update src/system/game-data.ts flx-sta 2024-11-02 21:18:23 -0700
  • e47d599adb ignorable tags frutescens 2024-11-02 20:45:58 -0700
  • 70ddc29e86
    [Refactor] Refactor data/pokemon-species.ts (#4054) Mumble 2024-11-02 20:11:24 -0700
  • 0e91f33889
    Merge branch 'beta' into pokeSpeciesCleanup Tempoanon 2024-11-02 23:05:18 -0400
  • 3440d2d52f
    Merge branch 'beta' into move/fairylock Tempoanon 2024-11-02 22:56:01 -0400
  • c31657d952
    [Refactor] Reduced nesting in MoveEffectPhase (#3541) Mason S 2024-11-02 22:55:15 -0400
  • 9b5e8c77e1
    Merge branch 'beta' into pokeSpeciesCleanup Mumble 2024-11-02 18:43:32 -0700
  • 785c04a4b4
    Apply suggestions from code review Mumble 2024-11-02 14:21:44 -0700
  • b0e511ade3 Music frutescens 2024-11-02 13:35:07 -0700
  • 37f2679ddb
    Merge branch 'beta' into linger-arena-trap-fix NightKev 2024-11-02 13:17:04 -0700
  • 8e99d2039e Move comment slightly NightKev 2024-11-02 13:00:15 -0700
  • 3f6f52bbbd moved and renamed shouldPreventSwitchOut, rewrote tests to account for U-turn changes, fix syntax error muscode13 2024-11-02 14:26:03 -0600
  • 96dd243950 Minor indentation fix NightKev 2024-11-02 12:26:14 -0700
  • 4df2de44a0 Add override to start() and end() NightKev 2024-11-02 12:22:15 -0700
  • a9befca5ee Merge branch 'beta' into MoveEffectPhase NightKev 2024-11-02 12:18:14 -0700
  • e41b3aa74e Merge branch 'MoveEffectPhase' of https://github.com/ElizaAlex/pokerogue into MoveEffectPhase NightKev 2024-11-02 12:05:02 -0700
  • 19e329e173 Prevent ENEMY_SIDE targeted moves from occurring twice in double battles NightKev 2024-10-11 15:09:13 -0700
  • 8e90a18788 Fix indentation, tsdocs, add public/etc NightKev 2024-10-11 03:48:44 -0700
  • 4026eb0da4
    Merge branch 'beta' into audioCleanUp Mumble 2024-11-02 10:46:17 -0700
  • 64b21bda73 update locale submodule Moka 2024-11-02 18:27:33 +0100
  • 7af47c94d5
    Merge branch 'beta' into ability/wimpout NightKev 2024-11-02 10:11:12 -0700
  • 0ef983deb5
    Merge branch 'beta' into eviolite_weight_bug Amani H. 2024-11-02 13:07:04 -0400
  • 1474f8cf14
    [Refactor] Add options param interface for MoveEffectAttr (#4710) innerthunder 2024-11-02 10:05:33 -0700
  • 2cbf7c5e41
    Update src/data/ability.ts muscode 2024-11-02 11:04:46 -0600
  • 075a14b9cf
    Merge branch 'beta' into ability/wimpout NightKev 2024-11-02 09:55:11 -0700
  • 8db0d37a2a Minor formatting changes NightKev 2024-11-02 09:46:25 -0700
  • 1659f57262
    [P2] Camouflage now considers Terrains first (#4761) Mumble 2024-11-02 09:48:10 -0700
  • 80a8c659ee
    [P2] Add "no switch-in" fail condition for Shed Tail and Baton Pass (#4777) innerthunder 2024-11-02 09:47:08 -0700
  • 1badbe486f
    Merge branch 'beta' into trick-room-challenge Lugiad 2024-11-02 17:02:59 +0100
  • ba4915728f
    Merge branch 'beta' into ability/wimpout NightKev 2024-11-02 09:02:51 -0700
  • 61ee3db392 Add "no switch-in" fail condition for Shed Tail and Baton Pass innerthunder 2024-11-01 21:40:29 -0700
  • ae610deca7 Merge branch 'beta' into pokemon.ts-cleanup NightKev 2024-11-02 08:56:20 -0700
  • f703cbb339
    Merge branch 'beta' into refactor/api-requests NightKev 2024-11-02 08:57:07 -0700
  • 19cb3b53c1
    Merge branch 'beta' into fix-future-sight NightKev 2024-11-02 08:56:36 -0700
  • ae0494b4f1
    Merge branch 'beta' into pokeSpeciesCleanup NightKev 2024-11-02 08:56:12 -0700
  • c2d24d6e93
    [Bug] Take weight into account when getting the tier of a modifier (#4775) Moka 2024-11-02 16:55:22 +0100
  • e67c173e03
    Merge branch 'beta' into pokemon.ts-cleanup NightKev 2024-11-02 08:42:25 -0700
  • d9393b61c2 Merge branch 'beta' into fix-future-sight NightKev 2024-11-02 08:17:11 -0700
  • e8480f9548 Merge branch 'beta' into misc-code-cleanup NightKev 2024-11-02 08:30:40 -0700
  • 9305b4a3ec
    simplify multi hit check muscode 2024-11-02 09:28:31 -0600
  • d9e96e1ad5 Replace a couple !! with default params NightKev 2024-11-02 08:11:50 -0700
  • 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