Commit Graph

  • a6f1c3e2ca test precommit Greenlamp 2024-05-23 09:37:07 +0200
  • cd6be50b05 test precommit Greenlamp 2024-05-23 09:36:13 +0200
  • d376737994 test precommit Greenlamp 2024-05-23 09:35:11 +0200
  • dee00beab4 test precommit Greenlamp 2024-05-23 09:28:34 +0200
  • ae6800d990 test precommit Greenlamp 2024-05-23 09:28:20 +0200
  • 94a5f0e75e test precommit Greenlamp 2024-05-23 09:26:03 +0200
  • b9eadd07a1 test precommit Greenlamp 2024-05-23 09:24:28 +0200
  • 75cb018ed4 added lefthook Greenlamp 2024-05-23 09:23:59 +0200
  • 0879f607fe Merge branch 'feat/eslint' of github.com:Greenlamp2/pokerogue into feat/eslint Greenlamp 2024-05-23 09:08:40 +0200
  • e708080462 Implement conditional protection arena tag innerthunder 2024-05-20 20:01:17 -0700
  • 9b72cc585e Added chinese splash Jannik Tappert 2024-05-23 08:21:00 +0200
  • 28b2cea784 Added Dialogue to all languages (just copied the english file). And updates the config.ts Jannik Tappert 2024-05-23 08:19:23 +0200
  • 8e49ed5e4b Added final boss and ending dialogue Jannik Tappert 2024-05-23 08:05:55 +0200
  • 60c053f2d8 a ghm5755 2024-05-22 22:52:31 -0700
  • 162157e58b Added Rival Dialogue Jannik Tappert 2024-05-23 07:49:48 +0200
  • a1ce710090 LuckVale increases odds of rare encounters ghm5755 2024-05-22 22:34:41 -0700
  • 84c5b0e1be Revert "Luck increasing the odds of rare encounters" ghm5755 2024-05-22 22:31:53 -0700
  • 45415a87bb
    Disable tera-blast to prevent its use while there is not an animation (#1270) Vance Ehrlich 2024-05-23 00:37:23 -0400
  • 28d8de3414 Luck increasing the odds of rare encounters Mainly an example for the sake of concept ghm5755 2024-05-22 21:24:38 -0700
  • e120389130 Add missing Electric Terrain moves to Quark Drive mons. Chacolay 2024-05-23 00:15:14 -0400
  • 44cebf87b9 Update TERA_BLAST to be unimplemented rather than partial Vance Ehrlich 2024-05-22 23:15:58 -0400
  • 9f3830891d Disable tera-blast to prevent its use while there is not an animation Vance Ehrlich 2024-05-22 23:07:42 -0400
  • 8fd04fe69a Beat Up checks the user's party instead of always checking player's party td76099 2024-05-22 22:33:55 -0400
  • 796db23fcd Fix typos Temps Ray 2024-05-22 21:17:08 -0400
  • be1e15ac01 applied double quote linter rule Frederico Santos 2024-05-23 01:43:45 +0100
  • f7baca1850 Merge branch 'main-pokerogue' into feat/eslint Frederico Santos 2024-05-23 01:12:50 +0100
  • 8cd166536a
    Egg-move changes for 8 pokemon (#1262) damocleas 2024-05-22 18:08:26 -0600
  • 3f38573cff
    Egg-move changes for 8 pokemon damocleas 2024-05-22 18:04:08 -0600
  • 4ad723bec0 Revert "hotfix berries triggering before status effects" Dmitriy 2024-05-22 20:03:41 -0400
  • 888a5eeea7 Fix some comments, as well as make Poison Heal only notify when healing Ethan 2024-05-22 19:47:36 -0400
  • 8b4aa872d9
    Update wrong Italian ability localizations and berry pouch (#1259) Tempoanon 2024-05-22 19:38:00 -0400
  • a601d4d39e
    hotfix creating berry with undefined type (#1260) Dmitriy K 2024-05-22 19:34:49 -0400
  • d105104bf9 hotfix creating berry with undefined type Dmitriy 2024-05-22 19:14:26 -0400
  • c5963a2ded Merge branch 'main' of github.com:pagefaultgames/pokerogue into feat/eslint Greenlamp 2024-05-23 01:27:14 +0200
  • b0371fc471 added curly brace style + eslint Greenlamp 2024-05-23 01:23:59 +0200
  • f1e471dbd9
    Merge pull request #3 from Adri1/patch-11 José Ricardo Fleury Oliveira 2024-05-22 20:21:30 -0300
  • 22f5d30563 Update wrong Italian ability localizations and berry pouch Temps Ray 2024-05-22 19:01:59 -0400
  • 1672206c00 fix human error + ignore build folder + merge overrides Greenlamp 2024-05-23 00:57:38 +0200
  • 6240e623d2 Done with the trainer dialogue except the rival(s). And the special dialogue... Jannik Tappert 2024-05-23 00:38:05 +0200
  • 288b985ae7 merged new changes, added comments, implemented fixes DustinLin 2024-05-22 17:40:19 -0400
  • 6c824d8894
    Give Certain Starters a Reliable Level 1 Damaging Move (#1250) Blitzy 2024-05-22 16:36:57 -0500
  • 7e2bba9e34 Allow running with Run Away ability c4vv 2024-05-22 17:05:06 -0400
  • 592d23d1cb
    Added Formatting to indicate what is custom, changed Spoink to pull from Confusion 2 levels earlier Blitzy 2024-05-22 15:44:44 -0500
  • 5c0dac7a78 Started Dialogue Loc. This is very much WIP Jannik Tappert 2024-05-22 22:15:24 +0200
  • d00371131b Merge branch 'main' into implement-incinerate-move Frank 2024-05-22 22:11:50 +0200
  • ff166e4647 Shinylock uncatchable Pokemon Temps Ray 2024-05-22 16:11:18 -0400
  • f06b8250f0
    Give certain Pokemon a level 1 damage dealing move Blitzy 2024-05-22 14:40:54 -0500
  • e66d7026d5
    Added German Localization to Voucher.ts (#1249) Jannik Tappert 2024-05-22 21:40:53 +0200
  • 49a2b8043c Added German Localization to Voucher.ts Jannik Tappert 2024-05-22 21:37:44 +0200
  • 4308a62ef3
    Give certain Pokemon who start without a damage dealing move a Level 1 option. Blitz425 2024-05-22 14:32:58 -0500
  • 3fbbc9a165 hotfix berries triggering before status effects Dmitriy 2024-05-22 15:31:03 -0400
  • 82bc8b73c6
    French typo correction achv.ts Lugiad 2024-05-22 20:40:06 +0200
  • 0f56f7614f fix force switch move torranx 2024-05-23 02:26:40 +0800
  • 1db59ce967 Issue #1118 Added Galar Elite 4 Jannik Tappert 2024-05-22 20:12:42 +0200
  • b72b432ce3
    Spanish translations (#1084) nedpfeiffer 2024-05-22 11:01:29 -0700
  • e663d40cc4
    Fix exception in solo battles Jakub Hanko 2024-05-22 20:00:32 +0200
  • 81f46d7687
    Add docs Jakub Hanko 2024-05-22 19:52:45 +0200
  • 51090fa3dd
    Merge branch 'main' into friend_guard Jakub Hanko 2024-05-22 19:39:17 +0200
  • 717a02ff9e Removed unneeded import Ethan 2024-05-22 13:39:05 -0400
  • db1850f009 Implement Poison Heal Ability Ethan 2024-05-22 13:34:52 -0400
  • 240cc44d4a
    Merge branch 'main' into dancer YounesM 2024-05-22 18:29:56 +0200
  • ec5d46b906 Merge branch 'main' into refactor/cleanup Laeticia PIERRE 2024-05-22 18:25:18 +0200
  • 96ba5a726d Allow Jirachi to be caught in Space (puzzle) Temps Ray 2024-05-22 12:23:52 -0400
  • bf41c672a2 Final Commit Benjamin Odom 2024-05-22 10:34:39 -0500
  • fda81ddac9 fix comments Matthew Olker 2024-05-22 11:30:00 -0400
  • 09102358e4 Update pokemon.ts Dread134 2024-05-22 11:23:25 -0400
  • 048c9da5ce Update pokemon.ts Dread134 2024-05-22 11:21:25 -0400
  • 9df1dcf884
    Merge branch 'pagefaultgames:main' into Flyout-Add Benjamin Odom 2024-05-22 10:18:36 -0500
  • ffe190d9d3 Merge branch 'MoveTracking-Add' of https://github.com/bennybroseph/pokerogue into MoveTracking-Add Benjamin Odom 2024-05-22 10:13:44 -0500
  • e58bc73ce7 Update pokemon.ts Benjamin Odom 2024-05-22 10:13:30 -0500
  • f44f0815db
    Update battle-scene.ts Benjamin Odom 2024-05-22 10:11:45 -0500
  • eeea76cc59
    Delete src/ui/fight-flyout.ts Benjamin Odom 2024-05-22 10:09:28 -0500
  • 5819e42556
    Delete src/ui/battle-flyout.ts Benjamin Odom 2024-05-22 10:09:11 -0500
  • 99557b318f Merge branch 'main' of https://github.com/pagefaultgames/pokerogue Matthew Olker 2024-05-22 11:06:49 -0400
  • aed9b56a7b Add helper functions to game mode Matthew Olker 2024-05-22 11:06:24 -0400
  • ebec393210
    Move tracking add (#4) Benjamin Odom 2024-05-22 10:04:37 -0500
  • 3c855bea09 Reapply "Merge branch 'Flyout-Add' into MoveTracking-Add" Benjamin Odom 2024-05-22 10:02:49 -0500
  • aa974934af Revert "Merge branch 'Flyout-Add' into MoveTracking-Add" Benjamin Odom 2024-05-22 10:01:08 -0500
  • bcb793d6db Merge branch 'main' into conditional_boss_ur Temps Ray 2024-05-22 11:00:06 -0400
  • ecc17c5342
    Fixes Issue #805, the TODO was for a bug and was fixed in Platinum (#1238) Ethan 2024-05-22 10:59:29 -0400
  • 7bc7fc89cf
    Move tracking add (#3) Benjamin Odom 2024-05-22 09:57:43 -0500
  • 72582c6abc
    Merge branch 'Flyout-Add' into MoveTracking-Add Benjamin Odom 2024-05-22 09:57:22 -0500
  • c5143993da Update battle-flyout.ts Benjamin Odom 2024-05-22 09:54:31 -0500
  • 1cb972ff84 Add ppUsed Benjamin Odom 2024-05-22 09:53:32 -0500
  • fed5c0eb0c Update phases.ts Benjamin Odom 2024-05-22 09:50:03 -0500
  • ce292c3276 Update pokemon.ts Dread134 2024-05-22 10:42:36 -0400
  • 82208cc2b8 Fixes Issue #805, the TODO was for a bug and was fixed in Platinum Ethan 2024-05-22 10:41:58 -0400
  • fe2d217688 Update battle-flyout.ts Benjamin Odom 2024-05-22 09:29:17 -0500
  • cb6884fd7a Update battle-flyout.ts Benjamin Odom 2024-05-22 09:22:15 -0500
  • cb9abbc37d Resolving merge problems ArceUseless 2024-05-22 16:15:26 +0200
  • b45dca5a0d
    Merge branch 'main' into destiny_bond Jakub Hanko 2024-05-22 16:10:41 +0200
  • 1ca4a9d34b Conflict fix Ethan 2024-05-22 10:10:10 -0400
  • 6fa65c97d7 Small Flyout Cleanup Benjamin Odom 2024-05-22 09:09:13 -0500
  • 5f9bb69279
    Merge branch 'main' into summary rnicar245 2024-05-22 15:56:42 +0200
  • ffe7c371b3 run auto formatter because I forgot Dmitriy 2024-05-22 09:33:29 -0400
  • 8a5f8e8f6d add cheek pouch trigger to new berry phase, remove partial tag Dmitriy 2024-05-22 09:25:21 -0400
  • d6b8e42482 add cheek pouch trigger to EatBerryAttr class Dmitriy 2024-05-20 01:26:16 -0400
  • 6dd85672ec Partially implement Cheek Pouch ability Dmitriy 2024-05-16 15:22:05 -0400
  • cd7e818a01
    Mostly implement the Harvest ability (#1081) Dmitriy K 2024-05-22 08:52:45 -0400
  • 742dfa09cc New test for missing localization case Laeticia PIERRE 2024-05-22 14:47:39 +0200