Commit Graph

  • ec4416c8a4
    Merge branch 'beta' into autot flx-sta 2024-09-17 20:48:06 -0700
  • 17e5ef789d Fix unit tests Temps Ray 2024-09-17 23:40:03 -0400
  • 1dbbf89530 fix bug type superfan dialogue discrepancy ImperialSympathizer 2024-09-17 23:31:46 -0400
  • 8abe06334e fix ts error ImperialSympathizer 2024-09-17 23:28:46 -0400
  • 3250fcfad5
    Update a-trainers-test-dialogue.json Yonmaru40 2024-09-18 11:27:17 +0800
  • 3991a8205a Merge branch 'mystery-encounter-fixes' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes ImperialSympathizer 2024-09-17 23:25:03 -0400
  • bdd0850e6f Another linting Temps Ray 2024-09-17 23:21:55 -0400
  • d2e7a4d7bb
    Merge branch 'beta' into implSynchronize flx-sta 2024-09-17 20:21:01 -0700
  • abc6127690
    Merge branch 'beta' into mystery-encounter-fixes ImperialSympathizer 2024-09-17 22:20:27 -0500
  • 888f971c45 updating AI for Slumbering Snorlax ME, and small ME balance changes ImperialSympathizer 2024-09-17 23:19:13 -0400
  • 18cd5a27c2
    Merge branch 'beta' into 3191mirror flx-sta 2024-09-17 19:59:44 -0700
  • 7b74e021ad Fix merge conflict Temps Ray 2024-09-17 22:54:04 -0400
  • c9817aa320 Update pokemon-info-container ability highlighting to match tinted ball ability check Temps Ray 2024-09-17 22:47:19 -0400
  • 6030b780f2
    [Move][Mirror] Update HitTagAttr attributes v2 (#4297) flx-sta 2024-09-17 19:41:46 -0700
  • 2baaa8bab3 rename: DealsDoubleDamageToTagAttr (from HitsTagAttr) flx-sta 2024-09-17 19:36:37 -0700
  • dcfdabde3a rename: AlwaysHitMinimizeAttr (from MinimizeAccuracyAttr) flx-sta 2024-09-17 19:35:14 -0700
  • ade37af396
    Merge branch 'beta' into move/Update-HitTagAttr-attributes--mirror flx-sta 2024-09-17 19:32:03 -0700
  • 5f562ba4b9
    Merge branch 'beta' into pokemon-info-box-formName-enhancement flx-sta 2024-09-17 19:28:26 -0700
  • e386504977
    [BUG][Beta] Fix English Status Symbols (#4293) Jannik Tappert 2024-09-18 04:26:47 +0200
  • 106ed6b27b
    [Bug] Using default animation for errors that occur. (#4266) podar 2024-09-17 21:15:47 -0500
  • 4389bff5d0
    [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031) flx-sta 2024-09-17 19:14:41 -0700
  • 6cfc6f9341
    Merge branch 'beta' into daily-standardization flx-sta 2024-09-17 19:14:00 -0700
  • 5940f83b95 move: test type choices into function flx-sta 2024-09-17 18:53:06 -0700
  • 71616fc39d restructure create-test-boilerplate.js code flx-sta 2024-09-17 18:52:24 -0700
  • 3ef3f73ff7
    Merge branch 'beta' into implSynchronize NightKev 2024-09-17 18:44:48 -0700
  • 0f13065855 Merge branch 'main' of https://github.com/pagefaultgames/pokerogue RedstonewolfX 2024-09-17 20:43:33 -0400
  • f08bf50e33 Update phaseInterceptor.ts RedstonewolfX 2024-09-17 20:41:02 -0400
  • f77a36ce3d Add map commit RedstonewolfX 2024-09-17 20:26:52 -0400
  • 9c391f92bd
    Merge pull request #1 from pagefaultgames/main RedstonewolfX 2024-09-17 20:24:09 -0400
  • f879368efc Merge branch 'beta' of https://github.com/RedstonewolfX/pokerogue into beta RedstonewolfX 2024-09-17 20:22:24 -0400
  • 39ee5b27fd
    Merge branch 'pagefaultgames:main' into admin-panel-unlink-update Opaque02 2024-09-18 10:20:12 +1000
  • 09cfdf6f7f Updated as per comment Opaque02 2024-09-18 10:19:16 +1000
  • 1a3485ed43
    Merge branch 'beta' into formChangeLocale Lugiad 2024-09-18 02:17:03 +0200
  • 8fdae0f0ef
    Update pokemon-form.json Lugiad 2024-09-18 02:02:09 +0200
  • 82f6215806
    Update pokemon-form.json Lugiad 2024-09-18 02:02:06 +0200
  • 4181f078ae
    Update pokemon-form.json Lugiad 2024-09-18 02:02:02 +0200
  • 6409fe83b5
    Update pokemon-form.json Lugiad 2024-09-18 02:01:59 +0200
  • e5180cc89a
    Update pokemon-form.json Lugiad 2024-09-18 02:01:55 +0200
  • b5a83b689e
    Update pokemon-form.json Lugiad 2024-09-18 02:01:51 +0200
  • 36e14196de
    Update pokemon-form.json Lugiad 2024-09-18 02:01:47 +0200
  • a5e27bc3a7
    Update pokemon-form.json Lugiad 2024-09-18 02:01:43 +0200
  • 91235ea1f5 make create-test interactive flx-sta 2024-09-17 15:57:09 -0700
  • e278f37ede add: inquirer module flx-sta 2024-09-17 15:56:53 -0700
  • e0244e0b31
    Update a-trainers-test-dialogue.json Lugiad 2024-09-18 00:31:25 +0200
  • 8dffce19a2
    Update bgm-name.json Lugiad 2024-09-18 00:30:26 +0200
  • 6021b0fba7
    Update src/locales/ja/bgm-name.json Lugiad 2024-09-18 00:27:16 +0200
  • 9955169ebd
    Update src/locales/ja/bgm-name.json Lugiad 2024-09-18 00:27:07 +0200
  • 3736ed6acc
    Update src/locales/ja/bgm-name.json Lugiad 2024-09-18 00:26:59 +0200
  • 6affced66a Merge branch 'mystery-encounter-fixes' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes ImperialSympathizer 2024-09-17 18:20:07 -0400
  • 6561074d60 ME bug fix cleanup ImperialSympathizer 2024-09-17 18:19:51 -0400
  • a941b4010a
    Merge branch 'beta' into mystery-encounter-fixes ImperialSympathizer 2024-09-17 17:11:06 -0500
  • ed1a34fa84 cut down excess ME track length and loop properly ImperialSympathizer 2024-09-17 18:10:31 -0400
  • 7e34d5d2c9
    Merge branch 'beta' into move/Update-HitTagAttr-attributes--mirror flx-sta 2024-09-17 14:56:13 -0700
  • bd4828e82e add: steamroller test flx-sta 2024-09-17 14:56:00 -0700
  • 8a97f7ede6 add: whirlwind test flx-sta 2024-09-17 14:55:49 -0700
  • c9cda53724 Add regression test NightKev 2024-08-25 11:35:57 -0700
  • 1fc34d862f Remove .js from import NightKev 2024-08-25 11:08:15 -0700
  • a4bff58a99 Fix merge conflicts TaylorLeLievre 2024-08-25 12:22:19 -0400
  • fdc6abfe72
    Update bgm-name.json Lugiad 2024-09-17 23:47:14 +0200
  • 0bfdfc53e8
    Update bgm-name.json Lugiad 2024-09-17 23:46:45 +0200
  • 9efb964d32
    Update bgm-name.json Lugiad 2024-09-17 23:46:30 +0200
  • 835ea0162f
    Update bgm-name.json Lugiad 2024-09-17 23:46:15 +0200
  • 7520e2b4af
    Update bgm-name.json Lugiad 2024-09-17 23:45:46 +0200
  • 58466c6b82
    Update bgm-name.json Lugiad 2024-09-17 23:45:32 +0200
  • 8962a940d4
    Update bgm-name.json Lugiad 2024-09-17 23:45:16 +0200
  • be764b53ce
    Update bgm-name.json Lugiad 2024-09-17 23:44:45 +0200
  • 773b53f4d1
    Update bgm-name.json Lugiad 2024-09-17 23:44:27 +0200
  • 6afa8bb835
    Merge branch 'beta' into scenarioMode Mumble 2024-09-17 14:42:08 -0700
  • 318b60fa4d Sketch bug fix frutescens 2024-09-17 14:41:31 -0700
  • c7fc11ea5a
    Update bgm-name.json Lugiad 2024-09-17 23:20:27 +0200
  • 510828f18b
    Update bgm-name.json Lugiad 2024-09-17 23:19:40 +0200
  • 23a2c19c6f
    Update bgm-name.json Lugiad 2024-09-17 23:18:38 +0200
  • b6f04cd012
    Update bgm-name.json Lugiad 2024-09-17 23:17:56 +0200
  • fe70148c94
    Update bgm-name.json Lugiad 2024-09-17 23:17:15 +0200
  • fdd79cf99f
    Update bgm-name.json Lugiad 2024-09-17 23:15:21 +0200
  • 8fc9103b45
    Update bgm-name.json Lugiad 2024-09-17 23:14:41 +0200
  • 5b1d999a35
    Update bgm-name.json Lugiad 2024-09-17 23:13:44 +0200
  • b3536e1e66
    Merge branch 'beta' into mystery-encounters-translations Lugiad 2024-09-17 23:09:50 +0200
  • fa5a42791e Add fusions overrides to overridesHelper EmberCM 2024-09-17 15:57:52 -0500
  • 00ba2eebc8
    Add new biome BGM by Firel (#4301) Madmadness65 2024-09-17 15:57:34 -0500
  • fb2e2706a7 Add new biome BGM by Firel Madmadness65 2024-09-17 15:40:46 -0500
  • f44f674fb5 change unit test skips ImperialSympathizer 2024-09-17 16:39:01 -0400
  • e616da63e2 change Trainer's test vouchers for second option ImperialSympathizer 2024-09-17 16:35:50 -0400
  • ed0dd08934 Merge branch 'mystery-encounter-fixes' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes ImperialSympathizer 2024-09-17 16:05:39 -0400
  • 556af3d78f fix final isTransferable rename that was missed ImperialSympathizer 2024-09-17 15:50:15 -0400
  • a1717f97e4
    Merge branch 'beta' into mystery-encounter-fixes ImperialSympathizer 2024-09-17 14:47:31 -0500
  • 2fbf07d4b4 various bug fixes for MEs ImperialSympathizer 2024-09-17 15:45:09 -0400
  • a42976d703 various bug fixes for MEs ImperialSympathizer 2024-09-17 15:44:18 -0400
  • a443c6754d [Move] Update for MinimizeAccuracyAttr chaosgrimmon 2024-07-20 22:48:28 -0400
  • 21c31f1941 [Move] Updated HitAttr tags chaosgrimmon 2024-07-20 22:36:45 -0400
  • 21bafb4eb2 Add fusion options to overrides EmberCM 2024-09-17 14:35:01 -0500
  • d4b006ebf6 Merge remote-tracking branch 'origin/fixEN' into fixEN Jannik Tappert 2024-09-17 20:39:24 +0200
  • 91c34bdb72 Merge branch 'beta' into fixEN Jannik Tappert 2024-09-17 20:38:22 +0200
  • 1dcd7b158e
    Merge branch 'beta' into mystery-encounters-translations Lugiad 2024-09-17 20:37:16 +0200
  • 59459044c6 It now uses the function instead Jannik Tappert 2024-09-17 20:36:43 +0200
  • 50d7342279
    Update src/locales/ko/bgm-name.json Lugiad 2024-09-17 20:31:09 +0200
  • e7e961ca0c
    Update a-trainers-test-dialogue.json Lugiad 2024-09-17 20:30:51 +0200
  • 84bd7a9104
    Update a-trainers-test-dialogue.json Lugiad 2024-09-17 20:29:43 +0200
  • 46e82247ba
    Update a-trainers-test-dialogue.json Lugiad 2024-09-17 20:29:17 +0200
  • 6e2dbbdca3
    Update src/locales/de/mystery-encounters/a-trainers-test-dialogue.json Jannik Tappert 2024-09-17 20:28:31 +0200