Commit Graph

  • 17609044b6
    Merge branch 'beta' into romanian-workspace Lugiad 2025-03-25 21:14:19 +0100
  • 24d7297643
    Merge branch 'beta' into danish-workspace Lugiad 2025-03-25 21:14:05 +0100
  • d4a2d7c6f9
    Merge branch 'beta' into turikish-workspace Lugiad 2025-03-25 21:13:50 +0100
  • 3d03da1051
    Merge branch 'beta' into hebrew-pr Lugiad 2025-03-25 21:12:44 +0100
  • 22becf8ea6
    Merge branch 'beta' into pokedex-after-catch Wlowscha 2025-03-25 21:12:22 +0100
  • 126904aeab Fix shop AJ Fontaine 2025-03-25 14:58:12 -0400
  • 2f09141d4a
    Merge branch 'beta' into catalan-activation Lugiad 2025-03-25 15:18:10 +0100
  • 6d29e8107f
    Merge branch 'beta' into more-trainers damocleas 2025-03-24 23:50:43 -0400
  • b033bc32b4
    Update title-ui-handler.ts changed battles won fallback number to -1 damocleas 2025-03-24 22:13:06 -0400
  • 19af635b6e Add gender splash message code Madmadness65 2025-03-24 21:05:47 -0500
  • 9ea469b3a6
    Merge branch 'beta' into splashtexts damocleas 2025-03-24 21:56:17 -0400
  • 71c745c48c
    Update loading-scene.ts Lugiad 2025-03-24 23:15:43 +0100
  • c9e32e5665
    Update utils.ts with Catalan Lugiad 2025-03-24 23:06:12 +0100
  • c531719b5d
    Update starter-select-ui-handler.ts Lugiad 2025-03-24 21:47:23 +0100
  • ad863e98d1
    Merge branch 'pagefaultgames:beta' into catalan-activation Lugiad 2025-03-24 21:28:55 +0100
  • 6951c878b7 more AJ Fontaine 2025-03-24 16:17:26 -0400
  • 75cdd3d8d9 global timed event manager AJ Fontaine 2025-03-24 16:04:58 -0400
  • 804503134a
    Add files via upload Lugiad 2025-03-24 20:40:07 +0100
  • 8d59ccb7dd
    Add files via upload Lugiad 2025-03-24 20:26:44 +0100
  • d3886a0023 Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into metronomechal AJ Fontaine 2025-03-24 14:25:52 -0400
  • 8d29c1fb31 Challenge types for shop removals and reward table changes AJ Fontaine 2025-03-24 14:21:59 -0400
  • 8993a51292
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-24 17:38:36 +0100
  • 448c9958f0
    Merge branch 'beta' into return-button-on-dex-pages damocleas 2025-03-24 00:55:55 -0400
  • 1969c745c1
    Merge branch 'beta' into fix-challenge-filters-again NightKev 2025-03-23 19:36:49 -0700
  • 6ac9b3f0d6
    Merge branch 'beta' into flee Madmadness65 2025-03-23 18:23:51 -0500
  • ddbaef12d8
    Merge branch 'beta' into reviverseed NightKev 2025-03-23 15:12:10 -0700
  • caf534a4a0
    Merge branch 'beta' into doubles-blessing NightKev 2025-03-23 13:43:48 -0700
  • f233c4aa21
    Merge branch 'beta' into flee NightKev 2025-03-23 13:43:06 -0700
  • 424977ca71
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-23 21:23:19 +0100
  • e2f7bdebb7
    Merge branch 'beta' into activation-order Dean 2025-03-23 11:37:13 -0700
  • 524c7d2d60
    Merge branch 'beta' into doubles-blessing Wlowscha 2025-03-23 19:22:36 +0100
  • 8d5168096a
    Merge branch 'beta' into return-button-on-dex-pages Wlowscha 2025-03-23 18:29:33 +0100
  • 1be8412440
    Merge branch 'beta' into reviverseed Wlowscha 2025-03-23 18:14:32 +0100
  • 73ef884dc9
    Merge branch 'beta' into pokedex-after-catch Wlowscha 2025-03-23 18:14:13 +0100
  • 196df175b6
    Merge branch 'beta' into fix-challenge-filters-again Wlowscha 2025-03-23 18:12:35 +0100
  • 8ba733d0c9 Disable other challenge achievements with Metronome challenge AJ Fontaine 2025-03-23 12:22:01 -0400
  • 1948deb396 [BUG] Now properly loads the transformed sprite assets during summon phase José Marques 2025-03-23 03:03:00 +0000
  • f7b04faa2a
    Update settings.ts Lugiad 2025-03-23 03:19:44 +0100
  • 1ffe72ecfa
    Add files via upload Lugiad 2025-03-23 03:17:31 +0100
  • a8c3f68e0b [BUG] Fix the bug where transformed pokemon failed to load sprite on reload if it was not the base form José Marques 2025-03-15 21:09:03 +0000
  • 102c0ffc37 [BUG] fixes #5472 - transform on reload José Marques 2025-03-11 13:32:25 +0000
  • 366a6b7a6f
    remove happy hour too damocleas 2025-03-22 17:09:56 -0400
  • 91b569db29
    fix damocleas 2025-03-22 17:08:24 -0400
  • cf4b98151e
    Update invalid-moves.ts damocleas 2025-03-22 17:07:15 -0400
  • d6fd7c8af3 Mirror Move now respects the uncallable moves list NightKev 2025-03-22 13:31:38 -0700
  • 05fa3d79a0 Add list of uncallable moves for Mirror Move NightKev 2025-03-22 13:22:18 -0700
  • 4a75ea28f0
    forgot fleur cannon damocleas 2025-03-22 15:54:34 -0400
  • 99bcd50efb
    Merge branch 'pagefaultgames:beta' into damo-metronome damocleas 2025-03-22 15:50:43 -0400
  • ab3db6bd08 Checks for hit result status on Grip Claw application Christopher Schmidt 2025-03-22 11:43:31 -0400
  • 8bca0bcb32
    Merge branch 'beta' into beta Inês Simões 2025-03-22 09:25:14 +0000
  • 5560af0d1c
    Update invalid-moves.ts damocleas 2025-03-22 00:21:02 -0400
  • 632b44df2f Fix starting moveset AJ Fontaine 2025-03-21 23:19:19 -0400
  • 16df3fd806 Metronome challenge AJ Fontaine 2025-03-21 23:06:31 -0400
  • 726665e8f2 Add dialogue entries for new dialogue Madmadness65 2025-03-21 20:36:59 -0500
  • 9adf5abe4f
    fix blank line damocleas 2025-03-21 17:48:35 -0400
  • e5b3d3bd03
    Merge branch 'beta' into splashtexts damocleas 2025-03-21 17:47:45 -0400
  • 25327834ec
    Update splash-messages.ts damocleas 2025-03-21 17:44:39 -0400
  • de117ca732 Merge branch 'flee' of https://github.com/emdeann/pokerogue into flee Dean 2025-03-21 13:29:26 -0700
  • d1a4b4e50f Merge branch 'beta' into flee Dean 2025-03-21 13:28:01 -0700
  • c09e28298b
    Butterfree, Orbettle, and Drednaw adjustments damocleas 2025-03-21 00:32:16 -0400
  • 5aa04331e5
    Fix Urshifus damocleas 2025-03-21 00:10:57 -0400
  • 68b50bedb5
    Cinderace, Corviknight, Drednaw, and Coalossal adjustments damocleas 2025-03-20 22:38:38 -0400
  • 19db3a7a77
    Orbeetle and Drednaw adjustment damocleas 2025-03-20 21:35:06 -0400
  • fbab1dd46e Merge branch 'reviverseed' of https://github.com/schmidtc1/pokerogue into reviverseed Christopher Schmidt 2025-03-20 21:23:20 -0400
  • b755f66229 Conflicts Christopher Schmidt 2025-03-20 21:22:44 -0400
  • 36579243f0
    Update pokemon-species.ts damocleas 2025-03-20 20:46:18 -0400
  • b17c0dd03c
    Merge branch 'beta' into damo-sheerforcedfixes damocleas 2025-03-20 20:00:29 -0400
  • f213747500
    Merge branch 'beta' into hebrew-pr Lugiad 2025-03-20 23:24:31 +0100
  • ce898bc401
    Merge branch 'beta' into turikish-workspace Lugiad 2025-03-20 23:24:06 +0100
  • 08df95f0d5
    Merge branch 'beta' into danish-workspace Lugiad 2025-03-20 23:23:50 +0100
  • 7efead1fc4
    Merge branch 'beta' into romanian-workspace Lugiad 2025-03-20 23:23:30 +0100
  • a57530cb9f Merge branch 'beta' into more-trainers Madmadness65 2025-03-20 15:12:58 -0500
  • 5990dfc061
    Merge branch 'beta' into trnrchgs18 damocleas 2025-03-20 15:50:01 -0400
  • 95945f18f6
    Merge branch 'beta' into trnrchgs18 damocleas 2025-03-20 15:33:42 -0400
  • 4b9796a484
    Merge branch 'beta' into slow-start-msg damocleas 2025-03-20 15:33:25 -0400
  • 58cfeb822c
    Merge branch 'beta' into poison-heal-crash damocleas 2025-03-20 15:23:22 -0400
  • 53eba3bcfb
    Merge branch 'beta' into Incorrect-labeling-in-exp-sprite.json NightKev 2025-03-20 12:11:41 -0700
  • 84c2d840db Name change Unicornpowerstar 2025-03-20 17:09:15 +0100
  • 14610d07f0 Fix !== null uses Dean 2025-03-19 19:52:49 -0700
  • b99661767f
    Merge branch 'beta' into chilly-test Dean 2025-03-19 15:53:37 -0700
  • fc30ba20d2 Remove extraneous resets Dean 2025-03-19 15:52:37 -0700
  • da0f70908c Fix ability overrides Dean 2025-03-19 15:44:27 -0700
  • 95713db958
    Merge branch 'beta' into beta damocleas 2025-03-19 18:09:54 -0400
  • 92fbd9011f
    Merge branch 'beta' into beta damocleas 2025-03-19 17:59:10 -0400
  • ee56255fe7
    Merge branch 'beta' into beta damocleas 2025-03-19 17:57:33 -0400
  • 4076aa7534 Re-export item atlas, fix extender item's name Madmadness65 2025-03-19 15:00:05 -0500
  • 5e5532fa7d Fixing indexing for the sprite atlas Unicornpowerstar 2025-03-19 20:33:27 +0100
  • c48ec91505 Terrain/weather-extender item Unicornpowerstar 2025-03-19 17:47:09 +0100
  • 6cb3a4ec68 Charcadet line exp disable Unicornpowerstar 2025-03-19 16:21:55 +0100
  • 2707d78572 Corrected the Indicator for the exp being disabled Unicornpowerstar 2025-03-19 15:50:59 +0100
  • 8b8caad5de Fixes #5085: Updated my proposed fix Changed the move.ts file: In the StatusEffectAttr class updated the "apply()" function so that when a status isn't inflicted to the opposing pokemon it checks if the cause of that failure is Type immunity or immunity provided by an ability. Inês Simões 2025-03-19 14:19:05 +0000
  • a81267c4df
    Merge branch 'beta' into beta NightKev 2025-03-18 20:50:06 -0700
  • 9959420804
    Replace let with const NightKev 2025-03-18 20:48:35 -0700
  • 025b52f327 [Test] Add ability overrides to Tailwind tests NightKev 2025-03-18 20:29:46 -0700
  • 40de5ba405 Add test for dynamic updates Dean 2025-03-18 20:10:38 -0700
  • a3295e0837
    Merge branch 'beta' into fix-icons damocleas 2025-03-18 22:15:41 -0400
  • f97bb606fe
    Reworked icons to more compact code Wlowscha 2025-03-19 00:41:40 +0100
  • 2cbd0f5799 [Misc] Add * -crlf to .gitattributes NightKev 2025-03-18 16:05:17 -0700
  • 6857f85384 Find to some AJ Fontaine 2025-03-18 18:41:43 -0400
  • 10d0e599a5 Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into trnrchgs18 AJ Fontaine 2025-03-18 18:32:36 -0400