random-mirrors
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,312 Commits 36 Branches 7 Tags 2.6 GiB
Commit Graph

3312 Commits

Author SHA1 Message Date
InnocentGameDev e4a566785d formatting fix 2024-07-13 00:41:31 +02:00
Asdar c56e6bdd85
Update MEs_Proposal_Guide.md 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-13 00:37:58 +02:00
Asdar 9dc69f19d1
Update MEs_Proposal_Guide.md 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-13 00:37:46 +02:00
Asdar e28a3a94f5
Update MEs_Proposal_Guide.md 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-13 00:37:35 +02:00
Asdar def54141ce
Update MEs_Proposal_Guide.md 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-13 00:36:51 +02:00
Asdar b6b3bb49f2
Update MEs_Proposal_Guide.md 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-13 00:36:39 +02:00
Asdar 9b7c4f0817
Update MEs_Proposal_Guide.md 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-13 00:36:32 +02:00
InnocentGameDev 975f272729 CLEANING MY BRANCH 2024-07-13 00:12:09 +02:00
flx-sta 30daba0df5
Merge pull request #67 from AsdarDevelops/disabled-button 
add an optional disabled button label
 2024-07-12 14:38:15 -07:00
ImperialSympathizer 4097d49adc add an optional disabled button label 2024-07-12 17:36:59 -04:00
ImperialSympathizer 5cb02df0e0
Merge pull request #66 from AsdarDevelops/money-formatter 
add i18next money formatter for MEs
 2024-07-12 16:22:49 -04:00
ImperialSympathizer 515020742d add i18next money formatter for MEs 2024-07-12 16:16:52 -04:00
ImperialSympathizer c434d6e04b
Merge pull request #65 from AsdarDevelops/dialogue-tokens-rework 
move dialogue token injection to i18next
 2024-07-12 15:59:28 -04:00
ImperialSympathizer 39f91167c7 PR cleanup and commit suggestions 2024-07-12 15:57:12 -04:00
ImperialSympathizer b82e8674cc add number formatting to money strings 2024-07-12 15:54:35 -04:00
ImperialSympathizer 2b855e58e3 move dialogue token injection to i18next 2024-07-12 15:44:34 -04:00
ImperialSympathizer 60c26456f6 move dialogue token injection to i18next 2024-07-12 15:40:30 -04:00
flx-sta 5ff80cd8a2
Merge pull request #64 from AsdarDevelops/option-ui-enhancements 
add option mode for UI styling consistency
 2024-07-12 10:40:28 -07:00
ImperialSympathizer bf72985c19
Update src/data/mystery-encounters/mystery-encounter-option.ts 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-12 13:37:59 -04:00
ImperialSympathizer 14ec528fea remove extra space 2024-07-12 13:29:47 -04:00
ImperialSympathizer c99a6382ca add option mode for UI styling consistency 2024-07-12 13:20:14 -04:00
flx-sta 85ba3c9b04
Merge pull request #47 from AsdarDevelops/pokemon-salesman 
small bug fixes
 2024-07-12 09:45:22 -07:00
ImperialSympathizer 61330c6967 remove overrides changes 2024-07-12 11:28:22 -04:00
ImperialSympathizer fb9a4d3dd3 Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into pokemon-salesman 2024-07-12 11:27:02 -04:00
ImperialSympathizer 4412769cd9 small bug fixes 2024-07-11 18:31:48 -04:00
ImperialSympathizer 6e0751d94b
Merge pull request #46 from flx-sta/mystery-events/dialogue-refactoring 
Mystery events/dialogue refactoring
 2024-07-11 18:30:12 -04:00
Felix Staud 96554427b5 fix myster-encounter-ui-handler duplicate 2024-07-11 15:27:33 -07:00
Felix Staud 4d4d0e55cc fix myster-encounter-ui-handler duplicate req. check 2024-07-11 15:24:40 -07:00
Felix Staud 0326cb2538 reset overrides.ts 2024-07-11 15:18:59 -07:00
Felix Staud 9256569181 minor fix in phases.ts for myst.-enc. 2024-07-11 15:18:27 -07:00
Felix Staud 14289d2736 add `-encounter` as suffix for encounter files 2024-07-11 15:17:37 -07:00
Felix Staud 4da5e0fb10 apply `namespace` for training session encounter 2024-07-11 15:14:03 -07:00
Felix Staud 55805d1804 apply `namespace` for shady vitamin dealer encounter 2024-07-11 15:13:01 -07:00
Felix Staud e8670c4f00 rename MysteryEncounter interface to IMysteryEncounter 2024-07-11 15:01:30 -07:00
Felix Staud 941a8e71d6 finishing touches 2024-07-11 14:58:52 -07:00
Felix Staud 39f98222a6 migrate training session encounter 2024-07-11 14:50:19 -07:00
Felix Staud 2d42697321 migrate sleeping snorlax encounter 2024-07-11 14:44:31 -07:00
Felix Staud 19d96ed381 migrate shady-vitamin-dealer encounter 2024-07-11 14:39:18 -07:00
Felix Staud 71a047a1f6 migrate mysterious-chest encounter 2024-07-11 14:10:21 -07:00
Felix Staud e6bf12ab8c migrate mysterious-challengers 2024-07-11 14:02:26 -07:00
Felix Staud 1713395091 migrate fight-or-flight encounter 2024-07-11 13:54:44 -07:00
Felix Staud ce73c38e33 migrate field-trip encounter 2024-07-11 13:47:10 -07:00
Felix Staud d9e0957d40 migrate department-store-sale encounter 2024-07-11 13:35:46 -07:00
Felix Staud c589689a6c migrate dark-deal encounter to new dialogue setup 2024-07-11 13:26:21 -07:00
Felix Staud 37248f1885 Merge remote-tracking branch 'Mystery-Events/mystery-battle-events' into mystery-events/dialogue-refactoring 2024-07-11 13:26:00 -07:00
Felix Staud 74125ef1cf WIP: add option to use dialogues in builder 2024-07-11 12:56:15 -07:00
ImperialSympathizer c0a900cd02
Merge pull request #42 from AsdarDevelops/field-trip 
Field Trip encounter and misc Improvements
 2024-07-11 15:33:58 -04:00
ImperialSympathizer 390b2e93f9 remove fake out from stealing move group 2024-07-11 15:03:57 -04:00
ImperialSympathizer c72bed0ee7 small cleanup of changes 2024-07-11 14:58:44 -04:00
ImperialSympathizer b6ef210584 remove unnecessary styling override on fight or flight option 2024-07-11 14:43:57 -04:00