Commit Graph

  • 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
  • d386a36f78 Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into gymteams AJ Fontaine 2024-10-29 17:44:34 -0400
  • 15dedf06ed
    [P2] No Exp Gained after Switching in a Pokemon as the Opponent Faints (#4687) PrabbyDD 2024-10-29 14:38:57 -0700
  • afe6d2900d
    [P2] Fix for Speed Boost is Activated on the Turn a Pokemon is Switched In, and When a Pokemon Fails to Escape #4353 (#4676) PrabbyDD 2024-10-29 14:38:33 -0700
  • fd1aa41d09
    [P2] Fix AI targeting allies with status effect moves (#4717) innerthunder 2024-10-29 14:32:07 -0700
  • 921d4fa18c
    [P2] Chloroblast & Struggle should not recoil if the move failed (#4719) NightKev 2024-10-29 14:31:37 -0700
  • f9fe59239e
    [TMs] Remove Sacred Sword, add Secret Power TM, fix Reflect compatibility (#4713) AJ Fontaine 2024-10-29 17:31:02 -0400
  • 1cbe8b1505
    [P3] Fixing form name being incorrect for some evolved pokemon (#4742) Opaque02 2024-10-30 07:30:20 +1000
  • d65b5f170e
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-29 22:17:45 +0100
  • a5243e4eb3
    Merge pull request #22 from MokaStitcher/loc-es-es Lugiad 2024-10-29 22:16:50 +0100
  • 1b9d29f4bc change halloween event banner from es to es-ES Moka 2024-10-29 22:11:22 +0100
  • ecab2d6268 Merge branch 'beta' into pokemon.ts-cleanup NightKev 2024-10-29 13:42:56 -0700
  • e6be838b91 change remaining 'es' to 'es-ES' in various UIs Moka 2024-10-29 22:00:24 +0100
  • 74b1b95008 Temporarily disable broken ME test NightKev 2024-10-29 13:53:09 -0700
  • a957857afa Merge beta xsn34kzx 2024-10-29 16:44:10 -0400
  • 1063ab3176 Bump Game Version xsn34kzx 2024-10-29 16:42:39 -0400
  • 65269f935f
    [Balance] Change Bouncy Bubble's Attributes (#4757) Blitzy 2024-10-29 15:19:42 -0500
  • 1126dea986
    Move comment to what is custom about Bouncy Bubble damocleas 2024-10-29 13:56:28 -0600
  • b3b439a03b
    Merge branch 'beta' into beta ThePsychedelicSeal 2024-10-29 13:26:18 -0600
  • cb2f2d53ce Adding to updateGameInfo() PsychedelicSeal 2024-10-29 13:12:57 -0600
  • 2e823c9863
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-29 19:23:14 +0100
  • 307a56d6b0
    Update timed-event-manager.ts Lugiad 2024-10-29 19:22:53 +0100
  • 8ec774533e
    Update loading-scene.ts Lugiad 2024-10-29 19:22:36 +0100
  • 13ff80fb95
    Mark Last Respects as partial (#4749) NightKev 2024-10-29 10:59:28 -0700
  • b0a73b51e3
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-29 18:15:42 +0100
  • fb2d3e45d6
    [Move][Ability] Fully Implement Forest's Curse / Trick Or Treat / Mimicry (#4682) Mumble 2024-10-29 10:10:37 -0700
  • 3bed563968
    Merge branch 'beta' into attempt2plusmimicry flx-sta 2024-10-29 09:37:44 -0700
  • b840191c20
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-29 17:36:36 +0100
  • f2ee5a729b Merge branch 'beta' into refactor/api-requests flx-sta 2024-10-29 09:17:10 -0700
  • a97dafe8b2 skip some clowning-around-encounter tests if events are active flx-sta 2024-10-29 09:16:57 -0700
  • cc1716355e
    Merge branch 'beta' into local_development_and_offline Moka 2024-10-29 16:56:52 +0100
  • 38a6bf07e3
    [Bug] Fix enemy faint causing Frenzy moves to mishandle paralysis (#4680) geeilhan 2024-10-29 16:36:24 +0100
  • 29807381b9
    Merge branch 'beta' into refactor/api-requests flx-sta 2024-10-29 08:12:12 -0700
  • e659f7cc8d Removing Redundant switchOutStatus Sets geeil-han 2024-10-29 12:52:27 +0100
  • 6cf047aa1f Added Lingering Arena Trap Fix for Mystery Encounters geeil-han 2024-10-29 10:02:31 +0100
  • 8d279f8eb0 added switchOutStatus for all relevant moves geeil-han 2024-10-29 09:39:49 +0100
  • 227ce81374 [P2 BUG] Fixed Lingering Arena Trap if Pokemon Switches Out (#3713) geeil-han 2024-10-29 08:55:00 +0100
  • 4036b19c7f Merge branch 'beta' into commander innerthunder 2024-10-29 00:52:14 -0700
  • 6c8d621a3a
    Merge branch 'pagefaultgames:beta' into beta geeilhan 2024-10-29 07:37:15 +0100
  • 487deb3f43 Adding to window.gameInfo ThePsychedelicSeal 2024-10-28 21:52:44 -0600
  • 12ffa17ea2
    Merge branch 'beta' into evil-team-monogen Madmadness65 2024-10-28 20:59:49 -0500
  • 0435aa6e5e
    Merge branch 'beta' into local_development_and_offline podar 2024-10-28 20:54:02 -0500
  • ac5c79a953
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-29 00:43:58 +0100
  • 13377806ff
    [Refactor] Change attack type booster names to enum (#4725) AJ Fontaine 2024-10-28 18:58:46 -0400
  • 1a2232881a
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-28 21:57:34 +0100
  • 3241332a3c
    [Ability] Implementing Friend Guard (#4718) PrabbyDD 2024-10-28 13:49:04 -0700
  • dce4c4c75b
    Merge branch 'beta' into spanish-es-to-eses Lugiad 2024-10-28 19:23:35 +0100
  • 80b9b7a567
    Merge branch 'beta' into refactor/api-requests flx-sta 2024-10-28 10:53:19 -0700
  • fe7d156d2d
    Merge pull request #4754 from pagefaultgames/main Moka 2024-10-28 17:40:48 +0100
  • 350201e557
    Merge branch 'beta' into danish-workspace Lugiad 2024-10-28 17:02:53 +0100
  • 8b30740960
    Update settings-display-ui-handler.ts Lugiad 2024-10-28 16:53:08 +0100
  • 0e33d3b2b8
    Update settings-display-ui-handler.ts Lugiad 2024-10-28 16:28:04 +0100
  • 62d0068d4c
    Update utils.ts Lugiad 2024-10-28 16:09:53 +0100
  • ddfc0d258d
    Update starter-select-ui-handler.ts Lugiad 2024-10-28 16:09:23 +0100
  • 7a87c6a19d
    Update settings-display-ui-handler.ts Lugiad 2024-10-28 16:08:12 +0100
  • ca904c337b
    Update settings.ts Lugiad 2024-10-28 16:06:37 +0100