Commit Graph

  • 8bc00ce182
    Merge branch 'beta' into modifier-fixes Bertie690 2025-06-19 19:55:25 -0400
  • 3f1772ceb9
    Merge branch 'beta' into tsconfig Bertie690 2025-06-19 19:52:07 -0400
  • 053963c84d
    Merge branch 'beta' into no-select-move-missing Bertie690 2025-06-19 19:51:15 -0400
  • bd989b1fcc Updated run phase to extend field phase instead of pokemon phase jnotsknab 2025-06-19 16:52:00 -0500
  • 05ba390ede Completed run phase refactor implementation and updated tests jnotsknab 2025-06-19 16:34:52 -0500
  • 193274fd28
    Merge branch 'beta' into fix-overlaps fabske0 2025-06-19 22:43:16 +0200
  • f26cb11e0b
    Fixed several bugs related to accessing and visualizing held items Wlowscha 2025-06-19 22:29:46 +0200
  • 2a3393f2ac Merge branch 'beta' into fix-overlaps fabske0 2025-06-19 22:07:13 +0200
  • f4f5c37228 [Fix] Fix input field overlaps fabske0 2025-06-19 22:02:35 +0200
  • 4e11759671 Formatting jnotsknab 2025-06-19 14:32:18 -0500
  • 3fcccfecd4 Decoupled individual pokemon from run phase logic jnotsknab 2025-06-19 14:27:43 -0500
  • 1e9239720d
    Fixing some phases Wlowscha 2025-06-19 20:15:50 +0200
  • f1c6cf4419
    Pools can now take a HaldItemConfigurationId without weights; set up table of item tiers; used custom pools in Clowning Around ME Wlowscha 2025-06-19 19:55:17 +0200
  • 97e22e551f
    Merge branch 'beta' into fur_coatFix Sisyphos 2025-06-19 19:48:06 +0200
  • 46204067f5
    Restored various changes to held item pool generation; distinguishing target of the generation from the party Wlowscha 2025-06-19 19:37:21 +0200
  • afbdf9afb2
    Held item pools take a single pokemon as input, set weights to 0 for max stack items Wlowscha 2025-06-19 19:25:12 +0200
  • 78b9d1fa81
    Fixed some rogue inputs Wlowscha 2025-06-19 18:29:06 +0200
  • 4424af6928
    Merge branch 'held-item-refactor' of https://github.com/Wlowscha/pokerogue into held-item-refactor Wlowscha 2025-06-19 18:23:39 +0200
  • ede7fe4615
    Replaced ModifierTier with RewardTier Wlowscha 2025-06-19 18:23:29 +0200
  • ebf0f3e352
    Converted most MEs, introduced some more utility functions and methods Wlowscha 2025-06-19 18:20:54 +0200
  • 53c5efc82e Minor Attempt run phase rework to abstract logic to whole team jnotsknab 2025-06-19 05:52:29 -0500
  • cb8cd6669b
    Update node version NightKev 2025-06-18 23:14:28 -0700
  • 7e7173c002 Update links Dean 2025-06-18 22:57:41 -0700
  • 61496958bf
    Apply suggestions from code review Dean 2025-06-18 22:53:12 -0700
  • 392f6908ef Merge branch 'readme-contributing' of github.com:emdeann/pokerogue into readme-contributing Dean 2025-06-18 22:47:35 -0700
  • ea80777693 Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into readme-contributing Dean 2025-06-18 22:47:07 -0700
  • 6873a89296
    1.9.6 to Beta damocleas 2025-06-18 23:29:29 -0400
  • 0ba3e52f77 Fix merge issue minor-1.9.6 NightKev 2025-06-18 18:30:22 -0700
  • 560ebbaee2 Merge branch 'beta' into minor-1.9.6 NightKev 2025-06-18 18:27:37 -0700
  • 48f7010711 [skip ci] Deploy docs gh-pages github-actions[bot] 2025-06-19 01:22:42 +0000
  • 965f92ba0f
    Minor Update 1.9.6 to Main main damocleas 2025-06-18 21:20:58 -0400
  • 4de7858f00
    [i18n] Update locales (#6010) AJ Fontaine 2025-06-18 21:19:25 -0400
  • dbeb7ea2bc Update locales AJ Fontaine 2025-06-18 21:17:59 -0400
  • e3c8e3141e
    Merge pull request #6009 from Fontbane/locafix NightKev 2025-06-18 18:14:37 -0700
  • 30b2f95a30 [i18n] Map "biome" namespace to the filename change to "biomes" (#6001) NightKev 2025-06-17 12:35:39 -0700
  • 1d669719a0
    Bump version name to 1.9.6 AJ Fontaine 2025-06-18 19:53:13 -0400
  • 663e047af8
    [Event] W event (#6006) AJ Fontaine 2025-06-18 19:52:40 -0400
  • 1fca126c89 Bump version name to 1.9.6 AJ Fontaine 2025-06-18 19:50:34 -0400
  • 80ae42d3ba
    [Sprite] Minior and Ferrothorn variants (#6005) AJ Fontaine 2025-06-18 19:49:21 -0400
  • 9e78157ad9 W event AJ Fontaine 2025-06-18 19:46:12 -0400
  • f80211406f Revised Comments jnotsknab 2025-06-18 18:15:53 -0500
  • 9939730bcf Fix shiny Minior front and icons AJ Fontaine 2025-06-18 19:14:27 -0400
  • 0a2e6e1cec Updated Comments jnotsknab 2025-06-18 18:03:02 -0500
  • a30b86a183 Add Ferrothorn variants AJ Fontaine 2025-06-18 18:54:39 -0400
  • 2321de0983
    Updated various MEs. HeldItemManager can now generate a configuration from its items. Wlowscha 2025-06-19 00:23:07 +0200
  • 382be01504 Minior variants AJ Fontaine 2025-06-18 18:17:56 -0400
  • 9e892597ea Fixed Transform and Imposter Bug jnotsknab 2025-06-18 16:55:31 -0500
  • 182397411e
    [Bug] Fix infinite memory mushrooms (#5993) Sirz Benjie 2025-06-18 16:23:16 -0500
  • 47bec38858
    Merge branch 'beta' into dawnstone Sirz Benjie 2025-06-18 16:22:39 -0500
  • f8d9d7cffb
    Merge branch 'beta' into protean Sirz Benjie 2025-06-18 16:16:34 -0500
  • a131aee63a
    Ensure apply modifier conditional retains original behavior Sirz Benjie 2025-06-15 13:47:49 -0500
  • 62c4756c78
    Set cost to -1 for modifiers chosen as rewards Sirz Benjie 2025-06-15 13:22:43 -0500
  • b779603c39
    Make addInfoToggle capable of taking in multiple toggles Sirz Benjie 2025-05-28 21:26:28 -0500
  • cefa1ebace
    Fix poor logic in toggleInfo Sirz Benjie 2025-05-28 21:23:30 -0500
  • 7022b8501b
    Add types to fight-ui-handler#show Sirz Benjie 2025-05-28 21:03:34 -0500
  • c8af9186f0
    Cleanup fight ui handler Sirz Benjie 2025-05-28 20:59:36 -0500
  • 50f36ef8cd
    Merge branch 'beta' into hebrew-pr Lugiad 2025-06-18 23:09:13 +0200
  • 95f4cdc2da
    Update i18n.ts Lugiad 2025-06-18 23:08:44 +0200
  • c9ed6f4326 [Fix] Fix button overlap fabske0 2025-06-18 21:59:21 +0200
  • b0fa48f8c8 Added heal phase to interceptor Bertie690 2025-06-18 14:47:54 -0400
  • 2691d4e391 [Fix] Fixed visible pokeball in legacy mode and key mapping Tiago Rodrigues 2025-06-18 17:45:51 +0100
  • 1ae117acfa
    Updated README.md to mention new locales markdown & other notable files Bertie690 2025-06-18 12:12:10 -0400
  • 05fced4866
    Merge branch 'beta' into held-item-refactor Wlowscha 2025-06-18 11:38:47 +0200
  • 38bfcbe06d
    Merge branch 'beta' into damo-MysteryEncounterCollection damocleas 2025-06-18 00:02:35 -0400
  • 59a00e0af3
    [Sprite] Fix Appletun variants (#6003) AJ Fontaine 2025-06-17 23:54:58 -0400
  • 458faf90eb Move checks to canApply Dean 2025-06-17 19:21:46 -0700
  • 7caae21216 Fix Appletun variants AJ Fontaine 2025-06-17 21:26:01 -0400
  • c021f3206e Fixed the test and such Bertie690 2025-06-17 19:17:39 -0400
  • 69d329a460 Fixed tests Bertie690 2025-06-17 19:04:45 -0400
  • 05f3c64cad Merge remote-tracking branch 'upstream/beta' into metronome Bertie690 2025-06-17 18:41:16 -0400
  • 646b5d8048 added ts compiler error for missing nature power biome Bertie690 2025-06-17 18:34:22 -0400
  • f231755db2 fixed using sizzly slide instead of will o wisp to inflict burn Bertie690 2025-06-17 18:27:27 -0400
  • d161aad372
    Fixed shady vitamin ME and some HeldItem files Wlowscha 2025-06-18 00:01:34 +0200
  • 0e0c5e9fe3
    Removed unused getOrInferTier function (was only used by thief and covet) Wlowscha 2025-06-17 23:49:40 +0200
  • c58c1fd21b
    Held item overrides now use the new system Wlowscha 2025-06-17 23:37:53 +0200
  • 7523f6d9c0
    Fixed init-modifier-pools.ts Wlowscha 2025-06-17 23:36:51 +0200
  • 6d777bb7c8 Fixed innards out Bertie690 2025-06-17 17:14:44 -0400
  • e4115a362b Merge remote-tracking branch 'upstream/beta' into more-tests Bertie690 2025-06-17 17:11:13 -0400
  • fcd270ed9b fixed tests Bertie690 2025-06-17 17:08:15 -0400
  • f2a339fbe5
    Held item generation for enemies follows the new scheme Wlowscha 2025-06-17 23:08:14 +0200
  • 86a3f6d711 Merge remote-tracking branch 'upstream/beta' into test-cleanup Bertie690 2025-06-17 17:03:40 -0400
  • efb5f9fb2a
    Merge branch 'beta' into chilly-reception-msg Bertie690 2025-06-17 16:57:53 -0400
  • dc9d7a3e17 Fixed test 0.5 Bertie690 2025-06-17 16:55:55 -0400
  • 51a3b09da7
    Merge branch 'beta' into doubles-run-away-spd-boost-fix Jonathan Bankston 2025-06-17 15:55:35 -0500
  • 4119dfbfec
    [Test] Fix flaky gastro acid test (#5996) Bertie690 2025-06-17 16:51:19 -0400
  • 8b67fca4b0
    Merge branch 'beta' into gastro-acid-test NightKev 2025-06-17 13:48:25 -0700
  • 6d30536278 Merge remote-tracking branch 'upstream/beta' into no-non-type-export Bertie690 2025-06-17 16:45:28 -0400
  • fefa8e408f Fixed corrosion test Bertie690 2025-06-17 16:42:27 -0400
  • 8e7d3e4a6c
    Merge branch 'beta' into hebrew-pr Lugiad 2025-06-17 22:41:06 +0200
  • 7cc64a9dae
    Merge branch 'beta' into doubles-run-away-spd-boost-fix Jonathan Bankston 2025-06-17 15:34:48 -0500
  • d6c9209c42 Fixed accidental unusde class Bertie690 2025-06-17 16:30:07 -0400
  • 484131aeab Fixed test Bertie690 2025-06-17 16:22:51 -0400
  • 903d1a33dd Fixed the tests Bertie690 2025-06-17 16:20:12 -0400
  • 1529fd9329 Fixed tests Bertie690 2025-06-17 16:10:43 -0400
  • aee33fe625 Fixed up pollen puff tests Bertie690 2025-06-17 16:07:53 -0400
  • 7f2766f832 ddddd Bertie690 2025-06-17 16:05:43 -0400
  • c6c3cd9f3c Added pokemon heal phase to the turn queue Bertie690 2025-06-17 16:04:27 -0400
  • 39be97ef8e
    Daily run items are generated within the new system Wlowscha 2025-06-17 22:03:25 +0200
  • a2d37a0d97 Merge remote-tracking branch 'upstream/beta' into terrain-fail-msg Bertie690 2025-06-17 15:57:07 -0400
  • 3d20235fa5 ssss Bertie690 2025-06-17 15:51:49 -0400