Commit Graph

  • 147790d92f Update `create-test` script for linting changes NightKev 2024-10-04 21:50:22 -0700
  • bcf767ad92 Fix Merge Conflict xsn34kzx 2024-10-05 00:02:48 -0400
  • 5f63f6c7a1 more ingrain frutescens 2024-10-04 21:01:37 -0700
  • 57b846275b Revert Back to v1.1.0 xsn34kzx 2024-10-04 23:59:38 -0400
  • 1de78ee550 ingrain fixes frutescens 2024-10-04 20:59:35 -0700
  • 971d7c7894 think this is fine? frutescens 2024-10-04 20:51:53 -0700
  • 226ed89395 mmmmmm frutescens 2024-10-04 20:51:07 -0700
  • 7d16ab60cf need to check something else real quick frutescens 2024-10-04 20:49:03 -0700
  • 3a59e8a075
    Merge branch 'beta' into moveTelekinesis Mumble 2024-10-04 20:12:58 -0700
  • 1ecff43dec
    Merge branch 'beta' into moveRestrictionBugs Mumble 2024-10-04 17:58:47 -0700
  • 2d4fa390e7
    Merge branch 'beta' into pokemon.ts-cleanup flx-sta 2024-10-04 17:41:54 -0700
  • e653923b71 update locales submodule flx-sta 2024-10-04 17:40:39 -0700
  • 4425243f5d update locales submodule flx-sta 2024-10-04 17:39:44 -0700
  • a840bdccfa eslint.. frutescens 2024-10-04 17:18:32 -0700
  • 508569c79a Sending Doubles-fix frutescens 2024-10-04 17:16:03 -0700
  • 641c6a3349
    Merge branch 'beta' into qol/load-i18n-en-locales-during-test flx-sta 2024-10-04 17:11:28 -0700
  • abf0894586
    Merge branch 'beta' into qol/locales-cleanup flx-sta 2024-10-04 17:11:02 -0700
  • d3254fa067
    Merge branch 'beta' into savePreview Mumble 2024-10-04 17:09:28 -0700
  • 361dee0afd
    Update src/data/mystery-encounters/mystery-encounter.ts Mumble 2024-10-04 17:09:17 -0700
  • 0913899436
    Update src/data/mystery-encounters/mystery-encounter.ts Mumble 2024-10-04 17:07:59 -0700
  • 4969cdb99c
    Apply suggestions from code review Mumble 2024-10-04 17:07:23 -0700
  • 673624ae76 fix daily api calls in daily-run-scorebard flx-sta 2024-10-04 17:02:08 -0700
  • e620c68b56 Merge branch 'beta' into refactor/api-requests flx-sta 2024-10-04 16:53:40 -0700
  • 6468502fda fix gamedata verify missing await flx-sta 2024-10-04 16:48:24 -0700
  • 463f86fb83 Add test for Roar, remove test for Acupressure Christopher Schmidt 2024-10-04 19:22:27 -0400
  • e66bceded3 fix circular dependencies with api flx-sta 2024-10-04 16:07:08 -0700
  • 931025d3d2 Adds tests for secondary effects and recharge moves for metronome Christopher Schmidt 2024-10-04 19:06:51 -0400
  • d927ed8e6c fix env.development flx-sta 2024-10-04 16:06:49 -0700
  • 0ac69d1ee6 eslint fixes Christopher Schmidt 2024-10-04 19:00:24 -0400
  • dfdbe133d6 Merge beta into assistbug2 and fix conflicts Christopher Schmidt 2024-10-04 18:56:40 -0400
  • 0e3e128494 chore: cleanup flx-sta 2024-10-04 15:50:28 -0700
  • ab6a19168a reset overrides.ts flx-sta 2024-10-04 15:34:59 -0700
  • eddd75d3bd Fix evolutions being unable to strictly apply to base forms innerthunder 2024-10-04 14:38:54 -0700
  • c99df9712a
    [Move] Implement Ion Deluge (#4579) innerthunder 2024-10-04 14:23:20 -0700
  • 1947472f1c
    [P3] Fix start button cursor not being cleared properly in starter select (#4558) MokaStitcher 2024-10-04 22:47:12 +0200
  • 2395451b18 remove Utils.apiPost flx-sta 2024-10-04 13:43:40 -0700
  • d2d47b430f Implement Ion Deluge innerthunder 2024-10-04 13:39:06 -0700
  • b151eff6c6 Merge branch 'beta' into fix-start-cursor MokaStitcher 2024-10-04 22:33:13 +0200
  • d362456501
    [P2] Diamond Storm should only trigger once when hitting multiple pokemon (#4544) NightKev 2024-10-04 13:29:20 -0700
  • 27537286b9
    [Move] Implement Electrify (#4569) innerthunder 2024-10-04 13:24:52 -0700
  • 25fc0b8ea5 Fix docs innerthunder 2024-10-04 13:21:19 -0700
  • 0bd4d6c86b
    [Move] Fully Implement the Pledge Moves (#4511) innerthunder 2024-10-04 13:20:37 -0700
  • 742b8d4258 Pledges now only bypass redirection from abilities innerthunder 2024-10-04 12:59:25 -0700
  • 753ba3dfc3
    Fixed Flare Grunt's having Noivern > Noibat damocleas 2024-10-04 13:54:59 -0600
  • acf8d14a2e Update trainer-config.ts Madmadness65 2024-10-04 14:52:02 -0500
  • c1809a16bd Merge branch 'beta' into pledge-moves innerthunder 2024-10-04 11:56:57 -0700
  • 13b4b0e83d migrate register account to pokerogue-api flx-sta 2024-10-04 11:55:54 -0700
  • c26cfb4281
    Merge branch 'beta' into qol/locales-cleanup flx-sta 2024-10-04 11:32:30 -0700
  • 62c9bf02de
    Update trainer-config.ts Blitzy 2024-10-04 13:25:58 -0500
  • a896147059
    Update trainer-config.ts Blitzy 2024-10-04 13:21:13 -0500
  • f4197c7489
    Merge branch 'beta' into dev/phaseInterceptor-cleanup Adrian T. 2024-10-05 02:19:09 +0800
  • 9b18070506 update pokerogue-api login flx-sta 2024-10-04 11:11:43 -0700
  • 909264b6c0 Fix for [Bug] Metal Burst causes game to crash if intended target faints #4575 Sean Mon 2024-10-04 18:54:44 +0100
  • 8fa0d82a6c migrate unlink google to pokerogue-api flx-sta 2024-10-04 10:43:45 -0700
  • 8ac7ad4221 migrate unlink discord to pokerogue-api flx-sta 2024-10-04 10:41:44 -0700
  • 70f78d1060 rename `api` to `pokerogue-api` flx-sta 2024-10-04 09:58:37 -0700
  • 9df8a616d4 migrate `updateSessionSavedata` to api flx-sta 2024-10-04 09:53:54 -0700
  • 2f335ba831 Thank you eslint for only telling me there's an issue AFTER I commit AJ Fontaine 2024-10-04 11:42:50 -0400
  • af228e43df Merge branch 'fixscaleshottest' of github.com:Fontbane/pokerogue into fixscaleshottest AJ Fontaine 2024-10-04 11:38:42 -0400
  • 29710cf7e6 Integrate suggested changes AJ Fontaine 2024-10-04 11:38:01 -0400
  • 971cd370c9
    Merge branch 'beta' into qol/load-i18n-en-locales-during-test flx-sta 2024-10-04 08:16:29 -0700
  • 75bd730c04
    [Balance] Fix TM compatibility on forms, Tera Blast on Indigo Disk mons (#4568) AJ Fontaine 2024-10-04 10:55:37 -0400
  • 2c97b2bda2
    [Sprite] Fix variant Farigiraf icon names (#4572) chaosgrimmon 2024-10-04 10:51:29 -0400
  • 22442d3aa0
    [Refactor] Refactor move phase and add documentation (#3974) NightKev 2024-10-04 07:50:03 -0700
  • 2bc5f50154
    [Test] Fix some test flakiness involving `doKillOpponents()` (#4571) PigeonBar 2024-10-04 10:42:20 -0400
  • a5db2e1d6d
    [Misc] Update readme to include relevant links (#4573) Adrian T. 2024-10-04 22:42:05 +0800
  • 644611ded6 Merge branch 'fix-substitute-interactions' of https://github.com/DayKev/pokerogue into fix-substitute-interactions NightKev 2024-10-04 04:50:26 -0700
  • d53a9fb0e3 Add `hitsSubstitute()` checks to all `PostDefendAbAttr`s NightKev 2024-10-04 04:49:24 -0700
  • 3a425e1939 update readme torranx 2024-10-04 15:40:29 +0800
  • 7f37365c04
    [Sprite] Fix variant Farigiraf icon names chaosgrimmon 2024-10-04 03:08:55 -0400
  • fee44b03f9
    Fix linting NightKev 2024-10-04 00:06:00 -0700
  • 3653e68ea3
    Fix linting NightKev 2024-10-04 00:05:22 -0700
  • ad8900398f
    Merge branch 'beta' into fix-diamond-storm NightKev 2024-10-04 00:04:37 -0700
  • a43ddbe3b9 Fix linting NightKev 2024-10-03 23:59:55 -0700
  • 1a964e3000 Merge branch 'beta' into finish-triple-arrows NightKev 2024-10-03 23:54:24 -0700
  • a6faf1295c ESLint innerthunder 2024-10-03 23:51:04 -0700
  • 6d89c977c0 Merge branch 'beta' into electrify innerthunder 2024-10-03 23:40:47 -0700
  • 8d1be11b02
    Merge branch 'beta' into oneflower NightKev 2024-10-03 23:39:55 -0700
  • c9bb78a18d
    Merge branch 'beta' into fixscaleshottest NightKev 2024-10-03 23:32:02 -0700
  • 4d737c4e71
    Merge branch 'beta' into pledge-moves NightKev 2024-10-03 23:30:32 -0700
  • 07ad643adc Fix linting NightKev 2024-10-03 23:26:55 -0700
  • 467174b669
    Fix linting NightKev 2024-10-03 23:24:12 -0700
  • 24aee4450c
    Merge branch 'beta' into pokemon.ts-cleanup NightKev 2024-10-03 23:16:21 -0700
  • 5a2bce9baf
    Fix linting NightKev 2024-10-03 23:15:13 -0700
  • 041df72953
    Merge branch 'beta' into fix-future-sight NightKev 2024-10-03 23:13:54 -0700
  • ee9a00e9d9
    Merge branch 'beta' into fix-substitute-interactions NightKev 2024-10-03 23:13:50 -0700
  • 6bc72ee0a1
    Merge branch 'beta' into dev/phaseInterceptor-cleanup NightKev 2024-10-03 23:13:42 -0700
  • 7020f2981f
    Merge branch 'beta' into buy-memory-mushrooms NightKev 2024-10-03 23:13:34 -0700
  • 03eeddced3
    Merge branch 'beta' into qol/load-i18n-en-locales-during-test NightKev 2024-10-03 23:13:29 -0700
  • a99c1e0525
    Merge branch 'beta' into fix-test-flakiness NightKev 2024-10-03 23:13:25 -0700
  • 53140a03d2
    Fix linting NightKev 2024-10-03 23:12:37 -0700
  • 502d486f3c
    Fix linting & nits NightKev 2024-10-03 23:11:41 -0700
  • 5a8763d589
    Merge branch 'beta' into refactor-move-phase NightKev 2024-10-03 23:09:56 -0700
  • 489324af67
    Merge branch 'beta' into prabbyd4281 NightKev 2024-10-03 23:08:33 -0700
  • fb9b31b5bb
    Merge branch 'beta' into moveRestrictionBugs NightKev 2024-10-03 23:07:39 -0700
  • 870d834cb7
    Fix linting NightKev 2024-10-03 23:06:42 -0700
  • 38c682cca7
    [QoL] Add fusion options to overrides (#4298) EmberCM 2024-10-04 01:04:50 -0500
  • 854908d19e
    Merge branch 'beta' into fix-future-sight NightKev 2024-10-03 23:04:04 -0700
  • 12d81e826f
    Merge branch 'beta' into fusion-override NightKev 2024-10-03 23:01:51 -0700
  • 6216c99a42 Fix merge conflicts NightKev 2024-10-03 22:59:28 -0700