Commit Graph

  • c2968bfb9f
    Merge 226fce10ac3abb1ffd02b801e773580a71f2c904 into 1882e96ec50a641d19f78e3c2b4603642f2f3366 Xavion3 2025-03-06 04:33:37 +11:00
  • 226fce10ac
    Merge branch 'main' into migrator-hotfix Xavion3 2025-03-06 04:33:34 +11:00
  • 85cba19b2e Fix migration crash Xavion3 2025-03-06 04:27:01 +11:00
  • 91a94376de
    Merge 65a7549a26c16f515101b67e989e7363b4d2b39a into 6181afc6d2c311c569882306ed7c6478b69ebc85 Unicorn_Power 2025-03-05 17:00:14 +00:00
  • 14bbf1ad45
    Merge b49fd7e8559f3aed2d50f1fc4272f72fc96d68ca into 6181afc6d2c311c569882306ed7c6478b69ebc85 podar 2025-03-04 16:40:21 -08:00
  • 7637dca562
    Merge 77ce770026962d2d4ca11d308a3b4cf6d057f617 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Lugiad 2025-03-04 23:27:21 +00:00
  • 77ce770026
    Added Spanish status icons Lugiad 2025-03-05 00:24:46 +01:00
  • dca1f5c5b0
    Merge 2008c1ec29ec091272f8943f8e4090109fbec406 into 6181afc6d2c311c569882306ed7c6478b69ebc85 schmidtc1 2025-03-04 23:17:56 +00:00
  • 2008c1ec29
    Merge branch 'beta' into reviverseed Wlowscha 2025-03-05 00:17:52 +01:00
  • 89cd5283ab
    Merge 53226bbfefbf42eb895dad2d09c37cc6b7b460e1 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Sirz Benjie 2025-03-04 23:17:02 +00:00
  • 53226bbfef
    Merge branch 'beta' into refactor-move-check-flag Wlowscha 2025-03-05 00:16:59 +01:00
  • 1cb4dae5cc
    Merge 3af4defdae20c9be5077dab917d0b1c6982ebd89 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Dean 2025-03-04 19:15:39 +00:00
  • 3af4defdae Add test Dean 2025-03-04 11:15:14 -08:00
  • 918b8ce215
    Merge 672de204efb28dc31734712a978fbe5dfc007542 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Sirz Benjie 2025-03-04 18:33:47 +01:00
  • 706e908cc3
    Merge 0f647bfd66a44389a0ae0dd81650c4b782001c70 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Wlowscha 2025-03-04 18:33:24 +01:00
  • 0f647bfd66
    Merge branch 'beta' into making-containers-bearable Wlowscha 2025-03-04 18:33:21 +01:00
  • 1ed0ffa321
    Merge 68235acb66033c730c8ffd8be4a8f456c7be1bf3 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Wlowscha 2025-03-04 18:30:54 +01:00
  • 29ec4dbb1c
    Merge d8478afce2bd312147bae2246c263986b17f0d63 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Lugiad 2025-03-04 16:20:34 +00:00
  • d8478afce2
    Merge branch 'pagefaultgames:beta' into danish-workspace Lugiad 2025-03-04 17:20:29 +01:00
  • 55cda74fc8
    Merge 2e15267b3ab7c0f8eba9d121a8291c6b193c1681 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Lugiad 2025-03-04 16:20:20 +00:00
  • 2e15267b3a
    Merge branch 'pagefaultgames:beta' into hebrew-pr Lugiad 2025-03-04 17:20:15 +01:00
  • 928bbd2384
    Merge 98a581b59f9b99fec04405cbb14020f9a819da66 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Lugiad 2025-03-04 16:20:00 +00:00
  • 98a581b59f
    Merge branch 'pagefaultgames:beta' into turikish-workspace Lugiad 2025-03-04 17:19:55 +01:00
  • d339ddf812
    Merge b3044f918da3c6cc68d31667f3b91f4ad68d6365 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Lugiad 2025-03-04 16:19:51 +00:00
  • b3044f918d
    Merge branch 'pagefaultgames:beta' into romanian-workspace Lugiad 2025-03-04 17:19:47 +01:00
  • 65a7549a26 Redo Palkia-Origin exp Unicornpowerstar 2025-03-04 16:27:55 +01:00
  • 4afab3d3a8
    Merge 32cadb591e3ee51c0874722e9eaa636bb5655cc2 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Lylian BALL 2025-03-04 10:17:41 +01:00
  • 32cadb591e
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-04 10:17:38 +01:00
  • 742b0af7eb
    Merge c83845e3b919c857a0bd0b304febb005ee933c28 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Madmadness65 2025-03-04 01:11:34 -05:00
  • c83845e3b9
    Merge branch 'beta' into deep-sea-items deep-sea-items damocleas 2025-03-04 01:11:32 -05:00
  • ed27285da7
    Merge ed9923938335d73e6e730757690f1f6c1b2f10a8 into 6181afc6d2c311c569882306ed7c6478b69ebc85 AJ Fontaine 2025-03-04 01:10:16 -05:00
  • d4757ac95e
    Merge 06ce40f94244ec54822729423ca9c3aa41ffab4f into 6181afc6d2c311c569882306ed7c6478b69ebc85 NightKev 2025-03-03 22:08:01 -08:00
  • 06ce40f942 [Misc] getPokemonSpecies() no longer accepts undefined NightKev 2025-03-03 22:07:09 -08:00
  • 52da7e1050 Fix crash when ability is reactivated for a pokemon off the field Dean 2025-03-03 21:34:15 -08:00
  • aae6f82aba [skip ci] Deploy docs gh-pages github-actions[bot] 2025-03-04 04:50:59 +00:00
  • 1882e96ec5
    Minor Release 1.7.6 main damocleas 2025-03-03 23:49:28 -05:00
  • df16f94f3e
    Merge fb00b8f55ebfc45ff90ea6275de00518cf261e7c into 6181afc6d2c311c569882306ed7c6478b69ebc85 Chris 2025-03-04 10:49:04 +08:00
  • c5d6aebf96
    Merge eee74774075a1d9b0d86fe6f9db1f95f6ea3c1f5 into 6181afc6d2c311c569882306ed7c6478b69ebc85 David Yang 2025-03-04 09:08:41 +08:00
  • d485e1ecc6
    Merge 8d051b07b5ef03de2f5f321d93d9b24cb8585260 into 6181afc6d2c311c569882306ed7c6478b69ebc85 AJ Fontaine 2025-03-03 19:59:50 -05:00
  • 4329d352fc
    Merge a21bb39a820cee0c8f9628c3aeee18319351c3eb into 6181afc6d2c311c569882306ed7c6478b69ebc85 Madmadness65 2025-03-03 18:46:19 -06:00
  • e6e6c5e7e7
    Merge a417a5536d29847dd8868ae33a0c09e05631e308 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Blitzy 2025-03-03 18:46:19 -06:00
  • 0703525721
    Merge d14dc1e3cbcef86b4ad97a8100690e03b3c9b1b7 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Sirz Benjie 2025-03-03 18:46:19 -06:00
  • 4899af38fb
    Merge 93422d828d3398b7de5a4466b32d9984fececf87 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Dean 2025-03-03 18:46:19 -06:00
  • 6528d8a144
    Merge 4a5685c04931c36c45b531914a0e742aba8e61b6 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Sirz Benjie 2025-03-03 18:46:19 -06:00
  • 4e274680e9
    Merge c0ff0f041595333332bf715a6ce439cedc2b1ee7 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Madmadness65 2025-03-03 18:46:19 -06:00
  • 6cc840b543
    Merge 9e97bcd6838b7d6fae956a95c0298c774a3b09a1 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Dean 2025-03-03 18:46:19 -06:00
  • ca5b70debe
    Merge 60c4995e740d0bad654f2d8c85cc7fa698443521 into 6181afc6d2c311c569882306ed7c6478b69ebc85 schmidtc1 2025-03-03 18:46:19 -06:00
  • e5dc616ee1
    Merge 46012dc89690c14716b5220789f381ee7f7897c6 into 6181afc6d2c311c569882306ed7c6478b69ebc85 David Mitchell Em-Yinn 2025-03-03 16:43:36 -08:00
  • 47e6de7689
    Merge 5d444b704f8985214cbe50034151230de7650704 into 6181afc6d2c311c569882306ed7c6478b69ebc85 Sirz Benjie 2025-03-03 19:41:51 -05:00
  • 7fc63bef26
    Merge 5c0960653003ffbf33a2f7596383ad9da502753b into 6181afc6d2c311c569882306ed7c6478b69ebc85 Dean 2025-03-03 19:41:43 -05:00
  • 55d67b9377
    Merge dcf32a2e0d26dd42731ec21d4eb6f79a93cf0a5d into 6181afc6d2c311c569882306ed7c6478b69ebc85 Unicorn_Power 2025-03-04 08:40:48 +08:00
  • 6181afc6d2
    [UI/UX] Make left button also go back to run history from run info (#5474) beta David Yang 2025-03-04 08:40:04 +08:00
  • 9631c3dc76
    Merge branch 'beta' into left damocleas 2025-03-03 19:34:13 -05:00
  • ff4184e23f
    [Balance] Make Pickup and Honey Gather Unsuppressable (#5476) damocleas 2025-03-03 19:33:53 -05:00
  • c0ff0f0415
    Merge branch 'beta' into cosmetic-forms cosmetic-forms Madmadness65 2025-03-03 15:22:08 -06:00
  • 7d0ff7d6fa
    Merge branch 'beta' into deep-sea-items Madmadness65 2025-03-03 15:21:52 -06:00
  • a21bb39a82
    Merge branch 'beta' into wild-ghost-goo wild-ghost-goo Madmadness65 2025-03-03 15:21:33 -06:00
  • f494e0ae46
    Make Pickup and Honey Gather Unsuppressable damocleas 2025-03-03 16:19:44 -05:00
  • dcf32a2e0d 672 fixing incorrect variant hex codes and removing variant png Unicornpowerstar 2025-03-03 18:28:42 +01:00
  • b03ba040fd
    Merge e6cb464d09cd24ccad6350bcd13304ab8dd01639 into cabcfcbd39968c01cb03e4e76288a716926687b1 damocleas 2025-03-03 17:07:54 +00:00
  • e6cb464d09
    Update splash-messages.ts splashtexts damocleas 2025-03-03 12:07:51 -05:00
  • 7f154e2712 Make left button also go back to the run history screen David Yang 2025-03-03 23:57:06 +08:00
  • 86114a9ce0
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-03 09:18:06 +01:00
  • 93422d828d Remove ShowAbilityPhase import from ability.ts Dean 2025-03-02 23:45:15 -08:00
  • 8777dfaffe Merge remote-tracking branch 'rogue/beta' into ability_display Dean 2025-03-02 23:43:37 -08:00
  • 60c4995e74 Adjusts aurora veil test, minor tweaks to reflect and lightscreen tests Christopher Schmidt 2025-03-02 22:28:56 -05:00
  • e3c0ac8238 Adds guard for critical hits before checking for screen multipliers, adjusts tests for reflect and lightscreen Christopher Schmidt 2025-03-02 22:19:39 -05:00
  • 81a2070a45 Merge branch 'reviverseed' of https://github.com/schmidtc1/pokerogue into reviverseed Christopher Schmidt 2025-03-02 21:53:50 -05:00
  • 653e328f4d Merge locales Christopher Schmidt 2025-03-02 21:50:37 -05:00
  • cabcfcbd39
    [Balance] Make megas/max player pokemon unable to tera (#5469) Xavion3 2025-03-03 13:22:37 +11:00
  • 3ad17bb2e9
    Merge branch 'beta' into tera-megamax damocleas 2025-03-02 21:01:45 -05:00
  • 5e469620ef
    [Bug] Fix battle-anims crashing in certain cases (#5337) Sirz Benjie 2025-03-02 19:15:51 -06:00
  • 5cf77ff2c3 Also no ultra necrozma Xavion3 2025-03-03 11:05:29 +11:00
  • 32483fcd0e Prevent player megas and max pokemon from teraing Xavion3 2025-03-03 09:51:41 +11:00
  • 6d123259ad Add isMega helper function Xavion3 2025-03-03 09:47:34 +11:00
  • 57e1e67262 bugfix Lylian 2025-03-02 23:32:04 +01:00
  • 524f61ad0f Merge branch 'pr-illusion' of https://github.com/PyGaVS/pokerogue into pr-illusion Lylian 2025-03-02 23:24:37 +01:00
  • 15e3f3d1e7 merge up-to-date Lylian 2025-03-02 23:21:44 +01:00
  • d6bcc4ddad merge up-to-date Lylian 2025-03-02 23:19:36 +01:00
  • bebf529e86 delete draft Lylian 2025-03-02 22:16:57 +01:00
  • 83f5968c27 Zoroark keep illusion between battles Lylian 2025-03-02 22:10:52 +01:00
  • e522ab3d31 Zoroark keep illusion between battles Lylian 2025-03-02 22:09:57 +01:00
  • 5f83fdb486 839-gigantamax Unicornpowerstar 2025-03-02 21:11:31 +01:00
  • c0da2aa0c4 815-gigantamax Unicornpowerstar 2025-03-02 20:56:31 +01:00
  • fd7924a5ca
    Merge 2346834c4c9b488298ffe6de34cbc65c652d2b31 into 6f686a05e39cb75c2ee110ab996b2b4ed0735cb0 Unicorn_Power 2025-03-02 20:43:19 +01:00
  • 8bfbee4345
    Merge branch 'beta' into fix-5122 damocleas 2025-03-02 14:39:17 -05:00
  • 6f686a05e3
    [UI/UX] [Bug] Hiding tera button when toggling on stats mode (#5466) Wlowscha 2025-03-02 20:35:59 +01:00
  • 600fb68327
    Merge branch 'beta' into tera-symbol-disappears damocleas 2025-03-02 14:03:13 -05:00
  • 73afb35c4d
    [GitHub] Update CODEOWNERS to fix team ownership (#5465) Sirz Benjie 2025-03-02 12:40:40 -06:00
  • 827223288a
    Merge branch 'beta' into tera-symbol-disappears Wlowscha 2025-03-02 19:24:39 +01:00
  • 36bb7c63a3
    Add balance team as codeowners to src/data/balance Sirz Benjie 2025-03-02 12:20:40 -06:00
  • 0fe3b9c73b
    Hiding tera button when toggling on stats mode Wlowscha 2025-03-02 19:12:48 +01:00
  • b88391942a
    Make composer-team owner of /public/audio Sirz Benjie 2025-03-02 11:57:16 -06:00
  • d5a6af9bdd
    Add art team as codeowners to public Sirz Benjie 2025-03-02 11:41:48 -06:00
  • 659bc82676 [i18n] Up version to 1.7.6, Update locales submodule damocleas 2025-03-02 12:19:17 -05:00
  • 68235acb66
    Merge branch 'beta' into fix-challenge-filters Wlowscha 2025-03-02 18:18:17 +01:00
  • 4a5685c049
    Merge branch 'beta' into sprite-masterlist-script damocleas 2025-03-02 11:37:13 -05:00
  • a46d8a6855
    Update splash message tests Madmadness65 2025-03-02 02:38:03 -06:00
  • 5c09606530 Fix docs Dean 2025-03-02 00:34:51 -08:00
  • 653dbd14b3 Add case where move becomes the redirect type to tests Dean 2025-03-02 00:30:59 -08:00